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

ARM11: fewer exit() calls 

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
This commit is contained in:
David Brownell 2009-11-16 17:51:55 -08:00
parent 47f2305229
commit 6030f2ca03
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/target/arm11.c
View File

@ -1665,13 +1665,13 @@ static int arm11_run_algorithm(struct target *target,
if (!reg) if (!reg)
{ {
LOG_ERROR("BUG: register '%s' not found", reg_params[i].reg_name); LOG_ERROR("BUG: register '%s' not found", reg_params[i].reg_name);
exit(-1); return ERROR_INVALID_ARGUMENTS;
} }
if (reg->size != reg_params[i].size) if (reg->size != reg_params[i].size)
{ {
LOG_ERROR("BUG: register '%s' size doesn't match reg_params[i].size", reg_params[i].reg_name); LOG_ERROR("BUG: register '%s' size doesn't match reg_params[i].size", reg_params[i].reg_name);
exit(-1); return ERROR_INVALID_ARGUMENTS;
} }
arm11_set_reg(reg,reg_params[i].value); arm11_set_reg(reg,reg_params[i].value);
// printf("%i: Set %s =%08x\n", i, reg_params[i].reg_name,val); // printf("%i: Set %s =%08x\n", i, reg_params[i].reg_name,val);
@ -1750,13 +1750,15 @@ static int arm11_run_algorithm(struct target *target,
if (!reg) if (!reg)
{ {
LOG_ERROR("BUG: register '%s' not found", reg_params[i].reg_name); LOG_ERROR("BUG: register '%s' not found", reg_params[i].reg_name);
exit(-1); retval = ERROR_INVALID_ARGUMENTS;
goto del_breakpoint;
} }
if (reg->size != reg_params[i].size) if (reg->size != reg_params[i].size)
{ {
LOG_ERROR("BUG: register '%s' size doesn't match reg_params[i].size", reg_params[i].reg_name); LOG_ERROR("BUG: register '%s' size doesn't match reg_params[i].size", reg_params[i].reg_name);
exit(-1); retval = ERROR_INVALID_ARGUMENTS;
goto del_breakpoint;
} }
buf_set_u32(reg_params[i].value, 0, 32, buf_get_u32(reg->value, 0, 32)); buf_set_u32(reg_params[i].value, 0, 32, buf_get_u32(reg->value, 0, 32));