summaryrefslogtreecommitdiff
path: root/src/target
diff options
context:
space:
mode:
Diffstat (limited to 'src/target')
-rw-r--r--src/target/arm11.c14
-rw-r--r--src/target/arm720t.c2
-rw-r--r--src/target/arm7_9_common.c4
-rw-r--r--src/target/arm7tdmi.c2
-rw-r--r--src/target/arm966e.c2
-rw-r--r--src/target/arm9tdmi.c2
-rw-r--r--src/target/arm_adi_v5.c48
-rw-r--r--src/target/arm_disassembler.c6
-rw-r--r--src/target/armv4_5.c2
-rw-r--r--src/target/armv7m.h4
-rw-r--r--src/target/cortex_m3.c24
-rw-r--r--src/target/etb.c4
-rw-r--r--src/target/image.c6
-rw-r--r--src/target/mips32.c2
-rw-r--r--src/target/mips32_pracc.c2
-rw-r--r--src/target/mips32_pracc.h2
-rw-r--r--src/target/mips_ejtag.c2
-rw-r--r--src/target/mips_m4k.c8
-rw-r--r--src/target/register.c2
-rw-r--r--src/target/target.c542
-rw-r--r--src/target/target.h4
-rw-r--r--src/target/target_request.c6
-rw-r--r--src/target/target_type.h6
-rw-r--r--src/target/trace.c2
-rw-r--r--src/target/xscale.c6
25 files changed, 352 insertions, 352 deletions
diff --git a/src/target/arm11.c b/src/target/arm11.c
index 77ff6dc0..b5edd8fc 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -709,7 +709,7 @@ int arm11_arch_state(struct target_s *target)
arm11_common_t * arm11 = target->arch_info;
LOG_USER("target halted due to %s\ncpsr: 0x%8.8" PRIx32 " pc: 0x%8.8" PRIx32 "",
- Jim_Nvp_value2name_simple(nvp_target_debug_reason, target->debug_reason )->name,
+ Jim_Nvp_value2name_simple(nvp_target_debug_reason, target->debug_reason)->name,
R(CPSR),
R(PC));
@@ -732,7 +732,7 @@ int arm11_halt(struct target_s *target)
arm11_common_t * arm11 = target->arch_info;
LOG_DEBUG("target->state: %s",
- Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name );
+ Jim_Nvp_value2name_simple(nvp_target_state, target->state)->name);
if (target->state == TARGET_UNKNOWN)
{
@@ -789,7 +789,7 @@ int arm11_resume(struct target_s *target, int current, uint32_t address, int han
arm11_common_t * arm11 = target->arch_info;
LOG_DEBUG("target->state: %s",
- Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name );
+ Jim_Nvp_value2name_simple(nvp_target_state, target->state)->name);
if (target->state != TARGET_HALTED)
@@ -889,7 +889,7 @@ int arm11_step(struct target_s *target, int current, uint32_t address, int handl
FNC_INFO;
LOG_DEBUG("target->state: %s",
- Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name );
+ Jim_Nvp_value2name_simple(nvp_target_state, target->state)->name);
if (target->state != TARGET_HALTED)
{
@@ -1035,7 +1035,7 @@ int arm11_deassert_reset(struct target_s *target)
#if 0
LOG_DEBUG("target->state: %s",
- Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name );
+ Jim_Nvp_value2name_simple(nvp_target_state, target->state)->name);
/* deassert reset lines */
@@ -1960,7 +1960,7 @@ int arm11_register_commands(struct command_context_s *cmd_ctx)
RC_FINAL_BOOL("error_fatal", "Terminate program if transfer error was found (default: enabled)",
memwrite_error_fatal)
- ) /* memwrite */
+) /* memwrite */
RC_FINAL_BOOL("no_increment", "Don't increment address on multi-read/-write (default: disabled)",
memrw_no_increment)
@@ -1976,7 +1976,7 @@ int arm11_register_commands(struct command_context_s *cmd_ctx)
RC_FINAL("mcr", "Write Coprocessor register",
arm11_handle_mcr)
- ) /* arm11 */
+) /* arm11 */
return ERROR_OK;
}
diff --git a/src/target/arm720t.c b/src/target/arm720t.c
index 4e9e6fd7..a5916aae 100644
--- a/src/target/arm720t.c
+++ b/src/target/arm720t.c
@@ -319,7 +319,7 @@ int arm720t_arch_state(struct target_s *target)
"cpsr: 0x%8.8" PRIx32 " pc: 0x%8.8" PRIx32 "\n"
"MMU: %s, Cache: %s",
armv4_5_state_strings[armv4_5->core_state],
- Jim_Nvp_value2name_simple(nvp_target_debug_reason, target->debug_reason )->name ,
+ Jim_Nvp_value2name_simple(nvp_target_debug_reason, target->debug_reason)->name ,
armv4_5_mode_strings[armv4_5_mode_to_number(armv4_5->core_mode)],
buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_CPSR].value, 0, 32),
buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32),
diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index b6fd6970..9be0d38e 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -526,7 +526,7 @@ int arm7_9_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_ADDR_VALUE], watchpoint->address);
embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_ADDR_MASK], mask);
embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_DATA_MASK], watchpoint->mask);
- if (watchpoint->mask != 0xffffffffu )
+ if (watchpoint->mask != 0xffffffffu)
embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_DATA_VALUE], watchpoint->value);
embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_MASK], 0xff & ~EICE_W_CTRL_nOPC & ~rw_mask);
embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W0_CONTROL_VALUE], EICE_W_CTRL_ENABLE | EICE_W_CTRL_nOPC | (watchpoint->rw & 1));
@@ -543,7 +543,7 @@ int arm7_9_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_ADDR_VALUE], watchpoint->address);
embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_ADDR_MASK], mask);
embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_DATA_MASK], watchpoint->mask);
- if (watchpoint->mask != 0xffffffffu )
+ if (watchpoint->mask != 0xffffffffu)
embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_DATA_VALUE], watchpoint->value);
embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_CONTROL_MASK], 0xff & ~EICE_W_CTRL_nOPC & ~rw_mask);
embeddedice_set_reg(&arm7_9->eice_cache->reg_list[EICE_W1_CONTROL_VALUE], EICE_W_CTRL_ENABLE | EICE_W_CTRL_nOPC | (watchpoint->rw & 1));
diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c
index c94d974b..c590701e 100644
--- a/src/target/arm7tdmi.c
+++ b/src/target/arm7tdmi.c
@@ -822,7 +822,7 @@ int arm7tdmi_init_arch_info(target_t *target, arm7tdmi_common_t *arm7tdmi, jtag_
return ERROR_OK;
}
-int arm7tdmi_target_create(struct target_s *target, Jim_Interp *interp )
+int arm7tdmi_target_create(struct target_s *target, Jim_Interp *interp)
{
arm7tdmi_common_t *arm7tdmi;
diff --git a/src/target/arm966e.c b/src/target/arm966e.c
index 5409fd34..d8e82819 100644
--- a/src/target/arm966e.c
+++ b/src/target/arm966e.c
@@ -110,7 +110,7 @@ int arm966e_init_arch_info(target_t *target, arm966e_common_t *arm966e, jtag_tap
return ERROR_OK;
}
-int arm966e_target_create(struct target_s *target, Jim_Interp *interp )
+int arm966e_target_create(struct target_s *target, Jim_Interp *interp)
{
arm966e_common_t *arm966e = calloc(1,sizeof(arm966e_common_t));
diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c
index e4fc06e2..6e5a9605 100644
--- a/src/target/arm9tdmi.c
+++ b/src/target/arm9tdmi.c
@@ -39,7 +39,7 @@
int handle_arm9tdmi_catch_vectors_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
/* forward declarations */
-int arm9tdmi_target_create(struct target_s *target, Jim_Interp *interp );
+int arm9tdmi_target_create(struct target_s *target, Jim_Interp *interp);
int arm9tdmi_quit(void);
diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 13c66f02..bf95057f 100644
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -81,7 +81,7 @@ int adi_jtag_dp_scan(swjdp_common_t *swjdp, uint8_t instr, uint8_t reg_addr, uin
arm_jtag_set_instr(jtag_info, instr, NULL);
/* Add specified number of tck clocks before accessing memory bus */
- if ((instr == DAP_IR_APACC) && ((reg_addr == AP_REG_DRW)||((reg_addr&0xF0) == AP_REG_BD0) )&& (swjdp->memaccess_tck != 0))
+ if ((instr == DAP_IR_APACC) && ((reg_addr == AP_REG_DRW)||((reg_addr&0xF0) == AP_REG_BD0))&& (swjdp->memaccess_tck != 0))
jtag_add_runtest(swjdp->memaccess_tck, jtag_set_end_state(TAP_IDLE));
fields[0].tap = jtag_info->tap;
@@ -112,7 +112,7 @@ int adi_jtag_dp_scan_u32(swjdp_common_t *swjdp, uint8_t instr, uint8_t reg_addr,
arm_jtag_set_instr(jtag_info, instr, NULL);
/* Add specified number of tck clocks before accessing memory bus */
- if ((instr == DAP_IR_APACC) && ((reg_addr == AP_REG_DRW)||((reg_addr&0xF0) == AP_REG_BD0) )&& (swjdp->memaccess_tck != 0))
+ if ((instr == DAP_IR_APACC) && ((reg_addr == AP_REG_DRW)||((reg_addr&0xF0) == AP_REG_BD0))&& (swjdp->memaccess_tck != 0))
jtag_add_runtest(swjdp->memaccess_tck, jtag_set_end_state(TAP_IDLE));
fields[0].tap = jtag_info->tap;
@@ -374,13 +374,13 @@ int dap_setup_accessport(swjdp_common_t *swjdp, uint32_t csw, uint32_t tar)
if (csw != swjdp->ap_csw_value)
{
/* LOG_DEBUG("swjdp : Set CSW %x",csw); */
- dap_ap_write_reg_u32(swjdp, AP_REG_CSW, csw );
+ dap_ap_write_reg_u32(swjdp, AP_REG_CSW, csw);
swjdp->ap_csw_value = csw;
}
if (tar != swjdp->ap_tar_value)
{
/* LOG_DEBUG("swjdp : Set TAR %x",tar); */
- dap_ap_write_reg_u32(swjdp, AP_REG_TAR, tar );
+ dap_ap_write_reg_u32(swjdp, AP_REG_TAR, tar);
swjdp->ap_tar_value = tar;
}
if (csw & CSW_ADDRINC_MASK)
@@ -404,7 +404,7 @@ int mem_ap_read_u32(swjdp_common_t *swjdp, uint32_t address, uint32_t *value)
swjdp->trans_mode = TRANS_MODE_COMPOSITE;
dap_setup_accessport(swjdp, CSW_32BIT | CSW_ADDRINC_OFF, address & 0xFFFFFFF0);
- dap_ap_read_reg_u32(swjdp, AP_REG_BD0 | (address & 0xC), value );
+ dap_ap_read_reg_u32(swjdp, AP_REG_BD0 | (address & 0xC), value);
return ERROR_OK;
}
@@ -428,7 +428,7 @@ int mem_ap_write_u32(swjdp_common_t *swjdp, uint32_t address, uint32_t value)
swjdp->trans_mode = TRANS_MODE_COMPOSITE;
dap_setup_accessport(swjdp, CSW_32BIT | CSW_ADDRINC_OFF, address & 0xFFFFFFF0);
- dap_ap_write_reg_u32(swjdp, AP_REG_BD0 | (address & 0xC), value );
+ dap_ap_write_reg_u32(swjdp, AP_REG_BD0 | (address & 0xC), value);
return ERROR_OK;
}
@@ -467,7 +467,7 @@ int mem_ap_write_buf_u32(swjdp_common_t *swjdp, uint8_t *buffer, int count, uint
uint32_t outvalue;
memcpy(&outvalue, pBuffer, sizeof(uint32_t));
- for (i = 0; i < 4; i++ )
+ for (i = 0; i < 4; i++)
{
*((uint8_t*)pBuffer + (adr & 0x3)) = outvalue;
outvalue >>= 8;
@@ -492,7 +492,7 @@ int mem_ap_write_buf_u32(swjdp_common_t *swjdp, uint8_t *buffer, int count, uint
for (writecount = 0; writecount < blocksize; writecount++)
{
- dap_ap_write_reg(swjdp, AP_REG_DRW, buffer + 4 * writecount );
+ dap_ap_write_reg(swjdp, AP_REG_DRW, buffer + 4 * writecount);
}
if (swjdp_transaction_endcheck(swjdp) == ERROR_OK)
@@ -546,7 +546,7 @@ int mem_ap_write_buf_packed_u16(swjdp_common_t *swjdp, uint8_t *buffer, int coun
{
nbytes = MIN((writecount << 1), 4);
- if (nbytes < 4 )
+ if (nbytes < 4)
{
if (mem_ap_write_buf_u16(swjdp, buffer, nbytes, address) != ERROR_OK)
{
@@ -561,7 +561,7 @@ int mem_ap_write_buf_packed_u16(swjdp_common_t *swjdp, uint8_t *buffer, int coun
uint32_t outvalue;
memcpy(&outvalue, buffer, sizeof(uint32_t));
- for (i = 0; i < nbytes; i++ )
+ for (i = 0; i < nbytes; i++)
{
*((uint8_t*)buffer + (address & 0x3)) = outvalue;
outvalue >>= 8;
@@ -602,7 +602,7 @@ int mem_ap_write_buf_u16(swjdp_common_t *swjdp, uint8_t *buffer, int count, uint
uint16_t svalue;
memcpy(&svalue, buffer, sizeof(uint16_t));
uint32_t outvalue = (uint32_t)svalue << 8 * (address & 0x3);
- dap_ap_write_reg_u32(swjdp, AP_REG_DRW, outvalue );
+ dap_ap_write_reg_u32(swjdp, AP_REG_DRW, outvalue);
retval = swjdp_transaction_endcheck(swjdp);
count -= 2;
address += 2;
@@ -638,7 +638,7 @@ int mem_ap_write_buf_packed_u8(swjdp_common_t *swjdp, uint8_t *buffer, int count
{
nbytes = MIN(writecount, 4);
- if (nbytes < 4 )
+ if (nbytes < 4)
{
if (mem_ap_write_buf_u8(swjdp, buffer, nbytes, address) != ERROR_OK)
{
@@ -653,7 +653,7 @@ int mem_ap_write_buf_packed_u8(swjdp_common_t *swjdp, uint8_t *buffer, int count
uint32_t outvalue;
memcpy(&outvalue, buffer, sizeof(uint32_t));
- for (i = 0; i < nbytes; i++ )
+ for (i = 0; i < nbytes; i++)
{
*((uint8_t*)buffer + (address & 0x3)) = outvalue;
outvalue >>= 8;
@@ -692,7 +692,7 @@ int mem_ap_write_buf_u8(swjdp_common_t *swjdp, uint8_t *buffer, int count, uint3
{
dap_setup_accessport(swjdp, CSW_8BIT | CSW_ADDRINC_SINGLE, address);
uint32_t outvalue = (uint32_t)*buffer << 8 * (address & 0x3);
- dap_ap_write_reg_u32(swjdp, AP_REG_DRW, outvalue );
+ dap_ap_write_reg_u32(swjdp, AP_REG_DRW, outvalue);
retval = swjdp_transaction_endcheck(swjdp);
count--;
address++;
@@ -770,7 +770,7 @@ int mem_ap_read_buf_u32(swjdp_common_t *swjdp, uint8_t *buffer, int count, uint3
uint32_t data;
memcpy(&data, pBuffer, sizeof(uint32_t));
- for (i = 0; i < 4; i++ )
+ for (i = 0; i < 4; i++)
{
*((uint8_t*)pBuffer) = (data >> 8 * (adr & 0x3));
pBuffer++;
@@ -810,7 +810,7 @@ int mem_ap_read_buf_packed_u16(swjdp_common_t *swjdp, uint8_t *buffer, int count
do
{
- dap_ap_read_reg_u32(swjdp, AP_REG_DRW, &invalue );
+ dap_ap_read_reg_u32(swjdp, AP_REG_DRW, &invalue);
if (swjdp_transaction_endcheck(swjdp) != ERROR_OK)
{
LOG_WARNING("Block read error address 0x%" PRIx32 ", count 0x%x", address, count);
@@ -819,7 +819,7 @@ int mem_ap_read_buf_packed_u16(swjdp_common_t *swjdp, uint8_t *buffer, int count
nbytes = MIN((readcount << 1), 4);
- for (i = 0; i < nbytes; i++ )
+ for (i = 0; i < nbytes; i++)
{
*((uint8_t*)buffer) = (invalue >> 8 * (address & 0x3));
buffer++;
@@ -847,11 +847,11 @@ int mem_ap_read_buf_u16(swjdp_common_t *swjdp, uint8_t *buffer, int count, uint3
while (count > 0)
{
dap_setup_accessport(swjdp, CSW_16BIT | CSW_ADDRINC_SINGLE, address);
- dap_ap_read_reg_u32(swjdp, AP_REG_DRW, &invalue );
+ dap_ap_read_reg_u32(swjdp, AP_REG_DRW, &invalue);
retval = swjdp_transaction_endcheck(swjdp);
if (address & 0x1)
{
- for (i = 0; i < 2; i++ )
+ for (i = 0; i < 2; i++)
{
*((uint8_t*)buffer) = (invalue >> 8 * (address & 0x3));
buffer++;
@@ -902,7 +902,7 @@ int mem_ap_read_buf_packed_u8(swjdp_common_t *swjdp, uint8_t *buffer, int count,
do
{
- dap_ap_read_reg_u32(swjdp, AP_REG_DRW, &invalue );
+ dap_ap_read_reg_u32(swjdp, AP_REG_DRW, &invalue);
if (swjdp_transaction_endcheck(swjdp) != ERROR_OK)
{
LOG_WARNING("Block read error address 0x%" PRIx32 ", count 0x%x", address, count);
@@ -911,7 +911,7 @@ int mem_ap_read_buf_packed_u8(swjdp_common_t *swjdp, uint8_t *buffer, int count,
nbytes = MIN(readcount, 4);
- for (i = 0; i < nbytes; i++ )
+ for (i = 0; i < nbytes; i++)
{
*((uint8_t*)buffer) = (invalue >> 8 * (address & 0x3));
buffer++;
@@ -939,7 +939,7 @@ int mem_ap_read_buf_u8(swjdp_common_t *swjdp, uint8_t *buffer, int count, uint32
while (count > 0)
{
dap_setup_accessport(swjdp, CSW_8BIT | CSW_ADDRINC_SINGLE, address);
- dap_ap_read_reg_u32(swjdp, AP_REG_DRW, &invalue );
+ dap_ap_read_reg_u32(swjdp, AP_REG_DRW, &invalue);
retval = swjdp_transaction_endcheck(swjdp);
*((uint8_t*)buffer) = (invalue >> 8 * (address & 0x3));
count--;
@@ -1065,7 +1065,7 @@ int dap_info_command(struct command_context_s *cmd_ctx, swjdp_common_t *swjdp, i
}
else
{
- command_print(cmd_ctx, "\tROM table in legacy format" );
+ command_print(cmd_ctx, "\tROM table in legacy format");
}
/* Now we read ROM table ID registers, ref. ARM IHI 0029B sec */
mem_ap_read_u32(swjdp, (dbgbase&0xFFFFF000) | 0xFF0, &cid0);
@@ -1081,7 +1081,7 @@ int dap_info_command(struct command_context_s *cmd_ctx, swjdp_common_t *swjdp, i
}
else
{
- command_print(cmd_ctx, "\tMEMTYPE system memory not present. Dedicated debug bus" );
+ command_print(cmd_ctx, "\tMEMTYPE system memory not present. Dedicated debug bus");
}
/* Now we read ROM table entries from dbgbase&0xFFFFF000) | 0x000 until we get 0x00000000 */
diff --git a/src/target/arm_disassembler.c b/src/target/arm_disassembler.c
index d290b670..9ba28657 100644
--- a/src/target/arm_disassembler.c
+++ b/src/target/arm_disassembler.c
@@ -762,7 +762,7 @@ int evaluate_mrs_msr(uint32_t opcode, uint32_t address, arm_instruction_t *instr
(opcode & 0x40000) ? "s" : "",
(opcode & 0x80000) ? "f" : "",
ror(immediate, (rotate * 2))
- );
+);
}
else /* register variant */
{
@@ -774,7 +774,7 @@ int evaluate_mrs_msr(uint32_t opcode, uint32_t address, arm_instruction_t *instr
(opcode & 0x40000) ? "s" : "",
(opcode & 0x80000) ? "f" : "",
Rm
- );
+);
}
}
@@ -1200,7 +1200,7 @@ int arm_evaluate_opcode(uint32_t opcode, uint32_t address, arm_instruction_t *in
if ((opcode & 0x0e000000) == 0x0a000000)
return evaluate_blx_imm(opcode, address, instruction);
- /* Extended coprocessor opcode space (ARMv5 and higher )*/
+ /* Extended coprocessor opcode space (ARMv5 and higher)*/
/* Coprocessor load/store and double register transfers */
if ((opcode & 0x0e000000) == 0x0c000000)
return evaluate_ldc_stc_mcrr_mrrc(opcode, address, instruction);
diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index e1b137f9..8d2167e5 100644
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -299,7 +299,7 @@ int armv4_5_arch_state(struct target_s *target)
LOG_USER("target halted in %s state due to %s, current mode: %s\ncpsr: 0x%8.8" PRIx32 " pc: 0x%8.8" PRIx32 "",
armv4_5_state_strings[armv4_5->core_state],
- Jim_Nvp_value2name_simple(nvp_target_debug_reason, target->debug_reason )->name,
+ Jim_Nvp_value2name_simple(nvp_target_debug_reason, target->debug_reason)->name,
armv4_5_mode_strings[armv4_5_mode_to_number(armv4_5->core_mode)],
buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_CPSR].value, 0, 32),
buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32));
diff --git a/src/target/armv7m.h b/src/target/armv7m.h
index e3087cd9..3204d35a 100644
--- a/src/target/armv7m.h
+++ b/src/target/armv7m.h
@@ -144,7 +144,7 @@ extern int armv7m_blank_check_memory(struct target_s *target, uint32_t address,
* Rd: source register
* SYSm: destination special register
*/
-#define ARMV7M_T_MSR(SYSm, Rn) ((0xF380 | (Rn << 8 )) | ((0x8800 | SYSm) << 16))
+#define ARMV7M_T_MSR(SYSm, Rn) ((0xF380 | (Rn << 8)) | ((0x8800 | SYSm) << 16))
/* Change Processor State. The instruction modifies the PRIMASK and FAULTMASK
* special-purpose register values (Thumb mode) 16 bit Thumb2 instruction
@@ -159,7 +159,7 @@ extern int armv7m_blank_check_memory(struct target_s *target, uint32_t address,
/* Breakpoint (Thumb mode) v5 onwards
* Im: immediate value used by debugger
*/
-#define ARMV7M_T_BKPT(Im) ((0xBE00 | Im ) | ((0xBE00 | Im ) << 16))
+#define ARMV7M_T_BKPT(Im) ((0xBE00 | Im) | ((0xBE00 | Im) << 16))
/* Store register (Thumb mode)
* Rd: source register
diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c
index 4fe4acc5..b913c4ee 100644
--- a/src/target/cortex_m3.c
+++ b/src/target/cortex_m3.c
@@ -109,11 +109,11 @@ int cortexm3_dap_read_coreregister_u32(swjdp_common_t *swjdp, uint32_t *value, i
/* mem_ap_write_u32(swjdp, DCB_DCRSR, regnum); */
dap_setup_accessport(swjdp, CSW_32BIT | CSW_ADDRINC_OFF, DCB_DCRSR & 0xFFFFFFF0);
- dap_ap_write_reg_u32(swjdp, AP_REG_BD0 | (DCB_DCRSR & 0xC), regnum );
+ dap_ap_write_reg_u32(swjdp, AP_REG_BD0 | (DCB_DCRSR & 0xC), regnum);
/* mem_ap_read_u32(swjdp, DCB_DCRDR, value); */
dap_setup_accessport(swjdp, CSW_32BIT | CSW_ADDRINC_OFF, DCB_DCRDR & 0xFFFFFFF0);
- dap_ap_read_reg_u32(swjdp, AP_REG_BD0 | (DCB_DCRDR & 0xC), value );
+ dap_ap_read_reg_u32(swjdp, AP_REG_BD0 | (DCB_DCRDR & 0xC), value);
mem_ap_write_u32(swjdp, DCB_DCRDR, dcrdr);
retval = swjdp_transaction_endcheck(swjdp);
@@ -134,11 +134,11 @@ int cortexm3_dap_write_coreregister_u32(swjdp_common_t *swjdp, uint32_t value, i
/* mem_ap_write_u32(swjdp, DCB_DCRDR, core_regs[i]); */
dap_setup_accessport(swjdp, CSW_32BIT | CSW_ADDRINC_OFF, DCB_DCRDR & 0xFFFFFFF0);
- dap_ap_write_reg_u32(swjdp, AP_REG_BD0 | (DCB_DCRDR & 0xC), value );
+ dap_ap_write_reg_u32(swjdp, AP_REG_BD0 | (DCB_DCRDR & 0xC), value);
- /* mem_ap_write_u32(swjdp, DCB_DCRSR, i | DCRSR_WnR ); */
+ /* mem_ap_write_u32(swjdp, DCB_DCRSR, i | DCRSR_WnR); */
dap_setup_accessport(swjdp, CSW_32BIT | CSW_ADDRINC_OFF, DCB_DCRSR & 0xFFFFFFF0);
- dap_ap_write_reg_u32(swjdp, AP_REG_BD0 | (DCB_DCRSR & 0xC), regnum | DCRSR_WnR );
+ dap_ap_write_reg_u32(swjdp, AP_REG_BD0 | (DCB_DCRSR & 0xC), regnum | DCRSR_WnR);
mem_ap_write_u32(swjdp, DCB_DCRDR, dcrdr);
retval = swjdp_transaction_endcheck(swjdp);
@@ -204,7 +204,7 @@ int cortex_m3_single_step_core(target_t *target)
return ERROR_OK;
}
-int cortex_m3_exec_opcode(target_t *target,uint32_t opcode, int len /* MODE, r0_invalue, &r0_outvalue */ )
+int cortex_m3_exec_opcode(target_t *target,uint32_t opcode, int len /* MODE, r0_invalue, &r0_outvalue */)
{
/* get pointers to arch-specific information */
armv7m_common_t *armv7m = target->arch_info;
@@ -444,7 +444,7 @@ int cortex_m3_debug_entry(target_t *target)
LOG_DEBUG("entered debug state in core mode: %s at PC 0x%" PRIx32 ", target->state: %s",
armv7m_mode_strings[armv7m->core_mode],
*(uint32_t*)(armv7m->core_cache->reg_list[15].value),
- Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name);
+ Jim_Nvp_value2name_simple(nvp_target_state, target->state)->name);
if (armv7m->post_debug_entry)
armv7m->post_debug_entry(target);
@@ -520,7 +520,7 @@ int cortex_m3_poll(target_t *target)
#if 0
/* Read Debug Fault Status Register, added to figure out the lockup when running flashtest.script */
mem_ap_read_atomic_u32(swjdp, NVIC_DFSR, &cortex_m3->nvic_dfsr);
- LOG_DEBUG("dcb_dhcsr 0x%x, nvic_dfsr 0x%x, target->state: %s", cortex_m3->dcb_dhcsr, cortex_m3->nvic_dfsr, Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name );
+ LOG_DEBUG("dcb_dhcsr 0x%x, nvic_dfsr 0x%x, target->state: %s", cortex_m3->dcb_dhcsr, cortex_m3->nvic_dfsr, Jim_Nvp_value2name_simple(nvp_target_state, target->state)->name);
#endif
return ERROR_OK;
@@ -529,7 +529,7 @@ int cortex_m3_poll(target_t *target)
int cortex_m3_halt(target_t *target)
{
LOG_DEBUG("target->state: %s",
- Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name);
+ Jim_Nvp_value2name_simple(nvp_target_state, target->state)->name);
if (target->state == TARGET_HALTED)
{
@@ -751,7 +751,7 @@ int cortex_m3_assert_reset(target_t *target)
int assert_srst = 1;
LOG_DEBUG("target->state: %s",
- Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name );
+ Jim_Nvp_value2name_simple(nvp_target_state, target->state)->name);
enum reset_types jtag_reset_config = jtag_get_reset_config();
if (!(jtag_reset_config & RESET_HAS_SRST))
@@ -765,7 +765,7 @@ int cortex_m3_assert_reset(target_t *target)
if (!(cortex_m3->dcb_dhcsr & C_DEBUGEN))
mem_ap_write_u32(swjdp, DCB_DHCSR, DBGKEY | C_DEBUGEN);
- mem_ap_write_u32(swjdp, DCB_DCRDR, 0 );
+ mem_ap_write_u32(swjdp, DCB_DCRDR, 0);
if (!target->reset_halt)
{
@@ -862,7 +862,7 @@ int cortex_m3_assert_reset(target_t *target)
int cortex_m3_deassert_reset(target_t *target)
{
LOG_DEBUG("target->state: %s",
- Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name);
+ Jim_Nvp_value2name_simple(nvp_target_state, target->state)->name);
/* deassert reset lines */
jtag_add_reset(0, 0);
diff --git a/src/target/etb.c b/src/target/etb.c
index 0e16b22b..a327fb6b 100644
--- a/src/target/etb.c
+++ b/src/target/etb.c
@@ -387,10 +387,10 @@ static int handle_etb_config_command(struct command_context_s *cmd_ctx, char *cm
return ERROR_FAIL;
}
- tap = jtag_tap_by_string(args[1] );
+ tap = jtag_tap_by_string(args[1]);
if (tap == NULL)
{
- command_print(cmd_ctx, "Tap: %s does not exist", args[1] );
+ command_print(cmd_ctx, "Tap: %s does not exist", args[1]);
return ERROR_FAIL;
}
diff --git a/src/target/image.c b/src/target/image.c
index ea9f3d34..e02c5b9e 100644
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -533,7 +533,7 @@ static int image_mot_buffer_complete(image_t *image)
}
else if (record_type >= 1 && record_type <= 3)
{
- switch (record_type )
+ switch (record_type)
{
case 1:
/* S1 - 16 bit address data record */
@@ -636,7 +636,7 @@ static int image_mot_buffer_complete(image_t *image)
cal_checksum += (uint8_t)checksum;
bytes_read += 2;
- if (cal_checksum != 0xFF )
+ if (cal_checksum != 0xFF)
{
/* checksum failed */
LOG_ERROR("incorrect record checksum found in S19 file");
@@ -852,7 +852,7 @@ int image_read_section(image_t *image, int section, uint32_t offset, uint32_t si
memcpy(buffer + *size_read,
image_memory->cache + (address - image_memory->cache_address),
(size_in_cache > size) ? size : size_in_cache
- );
+);
*size_read += (size_in_cache > size) ? size : size_in_cache;
address += (size_in_cache > size) ? size : size_in_cache;
diff --git a/src/target/mips32.c b/src/target/mips32.c
index b5131c3c..72b43149 100644
--- a/src/target/mips32.c
+++ b/src/target/mips32.c
@@ -265,7 +265,7 @@ int mips32_arch_state(struct target_s *target)
}
LOG_USER("target halted due to %s, pc: 0x%8.8" PRIx32 "",
- Jim_Nvp_value2name_simple(nvp_target_debug_reason, target->debug_reason )->name ,
+ Jim_Nvp_value2name_simple(nvp_target_debug_reason, target->debug_reason)->name ,
buf_get_u32(mips32->core_cache->reg_list[MIPS32_PC].value, 0, 32));
return ERROR_OK;
diff --git a/src/target/mips32_pracc.c b/src/target/mips32_pracc.c
index 55755065..c498aff9 100644
--- a/src/target/mips32_pracc.c
+++ b/src/target/mips32_pracc.c
@@ -187,7 +187,7 @@ static int mips32_pracc_exec_write(mips32_pracc_context *ctx, uint32_t address)
offset = (address - MIPS32_PRACC_PARAM_IN) / 4;
ctx->local_iparam[offset] = data;
}
- else if ((address >= MIPS32_PRACC_PARAM_OUT )
+ else if ((address >= MIPS32_PRACC_PARAM_OUT)
&& (address <= MIPS32_PRACC_PARAM_OUT + ctx->num_oparam * 4))
{
offset = (address - MIPS32_PRACC_PARAM_OUT) / 4;
diff --git a/src/target/mips32_pracc.h b/src/target/mips32_pracc.h
index e9b53ed1..8443f870 100644
--- a/src/target/mips32_pracc.h
+++ b/src/target/mips32_pracc.h
@@ -35,7 +35,7 @@
#define UPPER16(uint32_t) (uint32_t >> 16)
#define LOWER16(uint32_t) (uint32_t & 0xFFFF)
#define NEG16(v) (((~(v)) + 1) & 0xFFFF)
-/*#define NEG18(v) (((~(v)) + 1) & 0x3FFFF )*/
+/*#define NEG18(v) (((~(v)) + 1) & 0x3FFFF)*/
extern int mips32_pracc_read_mem(mips_ejtag_t *ejtag_info, uint32_t addr, int size, int count, void *buf);
extern int mips32_pracc_write_mem(mips_ejtag_t *ejtag_info, uint32_t addr, int size, int count, void *buf);
diff --git a/src/target/mips_ejtag.c b/src/target/mips_ejtag.c
index c03d1adb..7d643535 100644
--- a/src/target/mips_ejtag.c
+++ b/src/target/mips_ejtag.c
@@ -292,7 +292,7 @@ int mips_ejtag_init(mips_ejtag_t *ejtag_info)
ejtag_info->impcode & (1 << 16) ? " MIPS16": "",
ejtag_info->impcode & (1 << 14) ? " noDMA": " DMA",
ejtag_info->impcode & (1 << 0) ? " MIPS64": " MIPS32"
- );
+);
if ((ejtag_info->impcode & (1 << 14)) == 0)
LOG_DEBUG("EJTAG: DMA Access Mode Support Enabled");
diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index b8c032d9..aac95bbc 100644
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -148,7 +148,7 @@ int mips_m4k_debug_entry(target_t *target)
LOG_DEBUG("entered debug state at PC 0x%" PRIx32 ", target->state: %s",
*(uint32_t*)(mips32->core_cache->reg_list[MIPS32_PC].value),
- Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name);
+ Jim_Nvp_value2name_simple(nvp_target_state, target->state)->name);
return ERROR_OK;
}
@@ -220,7 +220,7 @@ int mips_m4k_halt(struct target_s *target)
mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
LOG_DEBUG("target->state: %s",
- Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name);
+ Jim_Nvp_value2name_simple(nvp_target_state, target->state)->name);
if (target->state == TARGET_HALTED)
{
@@ -265,7 +265,7 @@ int mips_m4k_assert_reset(target_t *target)
mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
LOG_DEBUG("target->state: %s",
- Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name);
+ Jim_Nvp_value2name_simple(nvp_target_state, target->state)->name);
enum reset_types jtag_reset_config = jtag_get_reset_config();
if (!(jtag_reset_config & RESET_HAS_SRST))
@@ -324,7 +324,7 @@ int mips_m4k_assert_reset(target_t *target)
int mips_m4k_deassert_reset(target_t *target)
{
LOG_DEBUG("target->state: %s",
- Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name);
+ Jim_Nvp_value2name_simple(nvp_target_state, target->state)->name);
/* deassert reset lines */
jtag_add_reset(0, 0);
diff --git a/src/target/register.c b/src/target/register.c
index 8bffe482..1c1dac82 100644
--- a/src/target/register.c
+++ b/src/target/register.c
@@ -119,7 +119,7 @@ static int register_set_dummy_core_reg(reg_t *reg, uint8_t *buf)
void register_init_dummy(reg_t *reg)
{
static int dummy_arch_type = -1;
- if (dummy_arch_type == -1 )
+ if (dummy_arch_type == -1)
dummy_arch_type = register_reg_arch_type(register_get_dummy_core_reg, register_set_dummy_core_reg);
reg->arch_type = dummy_arch_type;
diff --git a/src/target/target.c b/src/target/target.c
index ccb050a7..097d7130 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -139,12 +139,12 @@ const Jim_Nvp nvp_error_target[] = {
{ .value = -1, .name = NULL }
};
-const char *target_strerror_safe(int err )
+const char *target_strerror_safe(int err)
{
const Jim_Nvp *n;
- n = Jim_Nvp_value2name_simple(nvp_error_target, err );
- if (n->name == NULL ){
+ n = Jim_Nvp_value2name_simple(nvp_error_target, err);
+ if (n->name == NULL){
return "unknown";
} else {
return n->name;
@@ -244,8 +244,8 @@ static int max_target_number(void)
x = -1;
t = all_targets;
- while (t ){
- if (x < t->target_number ){
+ while (t){
+ if (x < t->target_number){
x = (t->target_number) + 1;
}
t = t->next;
@@ -263,7 +263,7 @@ static int new_target_number(void)
x = -1;
t = all_targets;
while (t){
- if (x < t->target_number ){
+ if (x < t->target_number){
x = t->target_number;
}
t = t->next;
@@ -353,7 +353,7 @@ static target_t *get_target_by_num(int num)
target_t *target = all_targets;
while (target){
- if (target->target_number == num ){
+ if (target->target_number == num){
return target;
}
target = target->next;
@@ -428,8 +428,8 @@ int target_process_reset(struct command_context_s *cmd_ctx, enum target_reset_mo
char buf[100];
int retval;
Jim_Nvp *n;
- n = Jim_Nvp_value2name_simple(nvp_reset_modes, reset_mode );
- if (n->name == NULL ){
+ n = Jim_Nvp_value2name_simple(nvp_reset_modes, reset_mode);
+ if (n->name == NULL){
LOG_ERROR("invalid reset mode");
return ERROR_FAIL;
}
@@ -441,8 +441,8 @@ int target_process_reset(struct command_context_s *cmd_ctx, enum target_reset_mo
int save_poll = target_continuous_poll;
target_continuous_poll = 0;
- sprintf(buf, "ocd_process_reset %s", n->name );
- retval = Jim_Eval(interp, buf );
+ sprintf(buf, "ocd_process_reset %s", n->name);
+ retval = Jim_Eval(interp, buf);
target_continuous_poll = save_poll;
@@ -823,9 +823,9 @@ int target_call_event_callbacks(target_t *target, enum target_event event)
LOG_DEBUG("target event %i (%s)",
event,
- Jim_Nvp_value2name_simple(nvp_target_event, event )->name );
+ Jim_Nvp_value2name_simple(nvp_target_event, event)->name);
- target_handle_event(target, event );
+ target_handle_event(target, event);
while (callback)
{
@@ -1071,7 +1071,7 @@ int target_register_commands(struct command_context_s *cmd_ctx)
- register_jim(cmd_ctx, "target", jim_target, "configure target" );
+ register_jim(cmd_ctx, "target", jim_target, "configure target");
return ERROR_OK;
}
@@ -1286,7 +1286,7 @@ int target_checksum_memory(struct target_s *target, uint32_t address, uint32_t s
target_buffer_set_u32(target, &buffer[i*sizeof(uint32_t)], target_data);
}
- retval = image_calculate_checksum(buffer, size, &checksum );
+ retval = image_calculate_checksum(buffer, size, &checksum);
free(buffer);
}
@@ -1520,7 +1520,7 @@ static int handle_targets_command(struct command_context_s *cmd_ctx, char *cmd,
{
target = get_target(args[0]);
if (target == NULL) {
- command_print(cmd_ctx,"Target: %s is unknown, try one of:\n", args[0] );
+ command_print(cmd_ctx,"Target: %s is unknown, try one of:\n", args[0]);
goto DumpTargets;
}
if (!target->tap->enabled) {
@@ -1982,8 +1982,8 @@ static int handle_reset_command(struct command_context_s *cmd_ctx, char *cmd, ch
if (argc == 1)
{
const Jim_Nvp *n;
- n = Jim_Nvp_name2value_simple(nvp_reset_modes, args[0] );
- if ((n->name == NULL) || (n->value == RESET_UNKNOWN) ){
+ n = Jim_Nvp_name2value_simple(nvp_reset_modes, args[0]);
+ if ((n->name == NULL) || (n->value == RESET_UNKNOWN)){
return ERROR_COMMAND_SYNTAX_ERROR;
}
reset_mode = n->value;
@@ -2473,16 +2473,16 @@ static int handle_verify_image_command_internal(struct command_context_s *cmd_ct
if (verify)
{
/* calculate checksum of image */
- image_calculate_checksum(buffer, buf_cnt, &checksum );
+ image_calculate_checksum(buffer, buf_cnt, &checksum);
retval = target_checksum_memory(target, image.sections[i].base_address, buf_cnt, &mem_checksum);
- if (retval != ERROR_OK )
+ if (retval != ERROR_OK)
{
free(buffer);
break;
}
- if (checksum != mem_checksum )
+ if (checksum != mem_checksum)
{
/* failed crc checksum, fall back to a binary compare */
uint8_t *data;
@@ -3084,7 +3084,7 @@ static int target_mem2array(Jim_Interp *interp, target_t *target, int argc, Jim_
break;
default:
Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
- Jim_AppendStrings(interp, Jim_GetResult(interp), "Invalid width param, must be 8/16/32", NULL );
+ Jim_AppendStrings(interp, Jim_GetResult(interp), "Invalid width param, must be 8/16/32", NULL);
return JIM_ERR;
}
if (len == 0) {
@@ -3132,7 +3132,7 @@ static int target_mem2array(Jim_Interp *interp, target_t *target, int argc, Jim_
count = (sizeof(buffer)/width);
}
- retval = target_read_memory(target, addr, width, count, buffer );
+ retval = target_read_memory(target, addr, width, count, buffer);
if (retval != ERROR_OK) {
/* BOO !*/
LOG_ERROR("mem2array: Read @ 0x%08x, w=%d, cnt=%d, failed",
@@ -3215,7 +3215,7 @@ static int jim_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
return JIM_ERR;
}
- return target_array2mem(interp,target, argc-1, argv + 1 );
+ return target_array2mem(interp,target, argc-1, argv + 1);
}
static int target_array2mem(Jim_Interp *interp, target_t *target, int argc, Jim_Obj *const *argv)
@@ -3271,7 +3271,7 @@ static int target_array2mem(Jim_Interp *interp, target_t *target, int argc, Jim_
break;
default:
Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
- Jim_AppendStrings(interp, Jim_GetResult(interp), "Invalid width param, must be 8/16/32", NULL );
+ Jim_AppendStrings(interp, Jim_GetResult(interp), "Invalid width param, must be 8/16/32", NULL);
return JIM_ERR;
}
if (len == 0) {
@@ -3355,22 +3355,22 @@ static int target_array2mem(Jim_Interp *interp, target_t *target, int argc, Jim_
return JIM_OK;
}
-void target_all_handle_event(enum target_event e )
+void target_all_handle_event(enum target_event e)
{
target_t *target;
LOG_DEBUG("**all*targets: event: %d, %s",
(int)e,
- Jim_Nvp_value2name_simple(nvp_target_event, e )->name );
+ Jim_Nvp_value2name_simple(nvp_target_event, e)->name);
target = all_targets;
while (target){
- target_handle_event(target, e );
+ target_handle_event(target, e);
target = target->next;
}
}
-void target_handle_event(target_t *target, enum target_event e )
+void target_handle_event(target_t *target, enum target_event e)
{
target_event_action_t *teap;
int done;
@@ -3378,27 +3378,27 @@ void target_handle_event(target_t *target, enum target_event e )
teap = target->event_action;
done = 0;
- while (teap ){
- if (teap->event == e ){
+ while (teap){
+ if (teap->event == e){
done = 1;
LOG_DEBUG("target: (%d) %s (%s) event: %d (%s) action: %s\n",
target->target_number,
target->cmd_name,
target_get_name(target),
e,
- Jim_Nvp_value2name_simple(nvp_target_event, e )->name,
- Jim_GetString(teap->body, NULL ) );
- if (Jim_EvalObj(interp, teap->body ) != JIM_OK)
+ Jim_Nvp_value2name_simple(nvp_target_event, e)->name,
+ Jim_GetString(teap->body, NULL));
+ if (Jim_EvalObj(interp, teap->body) != JIM_OK)
{
Jim_PrintErrorMessage(interp);
}
}
teap = teap->next;
}
- if (!done ){
+ if (!done){
LOG_DEBUG("event: %d %s - no action",
e,
- Jim_Nvp_value2name_simple(nvp_target_event, e )->name );
+ Jim_Nvp_value2name_simple(nvp_target_event, e)->name);
}
}
@@ -3428,7 +3428,7 @@ static Jim_Nvp nvp_config_opts[] = {
{ .name = NULL, .value = -1 }
};
-static int target_configure(Jim_GetOptInfo *goi, target_t *target )
+static int target_configure(Jim_GetOptInfo *goi, target_t *target)
{
Jim_Nvp *n;
Jim_Obj *o;
@@ -3437,64 +3437,64 @@ static int target_configure(Jim_GetOptInfo *goi, target_t *target )
int e;
/* parse config or cget options ... */
- while (goi->argc > 0 ){
- Jim_SetEmptyResult(goi->interp );
- /* Jim_GetOpt_Debug(goi ); */
+ while (goi->argc > 0){
+ Jim_SetEmptyResult(goi->interp);
+ /* Jim_GetOpt_Debug(goi); */
- if (target->type->target_jim_configure ){
+ if (target->type->target_jim_configure){
/* target defines a configure function */
/* target gets first dibs on parameters */
- e = (*(target->type->target_jim_configure))(target, goi );
- if (e == JIM_OK ){
+ e = (*(target->type->target_jim_configure))(target, goi);
+ if (e == JIM_OK){
/* more? */
continue;
}
- if (e == JIM_ERR ){
+ if (e == JIM_ERR){
/* An error */
return e;
}
/* otherwise we 'continue' below */
}
- e = Jim_GetOpt_Nvp(goi, nvp_config_opts, &n );
- if (e != JIM_OK ){
- Jim_GetOpt_NvpUnknown(goi, nvp_config_opts, 0 );
+ e = Jim_GetOpt_Nvp(goi, nvp_config_opts, &n);
+ if (e != JIM_OK){
+ Jim_GetOpt_NvpUnknown(goi, nvp_config_opts, 0);
return e;
}
- switch (n->value ){
+ switch (n->value){
case TCFG_TYPE:
/* not setable */
- if (goi->isconfigure ){
- Jim_SetResult_sprintf(goi->interp, "not setable: %s", n->name );
+ if (goi->isconfigure){
+ Jim_SetResult_sprintf(goi->interp, "not setable: %s", n->name);
return JIM_ERR;
} else {
no_params:
- if (goi->argc != 0 ){
+ if (goi->argc != 0){
Jim_WrongNumArgs(goi->interp, goi->argc, goi->argv, "NO PARAMS");
return JIM_ERR;
}
}
- Jim_SetResultString(goi->interp, target_get_name(target), -1 );
+ Jim_SetResultString(goi->interp, target_get_name(target), -1);
/* loop for more */
break;
case TCFG_EVENT:
- if (goi->argc == 0 ){
+ if (goi->argc == 0){
Jim_WrongNumArgs(goi->interp, goi->argc, goi->argv, "-event ?event-name? ...");
return JIM_ERR;
}
- e = Jim_GetOpt_Nvp(goi, nvp_target_event, &n );
- if (e != JIM_OK ){
- Jim_GetOpt_NvpUnknown(goi, nvp_target_event, 1 );
+ e = Jim_GetOpt_Nvp(goi, nvp_target_event, &n);
+ if (e != JIM_OK){
+ Jim_GetOpt_NvpUnknown(goi, nvp_target_event, 1);
return e;
}
- if (goi->isconfigure ){
- if (goi->argc != 1 ){
+ if (goi->isconfigure){
+ if (goi->argc != 1){
Jim_WrongNumArgs(goi->interp, goi->argc, goi->argv, "-event ?event-name? ?EVENT-BODY?");
return JIM_ERR;
}
} else {
- if (goi->argc != 0 ){
+ if (goi->argc != 0){
Jim_WrongNumArgs(goi->interp, goi->argc, goi->argv, "-event ?event-name?");
return JIM_ERR;
}
@@ -3505,24 +3505,24 @@ static int target_configure(Jim_GetOptInfo *goi, target_t *target )
teap = target->event_action;
/* replace existing? */
- while (teap ){
- if (teap->event == (enum target_event)n->value ){
+ while (teap){
+ if (teap->event == (enum target_event)n->value){
break;
}
teap = teap->next;
}
- if (goi->isconfigure ){
- if (teap == NULL ){
+ if (goi->isconfigure){
+ if (teap == NULL){
/* create new */
- teap = calloc(1, sizeof(*teap) );
+ teap = calloc(1, sizeof(*teap));
}
teap->event = n->value;
- Jim_GetOpt_Obj(goi, &o );
- if (teap->body ){
- Jim_DecrRefCount(interp, teap->body );
+ Jim_GetOpt_Obj(goi, &o);
+ if (teap->body){
+ Jim_DecrRefCount(interp, teap->body);
}
- teap->body = Jim_DuplicateObj(goi->interp, o );
+ teap->body = Jim_DuplicateObj(goi->interp, o);
/*
* FIXME:
* Tcl/TK - "tk events" have a nice feature.
@@ -3533,7 +3533,7 @@ static int target_configure(Jim_GetOptInfo *goi, target_t *target )
* The idea is: %N - target number
* The idea is: %E - event name.
*/
- Jim_IncrRefCount(teap->body );
+ Jim_IncrRefCount(teap->body);
/* add to head of event list */
teap->next = target->event_action;
@@ -3541,10 +3541,10 @@ static int target_configure(Jim_GetOptInfo *goi, target_t *target )
Jim_SetEmptyResult(goi->interp);
} else {
/* get */
- if (teap == NULL ){
- Jim_SetEmptyResult(goi->interp );
+ if (teap == NULL){
+ Jim_SetEmptyResult(goi->interp);
} else {
- Jim_SetResult(goi->interp, Jim_DuplicateObj(goi->interp, teap->body ) );
+ Jim_SetResult(goi->interp, Jim_DuplicateObj(goi->interp, teap->body));
}
}
}
@@ -3552,67 +3552,67 @@ static int target_configure(Jim_GetOptInfo *goi, target_t *target )
break;
case TCFG_WORK_AREA_VIRT:
- if (goi->isconfigure ){
+ if (goi->isconfigure){
target_free_all_working_areas(target);
- e = Jim_GetOpt_Wide(goi, &w );
- if (e != JIM_OK ){
+ e = Jim_GetOpt_Wide(goi, &w);
+ if (e != JIM_OK){
return e;
}
target->working_area_virt = w;
} else {
- if (goi->argc != 0 ){
+ if (goi->argc != 0){
goto no_params;
}
}
- Jim_SetResult(interp, Jim_NewIntObj(goi->interp, target->working_area_virt ) );
+ Jim_SetResult(interp, Jim_NewIntObj(goi->interp, target->working_area_virt));
/* loop for more */
break;
case TCFG_WORK_AREA_PHYS:
- if (goi->isconfigure ){
+ if (goi->isconfigure){
target_free_all_working_areas(target);
- e = Jim_GetOpt_Wide(goi, &w );
- if (e != JIM_OK ){
+ e = Jim_GetOpt_Wide(goi, &w);
+ if (e != JIM_OK){
return e;
}
target->working_area_phys = w;
} else {
- if (goi->argc != 0 ){
+ if (goi->argc != 0){
goto no_params;
}
}
- Jim_SetResult(interp, Jim_NewIntObj(goi->interp, target->working_area_phys ) );
+ Jim_SetResult(interp, Jim_NewIntObj(goi->interp, target->working_area_phys));
/* loop for more */
break;
case TCFG_WORK_AREA_SIZE:
- if (goi->isconfigure ){
+ if (goi->isconfigure){
target_free_all_working_areas(target);
- e = Jim_GetOpt_Wide(goi, &w );
- if (e != JIM_OK ){
+ e = Jim_GetOpt_Wide(goi, &w);
+ if (e != JIM_OK){
return e;
}
target->working_area_size = w;
} else {
- if (goi->argc != 0 ){
+ if (goi->argc != 0){
goto no_params;
}
}
- Jim_SetResult(interp, Jim_NewIntObj(goi->interp, target->working_area_size ) );
+ Jim_SetResult(interp, Jim_NewIntObj(goi->interp, target->working_area_size));
/* loop for more */
break;
case TCFG_WORK_AREA_BACKUP:
- if (goi->isconfigure ){
+ if (goi->isconfigure){
target_free_all_working_areas(target);
- e = Jim_GetOpt_Wide(goi, &w );
- if (e != JIM_OK ){
+ e = Jim_GetOpt_Wide(goi, &w);
+ if (e != JIM_OK){
return e;
}
/* make this exactly 1 or 0 */
target->backup_working_area = (!!w);
} else {
- if (goi->argc != 0 ){
+ if (goi->argc != 0){
goto no_params;
}
}
@@ -3621,73 +3621,73 @@ static int target_configure(Jim_GetOptInfo *goi, target_t *target )
break;
case TCFG_ENDIAN:
- if (goi->isconfigure ){
- e = Jim_GetOpt_Nvp(goi, nvp_target_endian, &n );
- if (e != JIM_OK ){
- Jim_GetOpt_NvpUnknown(goi, nvp_target_endian, 1 );
+ if (goi->isconfigure){
+ e = Jim_GetOpt_Nvp(goi, nvp_target_endian, &n);
+ if (e != JIM_OK){
+ Jim_GetOpt_NvpUnknown(goi, nvp_target_endian, 1);
return e;
}
target->endianness = n->value;
} else {
- if (goi->argc != 0 ){
+ if (goi->argc != 0){
goto no_params;
}
}
- n = Jim_Nvp_value2name_simple(nvp_target_endian, target->endianness );
- if (n->name == NULL ){
+ n = Jim_Nvp_value2name_simple(nvp_target_endian, target->endianness);
+ if (n->name == NULL){
target->endianness = TARGET_LITTLE_ENDIAN;
- n = Jim_Nvp_value2name_simple(nvp_target_endian, target->endianness );
+ n = Jim_Nvp_value2name_simple(nvp_target_endian, target->endianness);
}
- Jim_SetResultString(goi->interp, n->name, -1 );
+ Jim_SetResultString(goi->interp, n->name, -1);
/* loop for more */
break;
case TCFG_VARIANT:
- if (goi->isconfigure ){
- if (goi->argc < 1 ){
+ if (goi->isconfigure){
+ if (goi->argc < 1){
Jim_SetResult_sprintf(goi->interp,
"%s ?STRING?",
- n->name );
+ n->name);
return JIM_ERR;
}
- if (target->variant ){
+ if (target->variant){
free((void *)(target->variant));
}
- e = Jim_GetOpt_String(goi, &cp, NULL );
+ e = Jim_GetOpt_String(goi, &cp, NULL);
target->variant = strdup(cp);
} else {
- if (goi->argc != 0 ){
+ if (goi->argc != 0){
goto no_params;
}
}
- Jim_SetResultString(goi->interp, target->variant,-1 );
+ Jim_SetResultString(goi->interp, target->variant,-1);
/* loop for more */
break;
case TCFG_CHAIN_POSITION:
- if (goi->isconfigure ){
+ if (goi->isconfigure){
Jim_Obj *o;
jtag_tap_t *tap;
target_free_all_working_areas(target);
- e = Jim_GetOpt_Obj(goi, &o );
- if (e != JIM_OK ){
+ e = Jim_GetOpt_Obj(goi, &o);
+ if (e != JIM_OK){
return e;
}
- tap = jtag_tap_by_jim_obj(goi->interp, o );
- if (tap == NULL ){
+ tap = jtag_tap_by_jim_obj(goi->interp, o);
+ if (tap == NULL){
return JIM_ERR;
}
/* make this exactly 1 or 0 */
target->tap = tap;
} else {
- if (goi->argc != 0 ){
+ if (goi->argc != 0){
goto no_params;
}
}
- Jim_SetResultString(interp, target->tap->dotted_name, -1 );
+ Jim_SetResultString(interp, target->tap->dotted_name, -1);
/* loop for more e*/
break;
}
- } /* while (goi->argc ) */
+ } /* while (goi->argc) */
/* done - we return */
@@ -3695,7 +3695,7 @@ static int target_configure(Jim_GetOptInfo *goi, target_t *target )
}
/** this is the 'tcl' handler for the target specific command */
-static int tcl_target_func(Jim_Interp *interp, int argc, Jim_Obj *const *argv )
+static int tcl_target_func(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
{
Jim_GetOptInfo goi;
jim_wide a,b,c;
@@ -3749,36 +3749,36 @@ static int tcl_target_func(Jim_Interp *interp, int argc, Jim_Obj *const *argv )
};
/* go past the "command" */
- Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1 );
+ Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1);
- target = Jim_CmdPrivData(goi.interp );
+ target = Jim_CmdPrivData(goi.interp);
cmd_ctx = Jim_GetAssocData(goi.interp, "context");
/* commands here are in an NVP table */
- e = Jim_GetOpt_Nvp(&goi, target_options, &n );
- if (e != JIM_OK ){
- Jim_GetOpt_NvpUnknown(&goi, target_options, 0 );
+ e = Jim_GetOpt_Nvp(&goi, target_options, &n);
+ if (e != JIM_OK){
+ Jim_GetOpt_NvpUnknown(&goi, target_options, 0);
return e;
}
/* Assume blank result */
- Jim_SetEmptyResult(goi.interp );
+ Jim_SetEmptyResult(goi.interp);
- switch (n->value ){
+ switch (n->value){
case TS_CMD_CONFIGURE:
- if (goi.argc < 2 ){
+ if (goi.argc < 2){
Jim_WrongNumArgs(goi.interp, goi.argc, goi.argv, "missing: -option VALUE ...");
return JIM_ERR;
}
goi.isconfigure = 1;
- return target_configure(&goi, target );
+ return target_configure(&goi, target);
case TS_CMD_CGET:
// some things take params
- if (goi.argc < 1 ){
+ if (goi.argc < 1){
Jim_WrongNumArgs(goi.interp, 0, goi.argv, "missing: ?-option?");
return JIM_ERR;
}
goi.isconfigure = 0;
- return target_configure(&goi, target );
+ return target_configure(&goi, target);
break;
case TS_CMD_MWW:
case TS_CMD_MWH:
@@ -3789,50 +3789,50 @@ static int tcl_target_func(Jim_Interp *interp, int argc, Jim_Obj *const *argv )
* argv[3] = optional count.
*/
- if ((goi.argc == 2) || (goi.argc == 3) ){
+ if ((goi.argc == 2) || (goi.argc == 3)){
/* all is well */
} else {
mwx_error:
- Jim_SetResult_sprintf(goi.interp, "expected: %s ADDR DATA [COUNT]", n->name );
+ Jim_SetResult_sprintf(goi.interp, "expected: %s ADDR DATA [COUNT]", n->name);
return JIM_ERR;
}
- e = Jim_GetOpt_Wide(&goi, &a );
- if (e != JIM_OK ){
+ e = Jim_GetOpt_Wide(&goi, &a);
+ if (e != JIM_OK){
goto mwx_error;
}
- e = Jim_GetOpt_Wide(&goi, &b );
- if (e != JIM_OK ){
+ e = Jim_GetOpt_Wide(&goi, &b);
+ if (e != JIM_OK){
goto mwx_error;
}
if (goi.argc == 3) {
- e = Jim_GetOpt_Wide(&goi, &c );
- if (e != JIM_OK ){
+ e = Jim_GetOpt_Wide(&goi, &c);
+ if (e != JIM_OK){
goto mwx_error;
}
} else {
c = 1;
}
- switch (n->value ){
+ switch (n->value){
case TS_CMD_MWW:
- target_buffer_set_u32(target, target_buf, b );
+ target_buffer_set_u32(target, target_buf, b);
b = 4;
break;
case TS_CMD_MWH:
- target_buffer_set_u16(target, target_buf, b );
+ target_buffer_set_u16(target, target_buf, b);
b = 2;
break;
case TS_CMD_MWB:
- target_buffer_set_u8(target, target_buf, b );
+ target_buffer_set_u8(target, target_buf, b);
b = 1;
break;
}
- for (x = 0 ; x < c ; x++ ){
- e = target_write_memory(target, a, b, 1, target_buf );
- if (e != ERROR_OK ){
- Jim_SetResult_sprintf(interp, "Error writing @ 0x%08x: %d\n", (int)(a), e );
+ for (x = 0 ; x < c ; x++){
+ e = target_write_memory(target, a, b, 1, target_buf);
+ if (e != ERROR_OK){
+ Jim_SetResult_sprintf(interp, "Error writing @ 0x%08x: %d\n", (int)(a), e);
return JIM_ERR;
}
/* b = width */
@@ -3849,24 +3849,24 @@ static int tcl_target_func(Jim_Interp *interp, int argc, Jim_Obj *const *argv )
* argv[1] = address
* argv[2] = optional count
*/
- if ((goi.argc == 2) || (goi.argc == 3) ){
- Jim_SetResult_sprintf(goi.interp, "expected: %s ADDR [COUNT]", n->name );
+ if ((goi.argc == 2) || (goi.argc == 3)){
+ Jim_SetResult_sprintf(goi.interp, "expected: %s ADDR [COUNT]", n->name);
return JIM_ERR;
}
- e = Jim_GetOpt_Wide(&goi, &a );
- if (e != JIM_OK ){
+ e = Jim_GetOpt_Wide(&goi, &a);
+ if (e != JIM_OK){
return JIM_ERR;
}
- if (goi.argc ){
- e = Jim_GetOpt_Wide(&goi, &c );
- if (e != JIM_OK ){
+ if (goi.argc){
+ e = Jim_GetOpt_Wide(&goi, &c);
+ if (e != JIM_OK){
return JIM_ERR;
}
} else {
c = 1;
}
b = 1; /* shut up gcc */
- switch (n->value ){
+ switch (n->value){
case TS_CMD_MDW:
b = 4;
break;
@@ -3881,52 +3881,52 @@ static int tcl_target_func(Jim_Interp *interp, int argc, Jim_Obj *const *argv )
/* convert to "bytes" */
c = c * b;
/* count is now in 'BYTES' */
- while (c > 0 ){
+ while (c > 0){
y = c;
- if (y > 16 ){
+ if (y > 16){
y = 16;
}
- e = target_read_memory(target, a, b, y / b, target_buf );
- if (e != ERROR_OK ){
- Jim_SetResult_sprintf(interp, "error reading target @ 0x%08lx", (int)(a) );
+ e = target_read_memory(target, a, b, y / b, target_buf);
+ if (e != ERROR_OK){
+ Jim_SetResult_sprintf(interp, "error reading target @ 0x%08lx", (int)(a));
return JIM_ERR;
}
- Jim_fprintf(interp, interp->cookie_stdout, "0x%08x ", (int)(a) );
- switch (b ){
+ Jim_fprintf(interp, interp->cookie_stdout, "0x%08x ", (int)(a));
+ switch (b){
case 4:
- for (x = 0 ; (x < 16) && (x < y) ; x += 4 ){
- z = target_buffer_get_u32(target, &(target_buf[ x * 4 ]) );
- Jim_fprintf(interp, interp->cookie_stdout, "%08x ", (int)(z) );
+ for (x = 0 ; (x < 16) && (x < y) ; x += 4){
+ z = target_buffer_get_u32(target, &(target_buf[ x * 4 ]));
+ Jim_fprintf(interp, interp->cookie_stdout, "%08x ", (int)(z));
}
- for (; (x < 16) ; x += 4 ){
- Jim_fprintf(interp, interp->cookie_stdout, " " );
+ for (; (x < 16) ; x += 4){
+ Jim_fprintf(interp, interp->cookie_stdout, " ");
}
break;
case 2:
- for (x = 0 ; (x < 16) && (x < y) ; x += 2 ){
- z = target_buffer_get_u16(target, &(target_buf[ x * 2 ]) );
- Jim_fprintf(interp, interp->cookie_stdout, "%04x ", (int)(z) );
+ for (x = 0 ; (x < 16) && (x < y) ; x += 2){
+ z = target_buffer_get_u16(target, &(target_buf[ x * 2 ]));
+ Jim_fprintf(interp, interp->cookie_stdout, "%04x ", (int)(z));
}
- for (; (x < 16) ; x += 2 ){
- Jim_fprintf(interp, interp->cookie_stdout, " " );
+ for (; (x < 16) ; x += 2){
+ Jim_fprintf(interp, interp->cookie_stdout, " ");
}
break;
case 1:
default:
- for (x = 0 ; (x < 16) && (x < y) ; x += 1 ){
- z = target_buffer_get_u8(target, &(target_buf[ x * 4 ]) );
- Jim_fprintf(interp, interp->cookie_stdout, "%02x ", (int)(z) );
+ for (x = 0 ; (x < 16) && (x < y) ; x += 1){
+ z = target_buffer_get_u8(target, &(target_buf[ x * 4 ]));
+ Jim_fprintf(interp, interp->cookie_stdout, "%02x ", (int)(z));
}
- for (; (x < 16) ; x += 1 ){
- Jim_fprintf(interp, interp->cookie_stdout, " " );
+ for (; (x < 16) ; x += 1){
+ Jim_fprintf(interp, interp->cookie_stdout, " ");
}
break;
}
/* ascii-ify the bytes */
- for (x = 0 ; x < y ; x++ ){
+ for (x = 0 ; x < y ; x++){
if ((target_buf[x] >= 0x20) &&
- (target_buf[x] <= 0x7e) ){
+ (target_buf[x] <= 0x7e)){
/* good */
} else {
/* smack it */
@@ -3934,70 +3934,70 @@ static int tcl_target_func(Jim_Interp *interp, int argc, Jim_Obj *const *argv )
}
}
/* space pad */
- while (x < 16 ){
+ while (x < 16){
target_buf[x] = ' ';
x++;
}
/* terminate */
target_buf[16] = 0;
/* print - with a newline */
- Jim_fprintf(interp, interp->cookie_stdout, "%s\n", target_buf );
+ Jim_fprintf(interp, interp->cookie_stdout, "%s\n", target_buf);
/* NEXT... */
c -= 16;
a += 16;
}
return JIM_OK;
case TS_CMD_MEM2ARRAY:
- return target_mem2array(goi.interp, target, goi.argc, goi.argv );
+ return target_mem2array(goi.interp, target, goi.argc, goi.argv);
break;
case TS_CMD_ARRAY2MEM:
- return target_array2mem(goi.interp, target, goi.argc, goi.argv );
+ return target_array2mem(goi.interp, target, goi.argc, goi.argv);
break;
case TS_CMD_EXAMINE:
- if (goi.argc ){
+ if (goi.argc){
Jim_WrongNumArgs(goi.interp, 2, argv, "[no parameters]");
return JIM_ERR;
}
if (!target->tap->enabled)
goto err_tap_disabled;
- e = target->type->examine(target );
- if (e != ERROR_OK ){
- Jim_SetResult_sprintf(interp, "examine-fails: %d", e );
+ e = target->type->examine(target);
+ if (e != ERROR_OK){
+ Jim_SetResult_sprintf(interp, "examine-fails: %d", e);
return JIM_ERR;
}
return JIM_OK;
case TS_CMD_POLL:
- if (goi.argc ){
+ if (goi.argc){
Jim_WrongNumArgs(goi.interp, 2, argv, "[no parameters]");
return JIM_ERR;
}
if (!target->tap->enabled)
goto err_tap_disabled;
- if (!(target_was_examined(target)) ){
+ if (!(target_was_examined(target))){
e = ERROR_TARGET_NOT_EXAMINED;
} else {
- e = target->type->poll(target );
+ e = target->type->poll(target);
}
- if (e != ERROR_OK ){
- Jim_SetResult_sprintf(interp, "poll-fails: %d", e );
+ if (e != ERROR_OK){
+ Jim_SetResult_sprintf(interp, "poll-fails: %d", e);
return JIM_ERR;
} else {
return JIM_OK;
}
break;
case TS_CMD_RESET:
- if (goi.argc != 2 ){
+ if (goi.argc != 2){
Jim_WrongNumArgs(interp, 2, argv, "t | f|assert | deassert BOOL");
return JIM_ERR;
}
- e = Jim_GetOpt_Nvp(&goi, nvp_assert, &n );
- if (e != JIM_OK ){
- Jim_GetOpt_NvpUnknown(&goi, nvp_assert, 1 );
+ e = Jim_GetOpt_Nvp(&goi, nvp_assert, &n);
+ if (e != JIM_OK){
+ Jim_GetOpt_NvpUnknown(&goi, nvp_assert, 1);
return e;
}
/* the halt or not param */
e = Jim_GetOpt_Wide(&goi, &a);
- if (e != JIM_OK ){
+ if (e != JIM_OK){
return e;
}
if (!target->tap->enabled)
@@ -4008,45 +4008,45 @@ static int tcl_target_func(Jim_Interp *interp, int argc, Jim_Obj *const *argv )
target_free_all_working_areas_restore(target, 0);
/* do the assert */
- if (n->value == NVP_ASSERT ){
- target->type->assert_reset(target );
+ if (n->value == NVP_ASSERT){
+ target->type->assert_reset(target);
} else {
- target->type->deassert_reset(target );
+ target->type->deassert_reset(target);
}
return JIM_OK;
case TS_CMD_HALT:
- if (goi.argc ){
+ if (goi.argc){
Jim_WrongNumArgs(goi.interp, 0, argv, "halt [no parameters]");
return JIM_ERR;
}
if (!target->tap->enabled)
goto err_tap_disabled;
- target->type->halt(target );
+ target->type->halt(target);
return JIM_OK;
case TS_CMD_WAITSTATE:
/* params: <name> statename timeoutmsecs */
- if (goi.argc != 2 ){
- Jim_SetResult_sprintf(goi.interp, "%s STATENAME TIMEOUTMSECS", n->name );
+ if (goi.argc != 2){
+ Jim_SetResult_sprintf(goi.interp, "%s STATENAME TIMEOUTMSECS", n->name);
return JIM_ERR;
}
- e = Jim_GetOpt_Nvp(&goi, nvp_target_state, &n );
- if (e != JIM_OK ){
- Jim_GetOpt_NvpUnknown(&goi, nvp_target_state,1 );
+ e = Jim_GetOpt_Nvp(&goi, nvp_target_state, &n);
+ if (e != JIM_OK){
+ Jim_GetOpt_NvpUnknown(&goi, nvp_target_state,1);
return e;
}
- e = Jim_GetOpt_Wide(&goi, &a );
- if (e != JIM_OK ){
+ e = Jim_GetOpt_Wide(&goi, &a);
+ if (e != JIM_OK){
return e;
}
if (!target->tap->enabled)
goto err_tap_disabled;
- e = target_wait_state(target, n->value, a );
- if (e != ERROR_OK ){
+ e = target_wait_state(target, n->value, a);
+ if (e != ERROR_OK){
Jim_SetResult_sprintf(goi.interp,
"target: %s wait %s fails (%d) %s",
target->cmd_name,
n->name,
- e, target_strerror_safe(e) );
+ e, target_strerror_safe(e));
return JIM_ERR;
} else {
return JIM_OK;
@@ -4060,21 +4060,21 @@ static int tcl_target_func(Jim_Interp *interp, int argc, Jim_Obj *const *argv )
teap = target->event_action;
command_print(cmd_ctx, "Event actions for target (%d) %s\n",
target->target_number,
- target->cmd_name );
+ target->cmd_name);
command_print(cmd_ctx, "%-25s | Body", "Event");
command_print(cmd_ctx, "------------------------- | ----------------------------------------");
- while (teap ){
+ while (teap){
command_print(cmd_ctx,
"%-25s | %s",
- Jim_Nvp_value2name_simple(nvp_target_event, teap->event )->name,
- Jim_GetString(teap->body, NULL ) );
+ Jim_Nvp_value2name_simple(nvp_target_event, teap->event)->name,
+ Jim_GetString(teap->body, NULL));
teap = teap->next;
}
command_print(cmd_ctx, "***END***");
return JIM_OK;
}
case TS_CMD_CURSTATE:
- if (goi.argc != 0 ){
+ if (goi.argc != 0){
Jim_WrongNumArgs(goi.interp, 0, argv, "[no parameters]");
return JIM_ERR;
}
@@ -4082,16 +4082,16 @@ static int tcl_target_func(Jim_Interp *interp, int argc, Jim_Obj *const *argv )
Jim_Nvp_value2name_simple(nvp_target_state,target->state)->name,-1);
return JIM_OK;
case TS_CMD_INVOKE_EVENT:
- if (goi.argc != 1 ){
+ if (goi.argc != 1){
Jim_SetResult_sprintf(goi.interp, "%s ?EVENTNAME?",n->name);
return JIM_ERR;
}
- e = Jim_GetOpt_Nvp(&goi, nvp_target_event, &n );
- if (e != JIM_OK ){
- Jim_GetOpt_NvpUnknown(&goi, nvp_target_event, 1 );
+ e = Jim_GetOpt_Nvp(&goi, nvp_target_event, &n);
+ if (e != JIM_OK){
+ Jim_GetOpt_NvpUnknown(&goi, nvp_target_event, 1);
return e;
}
- target_handle_event(target, n->value );
+ target_handle_event(target, n->value);
return JIM_OK;
}
return JIM_ERR;
@@ -4101,7 +4101,7 @@ err_tap_disabled:
return JIM_ERR;
}
-static int target_create(Jim_GetOptInfo *goi )
+static int target_create(Jim_GetOptInfo *goi)
{
Jim_Obj *new_cmd;
Jim_Cmd *cmd;
@@ -4113,35 +4113,35 @@ static int target_create(Jim_GetOptInfo *goi )
struct command_context_s *cmd_ctx;
cmd_ctx = Jim_GetAssocData(goi->interp, "context");
- if (goi->argc < 3 ){
+ if (goi->argc < 3){
Jim_WrongNumArgs(goi->interp, 1, goi->argv, "?name? ?type? ..options...");
return JIM_ERR;
}
/* COMMAND */
- Jim_GetOpt_Obj(goi, &new_cmd );
+ Jim_GetOpt_Obj(goi, &new_cmd);
/* does this command exist? */
- cmd = Jim_GetCommand(goi->interp, new_cmd, JIM_ERRMSG );
- if (cmd ){
- cp = Jim_GetString(new_cmd, NULL );
+ cmd = Jim_GetCommand(goi->interp, new_cmd, JIM_ERRMSG);
+ if (cmd){
+ cp = Jim_GetString(new_cmd, NULL);
Jim_SetResult_sprintf(goi->interp, "Command/target: %s Exists", cp);
return JIM_ERR;
}
/* TYPE */
- e = Jim_GetOpt_String(goi, &cp2, NULL );
+ e = Jim_GetOpt_String(goi, &cp2, NULL);
cp = cp2;
/* now does target type exist */
- for (x = 0 ; target_types[x] ; x++ ){
- if (0 == strcmp(cp, target_types[x]->name ) ){
+ for (x = 0 ; target_types[x] ; x++){
+ if (0 == strcmp(cp, target_types[x]->name)){
/* found */
break;
}
}
- if (target_types[x] == NULL ){
- Jim_SetResult_sprintf(goi->interp, "Unknown target type %s, try one of ", cp );
- for (x = 0 ; target_types[x] ; x++ ){
- if (target_types[x + 1] ){
+ if (target_types[x] == NULL){
+ Jim_SetResult_sprintf(goi->interp, "Unknown target type %s, try one of ", cp);
+ for (x = 0 ; target_types[x] ; x++){
+ if (target_types[x + 1]){
Jim_AppendStrings(goi->interp,
Jim_GetResult(goi->interp),
target_types[x]->name,
@@ -4150,7 +4150,7 @@ static int target_create(Jim_GetOptInfo *goi )
Jim_AppendStrings(goi->interp,
Jim_GetResult(goi->interp),
" or ",
- target_types[x]->name,NULL );
+ target_types[x]->name,NULL);
}
}
return JIM_ERR;
@@ -4209,13 +4209,13 @@ static int target_create(Jim_GetOptInfo *goi )
e = JIM_ERR;
}
- if (e != JIM_OK ){
- free(target->type );
- free(target );
+ if (e != JIM_OK){
+ free(target->type);
+ free(target);
return e;
}
- if (target->endianness == TARGET_ENDIAN_UNKNOWN ){
+ if (target->endianness == TARGET_ENDIAN_UNKNOWN){
/* default endian to little if not specified */
target->endianness = TARGET_LITTLE_ENDIAN;
}
@@ -4225,24 +4225,24 @@ static int target_create(Jim_GetOptInfo *goi )
target->variant = strdup("");
/* create the target specific commands */
- if (target->type->register_commands ){
- (*(target->type->register_commands))(cmd_ctx );
+ if (target->type->register_commands){
+ (*(target->type->register_commands))(cmd_ctx);
}
- if (target->type->target_create ){
- (*(target->type->target_create))(target, goi->interp );
+ if (target->type->target_create){
+ (*(target->type->target_create))(target, goi->interp);
}
/* append to end of list */
{
target_t **tpp;
tpp = &(all_targets);
- while (*tpp ){
- tpp = &((*tpp)->next );
+ while (*tpp){
+ tpp = &((*tpp)->next);
}
*tpp = target;
}
- cp = Jim_GetString(new_cmd, NULL );
+ cp = Jim_GetString(new_cmd, NULL);
target->cmd_name = strdup(cp);
/* now - create the new target name command */
@@ -4251,12 +4251,12 @@ static int target_create(Jim_GetOptInfo *goi )
cp,
tcl_target_func, /* C function */
target, /* private data */
- NULL ); /* no del proc */
+ NULL); /* no del proc */
return e;
}
-static int jim_target(Jim_Interp *interp, int argc, Jim_Obj *const *argv )
+static int jim_target(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
{
int x,r,e;
jim_wide w;
@@ -4281,18 +4281,18 @@ static int jim_target(Jim_Interp *interp, int argc, Jim_Obj *const *argv )
LOG_DEBUG("Target command params:");
LOG_DEBUG("%s", Jim_Debug_ArgvString(interp, argc, argv));
- cmd_ctx = Jim_GetAssocData(interp, "context" );
+ cmd_ctx = Jim_GetAssocData(interp, "context");
- Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1 );
+ Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1);
- if (goi.argc == 0 ){
+ if (goi.argc == 0){
Jim_WrongNumArgs(interp, 1, argv, "missing: command ...");
return JIM_ERR;
}
- /* Jim_GetOpt_Debug(&goi ); */
- r = Jim_GetOpt_Enum(&goi, target_cmds, &x );
- if (r != JIM_OK ){
+ /* Jim_GetOpt_Debug(&goi); */
+ r = Jim_GetOpt_Enum(&goi, target_cmds, &x);
+ if (r != JIM_OK){
return r;
}
@@ -4301,66 +4301,66 @@ static int jim_target(Jim_Interp *interp, int argc, Jim_Obj *const *argv )
Jim_Panic(goi.interp,"Why am I here?");
return JIM_ERR;
case TG_CMD_CURRENT:
- if (goi.argc != 0 ){
+ if (goi.argc != 0){
Jim_WrongNumArgs(goi.interp, 1, goi.argv, "Too many parameters");
return JIM_ERR;
}
- Jim_SetResultString(goi.interp, get_current_target(cmd_ctx )->cmd_name, -1 );
+ Jim_SetResultString(goi.interp, get_current_target(cmd_ctx)->cmd_name, -1);
return JIM_OK;
case TG_CMD_TYPES:
- if (goi.argc != 0 ){
- Jim_WrongNumArgs(goi.interp, 1, goi.argv, "Too many parameters" );
+ if (goi.argc != 0){
+ Jim_WrongNumArgs(goi.interp, 1, goi.argv, "Too many parameters");
return JIM_ERR;
}
- Jim_SetResult(goi.interp, Jim_NewListObj(goi.interp, NULL, 0 ) );
- for (x = 0 ; target_types[x] ; x++ ){
+ Jim_SetResult(goi.interp, Jim_NewListObj(goi.interp, NULL, 0));
+ for (x = 0 ; target_types[x] ; x++){
Jim_ListAppendElement(goi.interp,
Jim_GetResult(goi.interp),
- Jim_NewStringObj(goi.interp, target_types[x]->name, -1 ) );
+ Jim_NewStringObj(goi.interp, target_types[x]->name, -1));
}
return JIM_OK;
case TG_CMD_NAMES:
- if (goi.argc != 0 ){
- Jim_WrongNumArgs(goi.interp, 1, goi.argv, "Too many parameters" );
+ if (goi.argc != 0){
+ Jim_WrongNumArgs(goi.interp, 1, goi.argv, "Too many parameters");
return JIM_ERR;
}
- Jim_SetResult(goi.interp, Jim_NewListObj(goi.interp, NULL, 0 ) );
+ Jim_SetResult(goi.interp, Jim_NewListObj(goi.interp, NULL, 0));
target = all_targets;
- while (target ){
+ while (target){
Jim_ListAppendElement(goi.interp,
Jim_GetResult(goi.interp),
- Jim_NewStringObj(goi.interp, target->cmd_name, -1 ) );
+ Jim_NewStringObj(goi.interp, target->cmd_name, -1));
target = target->next;
}
return JIM_OK;
case TG_CMD_CREATE:
- if (goi.argc < 3 ){
+ if (goi.argc < 3){
Jim_WrongNumArgs(goi.interp, goi.argc, goi.argv, "?name ... config options ...");
return JIM_ERR;
}
- return target_create(&goi );
+ return target_create(&goi);
break;
case TG_CMD_NUMBER:
- if (goi.argc != 1 ){
+ if (goi.argc != 1){
Jim_SetResult_sprintf(goi.interp, "expected: target number ?NUMBER?");
return JIM_ERR;
}
- e = Jim_GetOpt_Wide(&goi, &w );
- if (e != JIM_OK ){
+ e = Jim_GetOpt_Wide(&goi, &w);
+ if (e != JIM_OK){
return JIM_ERR;
}
{
target_t *t;
t = get_target_by_num(w);
- if (t == NULL ){
+ if (t == NULL){
Jim_SetResult_sprintf(goi.interp,"Target: number %d does not exist", (int)(w));
return JIM_ERR;
}
- Jim_SetResultString(goi.interp, t->cmd_name, -1 );
+ Jim_SetResultString(goi.interp, t->cmd_name, -1);
return JIM_OK;
}
case TG_CMD_COUNT:
- if (goi.argc != 0 ){
+ if (goi.argc != 0){
Jim_WrongNumArgs(goi.interp, 0, goi.argv, "<no parameters>");
return JIM_ERR;
}
diff --git a/src/target/target.h b/src/target/target.h
index 687ff0ae..2fd0037b 100644
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -397,7 +397,7 @@ int target_write_u8(struct target_s *target, uint32_t address, uint8_t value);
int target_arch_state(struct target_s *target);
void target_handle_event(target_t *t, enum target_event e);
-void target_all_handle_event(enum target_event e );
+void target_all_handle_event(enum target_event e);
#define ERROR_TARGET_INVALID (-300)
#define ERROR_TARGET_INIT_FAILED (-301)
@@ -412,6 +412,6 @@ void target_all_handle_event(enum target_event e );
#define ERROR_TARGET_NOT_EXAMINED (-311)
extern const Jim_Nvp nvp_error_target[];
-extern const char *target_strerror_safe(int err );
+extern const char *target_strerror_safe(int err);
#endif /* TARGET_H */
diff --git a/src/target/target_request.c b/src/target/target_request.c
index af59a6df..05e5bf05 100644
--- a/src/target/target_request.c
+++ b/src/target/target_request.c
@@ -117,8 +117,8 @@ int target_request(target_t *target, uint32_t request)
{
target_req_cmd_t target_req_cmd = request & 0xff;
- if (charmsg_mode ) {
- target_charmsg(target, target_req_cmd );
+ if (charmsg_mode) {
+ target_charmsg(target, target_req_cmd);
return ERROR_OK;
}
switch (target_req_cmd)
@@ -295,7 +295,7 @@ static int handle_target_request_debugmsgs_command(struct command_context_s *cmd
}
command_print(cmd_ctx, "receiving debug messages from current target %s",
- (receiving) ? (charmsg_mode?"charmsg":"enabled") : "disabled" );
+ (receiving) ? (charmsg_mode?"charmsg":"enabled") : "disabled");
return ERROR_OK;
}
diff --git a/src/target/target_type.h b/src/target/target_type.h
index 5ef6741d..84a48630 100644
--- a/src/target/target_type.h
+++ b/src/target/target_type.h
@@ -129,16 +129,16 @@ struct target_type_s
int (*register_commands)(struct command_context_s *cmd_ctx);
/* called when target is created */
- int (*target_create)(struct target_s *target, Jim_Interp *interp );
+ int (*target_create)(struct target_s *target, Jim_Interp *interp);
/* called for various config parameters */
/* returns JIM_CONTINUE - if option not understood */
/* otherwise: JIM_OK, or JIM_ERR, */
- int (*target_jim_configure)(struct target_s *target, Jim_GetOptInfo *goi );
+ int (*target_jim_configure)(struct target_s *target, Jim_GetOptInfo *goi);
/* target commands specifically handled by the target */
/* returns JIM_OK, or JIM_ERR, or JIM_CONTINUE - if option not understood */
- int (*target_jim_commands)(struct target_s *target, Jim_GetOptInfo *goi );
+ int (*target_jim_commands)(struct target_s *target, Jim_GetOptInfo *goi);
/* invoked after JTAG chain has been examined & validated. During
* this stage the target is examined and any additional setup is
diff --git a/src/target/trace.c b/src/target/trace.c
index 7c1519cf..7d137d6c 100644
--- a/src/target/trace.c
+++ b/src/target/trace.c
@@ -123,7 +123,7 @@ static int handle_trace_history_command(struct command_context_s *cmd_ctx, char
uint32_t first = 0;
uint32_t last = trace->trace_history_pos;
- if (!trace->trace_history_size ) {
+ if (!trace->trace_history_size) {
command_print(cmd_ctx, "trace history buffer is not allocated");
return ERROR_OK;
}
diff --git a/src/target/xscale.c b/src/target/xscale.c
index d0180b97..4144d2b9 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -959,7 +959,7 @@ int xscale_arch_state(struct target_s *target)
"MMU: %s, D-Cache: %s, I-Cache: %s"
"%s",
armv4_5_state_strings[armv4_5->core_state],
- Jim_Nvp_value2name_simple(nvp_target_debug_reason, target->debug_reason )->name ,
+ Jim_Nvp_value2name_simple(nvp_target_debug_reason, target->debug_reason)->name ,
armv4_5_mode_strings[armv4_5_mode_to_number(armv4_5->core_mode)],
buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_CPSR].value, 0, 32),
buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32),
@@ -1202,7 +1202,7 @@ int xscale_halt(target_t *target)
xscale_common_t *xscale = armv4_5->arch_info;
LOG_DEBUG("target->state: %s",
- Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name);
+ Jim_Nvp_value2name_simple(nvp_target_state, target->state)->name);
if (target->state == TARGET_HALTED)
{
@@ -1568,7 +1568,7 @@ int xscale_assert_reset(target_t *target)
xscale_common_t *xscale = armv4_5->arch_info;
LOG_DEBUG("target->state: %s",
- Jim_Nvp_value2name_simple(nvp_target_state, target->state )->name);
+ Jim_Nvp_value2name_simple(nvp_target_state, target->state)->name);
/* select DCSR instruction (set endstate to R-T-I to ensure we don't
* end up in T-L-R, which would reset JTAG
generated by cgit v1.2.3 (git 2.46.0) at 2024-12-26 19:21:15 +0000