interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed exit()'s. A reset is usually enough to work around these, reducing cycle times 

to get config scripts right.


git-svn-id: svn://svn.berlios.de/openocd/trunk@528 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe 2008-03-31 19:32:38 +00:00
parent a3a3426e86
commit 408e1d86a0
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/target/arm7_9_common.c
View File

@ -519,13 +519,13 @@ int arm7_9_enable_sw_bkpts(struct target_s *target)
else
{
LOG_ERROR("BUG: both watchpoints used, but wp_available >= 1");
exit(-1);
return ERROR_FAIL;
}
if ((retval = jtag_execute_queue()) != ERROR_OK)
{
LOG_ERROR("error writing EmbeddedICE registers to enable sw breakpoints");
exit(-1);
return ERROR_FAIL;
};
return ERROR_OK;
@ -1225,8 +1225,7 @@ int arm7_9_full_context(target_t *target)
if ((retval = jtag_execute_queue()) != ERROR_OK)
{
LOG_ERROR("JTAG failure");
exit(-1);
return retval;
}
return ERROR_OK;
}
@ -1381,12 +1380,7 @@ int arm7_9_restart_core(struct target_s *target)
arm_jtag_set_instr(jtag_info, 0x4, NULL);
jtag_add_runtest(1, TAP_RTI);
if ((jtag_execute_queue()) != ERROR_OK)
{
exit(-1);
}
return ERROR_OK;
return jtag_execute_queue();
}
void arm7_9_enable_watchpoints(struct target_s *target)
@ -1484,7 +1478,7 @@ int arm7_9_resume(struct target_s *target, int current, u32 address, int handle_
else
{
LOG_ERROR("unhandled core state");
exit(-1);
return ERROR_FAIL;
}
buf_set_u32(dbg_ctrl->value, EICE_DBG_CONTROL_DBGACK, 1, 0);
@ -1526,7 +1520,7 @@ int arm7_9_resume(struct target_s *target, int current, u32 address, int handle_
else
{
LOG_ERROR("unhandled core state");
exit(-1);
return ERROR_FAIL;
}
/* deassert DBGACK and INTDIS */
@ -1633,7 +1627,7 @@ int arm7_9_step(struct target_s *target, int current, u32 address, int handle_br
else
{
LOG_ERROR("unhandled core state");
exit(-1);
return ERROR_FAIL;
}
target_call_event_callbacks(target, TARGET_EVENT_RESUMED);
@ -1705,8 +1699,7 @@ int arm7_9_read_core_reg(struct target_s *target, int num, enum armv4_5_mode mod
if ((retval = jtag_execute_queue()) != ERROR_OK)
{
LOG_ERROR("JTAG failure");
exit(-1);
return retval;
}
ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, mode, num).valid = 1;