interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Michael Bruck <mbruck@digenius.de> macros for error handling 

git-svn-id: svn://svn.berlios.de/openocd/trunk@1551 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe 2009-04-28 07:29:18 +00:00
parent 5df0a88e01
commit 9ba80f08f4
3 changed files with 62 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
src/target/arm11.c
View File

@ -316,15 +316,14 @@ reg_t arm11_gdb_dummy_fps_reg =
int arm11_check_init(arm11_common_t * arm11, u32 * dscr) int arm11_check_init(arm11_common_t * arm11, u32 * dscr)
{ {
FNC_INFO; FNC_INFO;
int retval;
u32 dscr_local_tmp_copy; u32 dscr_local_tmp_copy;
if (!dscr) if (!dscr)
{ {
dscr = &dscr_local_tmp_copy; dscr = &dscr_local_tmp_copy;
if ((retval=arm11_read_DSCR(arm11, dscr))!=ERROR_OK)
return retval; CHECK_RETVAL(arm11_read_DSCR(arm11, dscr));
} }
if (!(*dscr & ARM11_DSCR_MODE_SELECT)) if (!(*dscr & ARM11_DSCR_MODE_SELECT))
@ -382,9 +381,7 @@ static int arm11_on_enter_debug_state(arm11_common_t * arm11)
}} }}
/* Save DSCR */ /* Save DSCR */
int retval; CHECK_RETVAL(arm11_read_DSCR(arm11, &R(DSCR)));
if ((retval=arm11_read_DSCR(arm11, &R(DSCR)))!=ERROR_OK)
return retval;
/* Save wDTR */ /* Save wDTR */
@ -586,11 +583,8 @@ int arm11_leave_debug_state(arm11_common_t * arm11)
otherwise our programming would be sloppy */ otherwise our programming would be sloppy */
{ {
u32 DSCR; u32 DSCR;
int retval;
if ((retval=arm11_read_DSCR(arm11, &DSCR))!=ERROR_OK) CHECK_RETVAL(arm11_read_DSCR(arm11, &DSCR));
{
return retval;
}
if (DSCR & (ARM11_DSCR_RDTR_FULL | ARM11_DSCR_WDTR_FULL)) if (DSCR & (ARM11_DSCR_RDTR_FULL | ARM11_DSCR_WDTR_FULL))
{ {
@ -679,14 +673,12 @@ int arm11_poll(struct target_s *target)
return ERROR_OK; return ERROR_OK;
u32 dscr; u32 dscr;
int retval;
if ((retval=arm11_read_DSCR(arm11, &dscr))!=ERROR_OK) CHECK_RETVAL(arm11_read_DSCR(arm11, &dscr));
return retval;
LOG_DEBUG("DSCR %08x", dscr); LOG_DEBUG("DSCR %08x", dscr);
if ((retval=arm11_check_init(arm11, &dscr))!=ERROR_OK) CHECK_RETVAL(arm11_check_init(arm11, &dscr));
return retval;
if (dscr & ARM11_DSCR_CORE_HALTED) if (dscr & ARM11_DSCR_CORE_HALTED)
{ {
@ -739,8 +731,6 @@ int arm11_target_request_data(struct target_s *target, u32 size, u8 *buffer)
/* target execution control */ /* target execution control */
int arm11_halt(struct target_s *target) int arm11_halt(struct target_s *target)
{ {
int retval = ERROR_OK;
FNC_INFO; FNC_INFO;
arm11_common_t * arm11 = target->arch_info; arm11_common_t * arm11 = target->arch_info;
@ -767,19 +757,13 @@ int arm11_halt(struct target_s *target)
arm11_add_IR(arm11, ARM11_HALT, TAP_IDLE); arm11_add_IR(arm11, ARM11_HALT, TAP_IDLE);
if((retval = jtag_execute_queue()) != ERROR_OK) CHECK_RETVAL(jtag_execute_queue());
{
return retval;
}
u32 dscr; u32 dscr;
while (1) while (1)
{ {
int retval; CHECK_RETVAL(arm11_read_DSCR(arm11, &dscr));
retval = arm11_read_DSCR(arm11, &dscr);
if (retval!=ERROR_OK)
return retval;
if (dscr & ARM11_DSCR_CORE_HALTED) if (dscr & ARM11_DSCR_CORE_HALTED)
break; break;
@ -792,19 +776,15 @@ int arm11_halt(struct target_s *target)
target->state = TARGET_HALTED; target->state = TARGET_HALTED;
target->debug_reason = arm11_get_DSCR_debug_reason(dscr); target->debug_reason = arm11_get_DSCR_debug_reason(dscr);
if((retval = target_call_event_callbacks(target, CHECK_RETVAL(
old_state == TARGET_DEBUG_RUNNING ? TARGET_EVENT_DEBUG_HALTED : TARGET_EVENT_HALTED)) != ERROR_OK) target_call_event_callbacks(target,
{ old_state == TARGET_DEBUG_RUNNING ? TARGET_EVENT_DEBUG_HALTED : TARGET_EVENT_HALTED));
return retval;
}
return ERROR_OK; return ERROR_OK;
} }
int arm11_resume(struct target_s *target, int current, u32 address, int handle_breakpoints, int debug_execution) int arm11_resume(struct target_s *target, int current, u32 address, int handle_breakpoints, int debug_execution)
{ {
int retval = ERROR_OK;
FNC_INFO; FNC_INFO;
// LOG_DEBUG("current %d address %08x handle_breakpoints %d debug_execution %d", // LOG_DEBUG("current %d address %08x handle_breakpoints %d debug_execution %d",
@ -876,17 +856,13 @@ int arm11_resume(struct target_s *target, int current, u32 address, int handle_b
arm11_add_IR(arm11, ARM11_RESTART, TAP_IDLE); arm11_add_IR(arm11, ARM11_RESTART, TAP_IDLE);
if((retval = jtag_execute_queue()) != ERROR_OK) CHECK_RETVAL(jtag_execute_queue());
{
return retval;
}
while (1) while (1)
{ {
u32 dscr; u32 dscr;
retval = arm11_read_DSCR(arm11, &dscr);
if (retval!=ERROR_OK) CHECK_RETVAL(arm11_read_DSCR(arm11, &dscr));
return retval;
LOG_DEBUG("DSCR %08x", dscr); LOG_DEBUG("DSCR %08x", dscr);
@ -899,19 +875,14 @@ int arm11_resume(struct target_s *target, int current, u32 address, int handle_b
target->state = TARGET_RUNNING; target->state = TARGET_RUNNING;
target->debug_reason = DBG_REASON_NOTHALTED; target->debug_reason = DBG_REASON_NOTHALTED;
if((retval = target_call_event_callbacks(target, TARGET_EVENT_RESUMED)) != ERROR_OK) CHECK_RETVAL(target_call_event_callbacks(target, TARGET_EVENT_RESUMED));
{
return retval;
}
} }
else else
{ {
target->state = TARGET_DEBUG_RUNNING; target->state = TARGET_DEBUG_RUNNING;
target->debug_reason = DBG_REASON_NOTHALTED; target->debug_reason = DBG_REASON_NOTHALTED;
if((retval = target_call_event_callbacks(target, TARGET_EVENT_RESUMED)) != ERROR_OK)
{ CHECK_RETVAL(target_call_event_callbacks(target, TARGET_EVENT_RESUMED));
return retval;
}
} }
return ERROR_OK; return ERROR_OK;
@ -919,8 +890,6 @@ int arm11_resume(struct target_s *target, int current, u32 address, int handle_b
int arm11_step(struct target_s *target, int current, u32 address, int handle_breakpoints) int arm11_step(struct target_s *target, int current, u32 address, int handle_breakpoints)
{ {
int retval = ERROR_OK;
FNC_INFO; FNC_INFO;
LOG_DEBUG("target->state: %s", LOG_DEBUG("target->state: %s",
@ -943,8 +912,7 @@ int arm11_step(struct target_s *target, int current, u32 address, int handle_bre
u32 next_instruction; u32 next_instruction;
if ((arm11_read_memory_word(arm11, R(PC), &next_instruction))!=ERROR_OK) CHECK_RETVAL(arm11_read_memory_word(arm11, R(PC), &next_instruction));
return retval;
/* skip over BKPT */ /* skip over BKPT */
if ((next_instruction & 0xFFF00070) == 0xe1200070) if ((next_instruction & 0xFFF00070) == 0xe1200070)
@ -988,8 +956,7 @@ int arm11_step(struct target_s *target, int current, u32 address, int handle_bre
brp[1].address = ARM11_SC7_BCR0; brp[1].address = ARM11_SC7_BCR0;
brp[1].value = 0x1 | (3 << 1) | (0x0F << 5) | (0 << 14) | (0 << 16) | (0 << 20) | (2 << 21); brp[1].value = 0x1 | (3 << 1) | (0x0F << 5) | (0 << 14) | (0 << 16) | (0 << 20) | (2 << 21);
if ((retval=arm11_sc7_run(arm11, brp, asizeof(brp)))!=ERROR_OK) CHECK_RETVAL(arm11_sc7_run(arm11, brp, asizeof(brp)));
return retval;
/* resume */ /* resume */
@ -1000,15 +967,11 @@ int arm11_step(struct target_s *target, int current, u32 address, int handle_bre
R(DSCR) |= ARM11_DSCR_INTERRUPTS_DISABLE; R(DSCR) |= ARM11_DSCR_INTERRUPTS_DISABLE;
if ((retval=arm11_leave_debug_state(arm11))!=ERROR_OK) CHECK_RETVAL(arm11_leave_debug_state(arm11));
return retval;
arm11_add_IR(arm11, ARM11_RESTART, TAP_IDLE); arm11_add_IR(arm11, ARM11_RESTART, TAP_IDLE);
if((retval = jtag_execute_queue()) != ERROR_OK) CHECK_RETVAL(jtag_execute_queue());
{
return retval;
}
/** \todo TODO: add a timeout */ /** \todo TODO: add a timeout */
@ -1017,9 +980,8 @@ int arm11_step(struct target_s *target, int current, u32 address, int handle_bre
while (1) while (1)
{ {
u32 dscr; u32 dscr;
retval = arm11_read_DSCR(arm11, &dscr);
if (retval!=ERROR_OK) CHECK_RETVAL(arm11_read_DSCR(arm11, &dscr));
return retval;
LOG_DEBUG("DSCR %08x", dscr); LOG_DEBUG("DSCR %08x", dscr);
@ -1032,8 +994,7 @@ int arm11_step(struct target_s *target, int current, u32 address, int handle_bre
arm11_sc7_clear_vbw(arm11); arm11_sc7_clear_vbw(arm11);
/* save state */ /* save state */
if((retval = arm11_on_enter_debug_state(arm11))!=ERROR_OK) CHECK_RETVAL(arm11_on_enter_debug_state(arm11));
return retval;
/* restore default state */ /* restore default state */
R(DSCR) &= ~ARM11_DSCR_INTERRUPTS_DISABLE; R(DSCR) &= ~ARM11_DSCR_INTERRUPTS_DISABLE;
@ -1043,10 +1004,7 @@ int arm11_step(struct target_s *target, int current, u32 address, int handle_bre
// target->state = TARGET_HALTED; // target->state = TARGET_HALTED;
target->debug_reason = DBG_REASON_SINGLESTEP; target->debug_reason = DBG_REASON_SINGLESTEP;
if((retval = target_call_event_callbacks(target, TARGET_EVENT_HALTED)) != ERROR_OK) CHECK_RETVAL(target_call_event_callbacks(target, TARGET_EVENT_HALTED));
{
return retval;
}
return ERROR_OK; return ERROR_OK;
} }
@ -1069,9 +1027,7 @@ int arm11_assert_reset(struct target_s *target)
if (target->reset_halt) if (target->reset_halt)
{ {
int retval; CHECK_RETVAL(target_halt(target));
if ((retval = target_halt(target))!=ERROR_OK)
return retval;
} }
return ERROR_OK; return ERROR_OK;
@ -1511,25 +1467,18 @@ int arm11_run_algorithm(struct target_s *target, int num_mem_params, mem_param_t
} }
// no debug, otherwise breakpoint is not set // no debug, otherwise breakpoint is not set
if((retval = target_resume(target, 0, entry_point, 1, 0)) != ERROR_OK) CHECK_RETVAL(target_resume(target, 0, entry_point, 1, 0));
{
return retval;
}
if((retval = target_wait_state(target, TARGET_HALTED, timeout_ms)) != ERROR_OK) CHECK_RETVAL(target_wait_state(target, TARGET_HALTED, timeout_ms));
{
return retval;
}
if (target->state != TARGET_HALTED) if (target->state != TARGET_HALTED)
{ {
if ((retval=target_halt(target))!=ERROR_OK) CHECK_RETVAL(target_halt(target));
return retval;
if ((retval=target_wait_state(target, TARGET_HALTED, 500))!=ERROR_OK) CHECK_RETVAL(target_wait_state(target, TARGET_HALTED, 500));
{
return retval;
}
retval = ERROR_TARGET_TIMEOUT; retval = ERROR_TARGET_TIMEOUT;
goto del_breakpoint; goto del_breakpoint;
} }
@ -1590,7 +1539,6 @@ restore:
int arm11_target_create(struct target_s *target, Jim_Interp *interp) int arm11_target_create(struct target_s *target, Jim_Interp *interp)
{ {
int retval = ERROR_OK;
FNC_INFO; FNC_INFO;
NEW(arm11_common_t, arm11, 1); NEW(arm11_common_t, arm11, 1);
@ -1601,10 +1549,7 @@ int arm11_target_create(struct target_s *target, Jim_Interp *interp)
arm11->jtag_info.tap = target->tap; arm11->jtag_info.tap = target->tap;
arm11->jtag_info.scann_size = 5; arm11->jtag_info.scann_size = 5;
if((retval = arm_jtag_setup_connection(&arm11->jtag_info)) != ERROR_OK) CHECK_RETVAL(arm_jtag_setup_connection(&arm11->jtag_info));
{
return retval;
}
if (target->tap==NULL) if (target->tap==NULL)
return ERROR_FAIL; return ERROR_FAIL;
@ -1630,7 +1575,6 @@ int arm11_init_target(struct command_context_s *cmd_ctx, struct target_s *target
int arm11_examine(struct target_s *target) int arm11_examine(struct target_s *target)
{ {
FNC_INFO; FNC_INFO;
int retval;
arm11_common_t * arm11 = target->arch_info; arm11_common_t * arm11 = target->arch_info;
@ -1657,9 +1601,7 @@ int arm11_examine(struct target_s *target)
arm11_add_dr_scan_vc(asizeof(chain0_fields), chain0_fields, TAP_IDLE); arm11_add_dr_scan_vc(asizeof(chain0_fields), chain0_fields, TAP_IDLE);
if ((retval=jtag_execute_queue())!=ERROR_OK) CHECK_RETVAL(jtag_execute_queue());
return retval;
switch (arm11->device_id & 0x0FFFF000) switch (arm11->device_id & 0x0FFFF000)
{ {

10
src/target/arm11.h
View File

@ -51,6 +51,16 @@
#define ARM11_TAP_DEFAULT TAP_INVALID #define ARM11_TAP_DEFAULT TAP_INVALID
#define CHECK_RETVAL(action) \
do { \
int __retval = (action); \
\
if (__retval != ERROR_OK) \
return __retval; \
\
} while (0)
typedef struct arm11_register_history_s typedef struct arm11_register_history_s
{ {
u32 value; u32 value;

47
src/target/arm11_dbgtap.c
View File

@ -229,11 +229,7 @@ int arm11_read_DSCR(arm11_common_t * arm11, u32 *value)
arm11_add_dr_scan_vc(1, &chain1_field, TAP_DRPAUSE); arm11_add_dr_scan_vc(1, &chain1_field, TAP_DRPAUSE);
int retval; CHECK_RETVAL(jtag_execute_queue());
if ((retval=jtag_execute_queue())!=ERROR_OK)
{
return retval;
}
if (arm11->last_dscr != dscr) if (arm11->last_dscr != dscr)
JTAG_DEBUG("DSCR = %08x (OLD %08x)", dscr, arm11->last_dscr); JTAG_DEBUG("DSCR = %08x (OLD %08x)", dscr, arm11->last_dscr);
@ -242,7 +238,7 @@ int arm11_read_DSCR(arm11_common_t * arm11, u32 *value)
*value=dscr; *value=dscr;
return retval; return ERROR_OK;
} }
/** Write the Debug Status and Control Register (DSCR) /** Write the Debug Status and Control Register (DSCR)
@ -266,9 +262,7 @@ int arm11_write_DSCR(arm11_common_t * arm11, u32 dscr)
arm11_add_dr_scan_vc(1, &chain1_field, TAP_DRPAUSE); arm11_add_dr_scan_vc(1, &chain1_field, TAP_DRPAUSE);
int retval; CHECK_RETVAL(jtag_execute_queue());
if ((retval=jtag_execute_queue())!=ERROR_OK)
return retval;
JTAG_DEBUG("DSCR <= %08x (OLD %08x)", dscr, arm11->last_dscr); JTAG_DEBUG("DSCR <= %08x (OLD %08x)", dscr, arm11->last_dscr);
@ -383,9 +377,7 @@ int arm11_run_instr_no_data(arm11_common_t * arm11, u32 * opcode, size_t count)
arm11_add_debug_INST(arm11, 0, &flag, count ? TAP_IDLE : TAP_DRPAUSE); arm11_add_debug_INST(arm11, 0, &flag, count ? TAP_IDLE : TAP_DRPAUSE);
int retval; CHECK_RETVAL(jtag_execute_queue());
if ((retval=jtag_execute_queue())!=ERROR_OK)
return retval;
if (flag) if (flag)
break; break;
@ -447,9 +439,8 @@ int arm11_run_instr_data_to_core(arm11_common_t * arm11, u32 opcode, u32 * data,
Data = *data; Data = *data;
arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, TAP_IDLE); arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, TAP_IDLE);
int retval;
if ((retval=jtag_execute_queue())!=ERROR_OK) CHECK_RETVAL(jtag_execute_queue());
return retval;
JTAG_DEBUG("DTR Ready %d nRetry %d", Ready, nRetry); JTAG_DEBUG("DTR Ready %d nRetry %d", Ready, nRetry);
} }
@ -465,9 +456,8 @@ int arm11_run_instr_data_to_core(arm11_common_t * arm11, u32 opcode, u32 * data,
Data = 0; Data = 0;
arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, TAP_DRPAUSE); arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, TAP_DRPAUSE);
int retval;
if ((retval=jtag_execute_queue())!=ERROR_OK) CHECK_RETVAL(jtag_execute_queue());
return retval;
JTAG_DEBUG("DTR Data %08x Ready %d nRetry %d", Data, Ready, nRetry); JTAG_DEBUG("DTR Data %08x Ready %d nRetry %d", Data, Ready, nRetry);
} }
@ -550,9 +540,7 @@ int arm11_run_instr_data_to_core_noack(arm11_common_t * arm11, u32 opcode, u32 *
arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, TAP_DRPAUSE); arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, TAP_DRPAUSE);
int retval; CHECK_RETVAL(jtag_execute_queue());
if ((retval=jtag_execute_queue())!=ERROR_OK)
return retval;
size_t error_count = 0; size_t error_count = 0;
@ -625,9 +613,8 @@ int arm11_run_instr_data_from_core(arm11_common_t * arm11, u32 opcode, u32 * dat
do do
{ {
arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, count ? TAP_IDLE : TAP_DRPAUSE); arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, count ? TAP_IDLE : TAP_DRPAUSE);
int retval;
if ((retval=jtag_execute_queue())!=ERROR_OK) CHECK_RETVAL(jtag_execute_queue());
return retval;
JTAG_DEBUG("DTR Data %08x Ready %d nRetry %d", Data, Ready, nRetry); JTAG_DEBUG("DTR Data %08x Ready %d nRetry %d", Data, Ready, nRetry);
} }
@ -728,9 +715,8 @@ int arm11_sc7_run(arm11_common_t * arm11, arm11_sc7_action_t * actions, size_t c
JTAG_DEBUG("SC7 <= Address %02x Data %08x nRW %d", AddressOut, DataOut, nRW); JTAG_DEBUG("SC7 <= Address %02x Data %08x nRW %d", AddressOut, DataOut, nRW);
arm11_add_dr_scan_vc(asizeof(chain7_fields), chain7_fields, TAP_DRPAUSE); arm11_add_dr_scan_vc(asizeof(chain7_fields), chain7_fields, TAP_DRPAUSE);
int retval;
if ((retval=jtag_execute_queue())!=ERROR_OK) CHECK_RETVAL(jtag_execute_queue());
return retval;
JTAG_DEBUG("SC7 => Address %02x Data %08x Ready %d", AddressIn, DataIn, Ready); JTAG_DEBUG("SC7 => Address %02x Data %08x Ready %d", AddressIn, DataIn, Ready);
} }
@ -826,16 +812,13 @@ void arm11_sc7_set_vcr(arm11_common_t * arm11, u32 value)
*/ */
int arm11_read_memory_word(arm11_common_t * arm11, u32 address, u32 * result) int arm11_read_memory_word(arm11_common_t * arm11, u32 address, u32 * result)
{ {
int retval;
arm11_run_instr_data_prepare(arm11); arm11_run_instr_data_prepare(arm11);
/* MRC p14,0,r0,c0,c5,0 (r0 = address) */ /* MRC p14,0,r0,c0,c5,0 (r0 = address) */
if ((retval=arm11_run_instr_data_to_core1(arm11, 0xee100e15, address))!=ERROR_OK) CHECK_RETVAL(arm11_run_instr_data_to_core1(arm11, 0xee100e15, address));
return retval;
/* LDC p14,c5,[R0],#4 (DTR = [r0]) */ /* LDC p14,c5,[R0],#4 (DTR = [r0]) */
if ((retval=arm11_run_instr_data_from_core(arm11, 0xecb05e01, result, 1))!=ERROR_OK) CHECK_RETVAL(arm11_run_instr_data_from_core(arm11, 0xecb05e01, result, 1));
return retval;
arm11_run_instr_data_finish(arm11); arm11_run_instr_data_finish(arm11);