From 0e2c2fe1d1eec5482078147d551215a58604cc3a Mon Sep 17 00:00:00 2001 From: zwelch Date: Tue, 23 Jun 2009 22:40:42 +0000 Subject: [PATCH] - Fixes '>>' whitespace - Replace ')\(>>\)\(\w\)' with ') \1 \2'. - Replace '\(\w\)\(>>\)(' with '\1 \2 ('. - Replace '\(\w\)\(>>\)\(\w\)' with '\1 \2 \3'. git-svn-id: svn://svn.berlios.de/openocd/trunk@2369 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/flash/at91sam7.c | 42 +++++++++++++++--------------- src/flash/flash.c | 4 +-- src/flash/ocl/at91sam7x/samflash.c | 4 +-- src/flash/pic32mx.c | 14 +++++----- src/flash/stellaris.c | 18 ++++++------- src/helper/binarybuffer.h | 8 +++--- src/helper/jim.c | 6 ++--- src/jtag/zy1000/jtag_minidriver.h | 6 ++--- src/jtag/zy1000/zy1000.c | 2 +- src/target/arm_adi_v5.c | 6 ++--- src/target/arm_disassembler.h | 2 +- src/target/target.c | 4 +-- 12 files changed, 58 insertions(+), 58 deletions(-) diff --git a/src/flash/at91sam7.c b/src/flash/at91sam7.c index bb059c06..55afb6bf 100644 --- a/src/flash/at91sam7.c +++ b/src/flash/at91sam7.c @@ -366,13 +366,13 @@ static int at91sam7_read_part_info(struct flash_bank_s *bank) at91sam7_info = t_bank->driver_priv; at91sam7_info->cidr = cidr; - at91sam7_info->cidr_ext = (cidr>>31)&0x0001; - at91sam7_info->cidr_nvptyp = (cidr>>28)&0x0007; - at91sam7_info->cidr_arch = (cidr>>20)&0x00FF; - at91sam7_info->cidr_sramsiz = (cidr>>16)&0x000F; - at91sam7_info->cidr_nvpsiz2 = (cidr>>12)&0x000F; - at91sam7_info->cidr_nvpsiz = (cidr>>8)&0x000F; - at91sam7_info->cidr_eproc = (cidr>>5)&0x0007; + at91sam7_info->cidr_ext = (cidr >> 31)&0x0001; + at91sam7_info->cidr_nvptyp = (cidr >> 28)&0x0007; + at91sam7_info->cidr_arch = (cidr >> 20)&0x00FF; + at91sam7_info->cidr_sramsiz = (cidr >> 16)&0x000F; + at91sam7_info->cidr_nvpsiz2 = (cidr >> 12)&0x000F; + at91sam7_info->cidr_nvpsiz = (cidr >> 8)&0x000F; + at91sam7_info->cidr_eproc = (cidr >> 5)&0x0007; at91sam7_info->cidr_version = cidr&0x001F; /* calculate master clock frequency */ @@ -391,10 +391,10 @@ static int at91sam7_read_part_info(struct flash_bank_s *bank) return ERROR_OK; } - arch = (cidr>>20)&0x00FF; + arch = (cidr >> 20)&0x00FF; /* check flash size */ - switch ((cidr>>8)&0x000F) + switch ((cidr >> 8)&0x000F) { case FLASH_SIZE_8KB: break; @@ -586,13 +586,13 @@ static int at91sam7_read_part_info(struct flash_bank_s *bank) at91sam7_info = t_bank->driver_priv; at91sam7_info->cidr = cidr; - at91sam7_info->cidr_ext = (cidr>>31)&0x0001; - at91sam7_info->cidr_nvptyp = (cidr>>28)&0x0007; - at91sam7_info->cidr_arch = (cidr>>20)&0x00FF; - at91sam7_info->cidr_sramsiz = (cidr>>16)&0x000F; - at91sam7_info->cidr_nvpsiz2 = (cidr>>12)&0x000F; - at91sam7_info->cidr_nvpsiz = (cidr>>8)&0x000F; - at91sam7_info->cidr_eproc = (cidr>>5)&0x0007; + at91sam7_info->cidr_ext = (cidr >> 31)&0x0001; + at91sam7_info->cidr_nvptyp = (cidr >> 28)&0x0007; + at91sam7_info->cidr_arch = (cidr >> 20)&0x00FF; + at91sam7_info->cidr_sramsiz = (cidr >> 16)&0x000F; + at91sam7_info->cidr_nvpsiz2 = (cidr >> 12)&0x000F; + at91sam7_info->cidr_nvpsiz = (cidr >> 8)&0x000F; + at91sam7_info->cidr_eproc = (cidr >> 5)&0x0007; at91sam7_info->cidr_version = cidr&0x001F; at91sam7_info->target_name = target_name; @@ -702,12 +702,12 @@ static int at91sam7_protect_check(struct flash_bank_s *bank) } status = at91sam7_get_flash_status(bank->target, bank->bank_number); - at91sam7_info->lockbits = (status>>16); + at91sam7_info->lockbits = (status >> 16); at91sam7_info->num_lockbits_on = 0; for (lock_pos=0; lock_posnum_sectors; lock_pos++) { - if ( ((status>>(16+lock_pos))&(0x0001)) == 1) + if ( ((status >> (16+lock_pos))&(0x0001)) == 1) { at91sam7_info->num_lockbits_on++; bank->sectors[lock_pos].is_protected = 1; @@ -719,13 +719,13 @@ static int at91sam7_protect_check(struct flash_bank_s *bank) /* GPNVM and SECURITY bits apply only for MC_FSR of EFC0 */ status = at91sam7_get_flash_status(bank->target, 0); - at91sam7_info->securitybit = (status>>4)&0x01; - at91sam7_info->nvmbits = (status>>8)&0xFF; + at91sam7_info->securitybit = (status >> 4)&0x01; + at91sam7_info->nvmbits = (status >> 8)&0xFF; at91sam7_info->num_nvmbits_on = 0; for (gpnvm_pos=0; gpnvm_posnum_nvmbits; gpnvm_pos++) { - if ( ((status>>(8+gpnvm_pos))&(0x01)) == 1) + if ( ((status >> (8+gpnvm_pos))&(0x01)) == 1) { at91sam7_info->num_nvmbits_on++; } diff --git a/src/flash/flash.c b/src/flash/flash.c index d5bdf60e..60827594 100644 --- a/src/flash/flash.c +++ b/src/flash/flash.c @@ -374,7 +374,7 @@ static int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cm j, p->sectors[j].offset, p->sectors[j].size, - p->sectors[j].size>>10, + p->sectors[j].size >> 10, protect_state); } @@ -465,7 +465,7 @@ static int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, c j, p->sectors[j].offset, p->sectors[j].size, - p->sectors[j].size>>10, + p->sectors[j].size >> 10, erase_state); } } diff --git a/src/flash/ocl/at91sam7x/samflash.c b/src/flash/ocl/at91sam7x/samflash.c index 66a857b3..b5255191 100644 --- a/src/flash/ocl/at91sam7x/samflash.c +++ b/src/flash/ocl/at91sam7x/samflash.c @@ -32,7 +32,7 @@ int flash_init(void) { unsigned int nvpsiz; - nvpsiz=(inr(DBGU_CIDR)>>8)&0xf; + nvpsiz=(inr(DBGU_CIDR) >> 8)&0xf; switch (nvpsiz) { case 3: @@ -129,7 +129,7 @@ int flash_erase_plane(int efc_ofs) int page_num; page_num=0; - lockbits=inr(MC_FSR+efc_ofs)>>16; + lockbits=inr(MC_FSR+efc_ofs) >> 16; while (lockbits) { if (lockbits&1) { diff --git a/src/flash/pic32mx.c b/src/flash/pic32mx.c index 9ed1aef1..dd24a7dc 100644 --- a/src/flash/pic32mx.c +++ b/src/flash/pic32mx.c @@ -605,11 +605,11 @@ static int pic32mx_probe(struct flash_bank_s *bank) device_id = ejtag_info->idcode; LOG_INFO( "device id = 0x%08" PRIx32 " (manuf 0x%03x dev 0x%02x, ver 0x%03x)", device_id, - (unsigned)((device_id>>1)&0x7ff), - (unsigned)((device_id>>12)&0xff), - (unsigned)((device_id>>20)&0xfff) ); + (unsigned)((device_id >> 1)&0x7ff), + (unsigned)((device_id >> 12)&0xff), + (unsigned)((device_id >> 20)&0xfff) ); - if (((device_id>>1)&0x7ff) != PIC32MX_MANUF_ID) { + if (((device_id >> 1)&0x7ff) != PIC32MX_MANUF_ID) { LOG_WARNING( "Cannot identify target as a PIC32MX family." ); return ERROR_FLASH_OPERATION_FAILED; } @@ -697,10 +697,10 @@ static int pic32mx_info(struct flash_bank_s *bank, char *buf, int buf_size) device_id = ejtag_info->idcode; - if (((device_id>>1)&0x7ff) != PIC32MX_MANUF_ID) { + if (((device_id >> 1)&0x7ff) != PIC32MX_MANUF_ID) { snprintf(buf, buf_size, "Cannot identify target as a PIC32MX family (manufacturer 0x%03d != 0x%03d)\n", - (unsigned)((device_id>>1)&0x7ff), + (unsigned)((device_id >> 1)&0x7ff), PIC32MX_MANUF_ID); return ERROR_FLASH_OPERATION_FAILED; } @@ -716,7 +716,7 @@ static int pic32mx_info(struct flash_bank_s *bank, char *buf, int buf_size) buf += printed; buf_size -= printed; printed = snprintf(buf, buf_size, " Ver: 0x%03x", - (unsigned)((device_id>>20)&0xfff)); + (unsigned)((device_id >> 20)&0xfff)); return ERROR_OK; } diff --git a/src/flash/stellaris.c b/src/flash/stellaris.c index e8ee2fbf..8f5f03a0 100644 --- a/src/flash/stellaris.c +++ b/src/flash/stellaris.c @@ -33,7 +33,7 @@ #include "binarybuffer.h" -#define DID0_VER(did0) ((did0>>28)&0x07) +#define DID0_VER(did0) ((did0 >> 28)&0x07) static int stellaris_register_commands(struct command_context_s *cmd_ctx); static int stellaris_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); static int stellaris_erase(struct flash_bank_s *bank, int first, int last); @@ -286,7 +286,7 @@ static int stellaris_info(struct flash_bank_s *bank, char *buf, int buf_size) if (DID0_VER(stellaris_info->did0) > 0) { - device_class = (stellaris_info->did0>>16) & 0xFF; + device_class = (stellaris_info->did0 >> 16) & 0xFF; } else { @@ -298,7 +298,7 @@ static int stellaris_info(struct flash_bank_s *bank, char *buf, int buf_size) device_class, StellarisClassname[device_class], stellaris_info->target_name, - (int)('A' + ((stellaris_info->did0>>8) & 0xFF)), + (int)('A' + ((stellaris_info->did0 >> 8) & 0xFF)), (int)((stellaris_info->did0) & 0xFF)); buf += printed; buf_size -= printed; @@ -309,7 +309,7 @@ static int stellaris_info(struct flash_bank_s *bank, char *buf, int buf_size) stellaris_info->did1, stellaris_info->did1, "ARMV7M", - (int)((1+((stellaris_info->dc0>>16) & 0xFFFF))/4), + (int)((1+((stellaris_info->dc0 >> 16) & 0xFFFF))/4), (int)((1+(stellaris_info->dc0 & 0xFFFF))*2)); buf += printed; buf_size -= printed; @@ -366,11 +366,11 @@ static void stellaris_read_clock_info(flash_bank_t *bank) LOG_DEBUG("Stellaris PLLCFG %" PRIx32 "", pllcfg); stellaris_info->rcc = rcc; - sysdiv = (rcc>>23) & 0xF; - usesysdiv = (rcc>>22) & 0x1; - bypass = (rcc>>11) & 0x1; - oscsrc = (rcc>>4) & 0x3; - /* xtal = (rcc>>6)&0xF; */ + sysdiv = (rcc >> 23) & 0xF; + usesysdiv = (rcc >> 22) & 0x1; + bypass = (rcc >> 11) & 0x1; + oscsrc = (rcc >> 4) & 0x3; + /* xtal = (rcc >> 6)&0xF; */ switch (oscsrc) { case 0: diff --git a/src/helper/binarybuffer.h b/src/helper/binarybuffer.h index 710ec374..81d3f63a 100644 --- a/src/helper/binarybuffer.h +++ b/src/helper/binarybuffer.h @@ -34,10 +34,10 @@ static inline void buf_set_u32(uint8_t* buffer, unsigned int first, unsigned int { if ((num==32) && (first==0)) { - buffer[3]=(value>>24)&0xff; - buffer[2]=(value>>16)&0xff; - buffer[1]=(value>>8)&0xff; - buffer[0]=(value>>0)&0xff; + buffer[3]=(value >> 24)&0xff; + buffer[2]=(value >> 16)&0xff; + buffer[1]=(value >> 8)&0xff; + buffer[0]=(value >> 0)&0xff; } else { unsigned int i; diff --git a/src/helper/jim.c b/src/helper/jim.c index 58241d4a..c0425b98 100644 --- a/src/helper/jim.c +++ b/src/helper/jim.c @@ -6958,7 +6958,7 @@ int Jim_EvalExpression(Jim_Interp *interp, Jim_Obj *exprObjPtr, case JIM_EXPROP_LTE: wC = wA <= wB; break; case JIM_EXPROP_GTE: wC = wA >= wB; break; case JIM_EXPROP_LSHIFT: wC = wA<>wB; break; + case JIM_EXPROP_RSHIFT: wC = wA >> wB; break; case JIM_EXPROP_NUMEQ: wC = wA==wB; break; case JIM_EXPROP_NUMNE: wC = wA != wB; break; case JIM_EXPROP_BITAND: wC = wA&wB; break; @@ -6996,7 +6996,7 @@ int Jim_EvalExpression(Jim_Interp *interp, Jim_Obj *exprObjPtr, wC = _rotl(uA,(unsigned long)wB); #else const unsigned int S = sizeof(unsigned long) * 8; - wC = (unsigned long)((uA<>(S-wB))); + wC = (unsigned long)((uA<> (S-wB))); #endif break; } @@ -7006,7 +7006,7 @@ int Jim_EvalExpression(Jim_Interp *interp, Jim_Obj *exprObjPtr, wC = _rotr(uA,(unsigned long)wB); #else const unsigned int S = sizeof(unsigned long) * 8; - wC = (unsigned long)((uA>>wB)|(uA<<(S-wB))); + wC = (unsigned long)((uA >> wB)|(uA<<(S-wB))); #endif break; } diff --git a/src/jtag/zy1000/jtag_minidriver.h b/src/jtag/zy1000/jtag_minidriver.h index 37e9b35a..0f3e217e 100644 --- a/src/jtag/zy1000/jtag_minidriver.h +++ b/src/jtag/zy1000/jtag_minidriver.h @@ -106,7 +106,7 @@ static __inline__ void shiftValueInner(const enum tap_state state, const enum ta } /* shift out value */ waitIdle(); - ZY1000_POKE(ZY1000_JTAG_BASE+0x28, (((value>>i)&1)<<1)|tms); + ZY1000_POKE(ZY1000_JTAG_BASE+0x28, (((value >> i)&1)<<1)|tms); } waitIdle(); ZY1000_POKE(ZY1000_JTAG_BASE+0x28, 0); @@ -131,11 +131,11 @@ static __inline__ void shiftValueInner(const enum tap_state state, const enum ta for (i=0; i>i); + ZY1000_POKE(ZY1000_JTAG_BASE+0xc, value >> i); ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (1<<8)|(a<<4)|a); } sampleShiftRegister(); - ZY1000_POKE(ZY1000_JTAG_BASE+0xc, value>>(repeat-1)); + ZY1000_POKE(ZY1000_JTAG_BASE+0xc, value >> (repeat-1)); ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (1<<8)|(a<<4)|b); } else { diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c index 29ab3e46..4626b781 100644 --- a/src/jtag/zy1000/zy1000.c +++ b/src/jtag/zy1000/zy1000.c @@ -474,7 +474,7 @@ static __inline void scanFields(int num_fields, const scan_field_t *fields, tap_ for (l=0; l>l)&0xff; + inBuffer[(j+l)/8]=(value >> l)&0xff; } } j += k; diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c index ea3b2792..146f89f4 100644 --- a/src/target/arm_adi_v5.c +++ b/src/target/arm_adi_v5.c @@ -1103,12 +1103,12 @@ int dap_info_command(struct command_context_s *cmd_ctx, swjdp_common_t *swjdp, i mem_ap_read_atomic_u32(swjdp, (component_base&0xFFFFF000)|0xFF4, &c_cid1); mem_ap_read_atomic_u32(swjdp, (component_base&0xFFFFF000)|0xFF8, &c_cid2); mem_ap_read_atomic_u32(swjdp, (component_base&0xFFFFF000)|0xFFC, &c_cid3); - component_start = component_base - 0x1000*(c_pid4>>4); + component_start = component_base - 0x1000*(c_pid4 >> 4); command_print(cmd_ctx, "\t\tComponent base address 0x%" PRIx32 ", pid4 0x%" PRIx32 ", start address 0x%" PRIx32 "",component_base,c_pid4,component_start); - command_print(cmd_ctx, "\t\tComponent cid1 0x%" PRIx32 ", class is %s",c_cid1,class_description[(c_cid1>>4)&0xF]); /* Se ARM DDI 0314 C Table 2.2 */ + command_print(cmd_ctx, "\t\tComponent cid1 0x%" PRIx32 ", class is %s",c_cid1,class_description[(c_cid1 >> 4)&0xF]); /* Se ARM DDI 0314 C Table 2.2 */ command_print(cmd_ctx, "\t\tCID3 0x%" PRIx32 ", CID2 0x%" PRIx32 ", CID1 0x%" PRIx32 ", CID0, 0x%" PRIx32 "",c_cid3,c_cid2,c_cid1,c_cid0); command_print(cmd_ctx, "\t\tPID3 0x%" PRIx32 ", PID2 0x%" PRIx32 ", PID1 0x%" PRIx32 ", PID0, 0x%" PRIx32 "",c_pid3,c_pid2,c_pid1,c_pid0); - /* For CoreSight components, (c_cid1>>4)&0xF==9 , we also read 0xFC8 DevId and 0xFCC DevType */ + /* For CoreSight components, (c_cid1 >> 4)&0xF==9 , we also read 0xFC8 DevId and 0xFCC DevType */ } else { diff --git a/src/target/arm_disassembler.h b/src/target/arm_disassembler.h index 7d914bfd..00c4b295 100644 --- a/src/target/arm_disassembler.h +++ b/src/target/arm_disassembler.h @@ -198,6 +198,6 @@ extern int arm_evaluate_opcode(uint32_t opcode, uint32_t address, arm_instructio extern int thumb_evaluate_opcode(uint16_t opcode, uint32_t address, arm_instruction_t *instruction); extern int arm_access_size(arm_instruction_t *instruction); -#define COND(opcode) (arm_condition_strings[(opcode & 0xf0000000)>>28]) +#define COND(opcode) (arm_condition_strings[(opcode & 0xf0000000) >> 28]) #endif /* ARM_DISASSEMBLER_H */ diff --git a/src/target/target.c b/src/target/target.c index b7685966..89d2c88a 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -2792,7 +2792,7 @@ static void writeLong(FILE *f, int l) int i; for (i=0; i<4; i++) { - char c=(l>>(i*8))&0xff; + char c=(l >> (i*8))&0xff; writeData(f, &c, 1); } @@ -2883,7 +2883,7 @@ static void writeGmon(uint32_t *samples, uint32_t sampleNum, char *filename) val=65535; } data[i*2]=val&0xff; - data[i*2+1]=(val>>8)&0xff; + data[i*2+1]=(val >> 8)&0xff; } free(buckets); writeData(f, data, length * 2); -- 2.39.5