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

target: cope with *any* error setting a breakpoint 

It's wrong to map unrecognized failure codes to success.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
This commit is contained in:
David Brownell 2009-11-24 00:13:43 -08:00
parent 0583cb0a0d
commit ad75af0b17
1 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/target/breakpoints.c
View File

@ -46,6 +46,7 @@ int breakpoint_add(struct target *target, uint32_t address, uint32_t length, enu
{ {
struct breakpoint *breakpoint = target->breakpoints; struct breakpoint *breakpoint = target->breakpoints;
struct breakpoint **breakpoint_p = &target->breakpoints; struct breakpoint **breakpoint_p = &target->breakpoints;
char *reason;
int retval; int retval;
int n; int n;
@ -53,7 +54,11 @@ int breakpoint_add(struct target *target, uint32_t address, uint32_t length, enu
while (breakpoint) while (breakpoint)
{ {
n++; n++;
if (breakpoint->address == address){ if (breakpoint->address == address) {
/* FIXME don't assume "same address" means "same
* breakpoint" ... check all the parameters before
* succeeding.
*/
LOG_DEBUG("Duplicate Breakpoint address: 0x%08" PRIx32 " (BP %d)", LOG_DEBUG("Duplicate Breakpoint address: 0x%08" PRIx32 " (BP %d)",
address, breakpoint->unique_id ); address, breakpoint->unique_id );
return ERROR_OK; return ERROR_OK;
@ -71,31 +76,24 @@ int breakpoint_add(struct target *target, uint32_t address, uint32_t length, enu
(*breakpoint_p)->next = NULL; (*breakpoint_p)->next = NULL;
(*breakpoint_p)->unique_id = bpwp_unique_id++; (*breakpoint_p)->unique_id = bpwp_unique_id++;
if ((retval = target_add_breakpoint(target, *breakpoint_p)) != ERROR_OK) retval = target_add_breakpoint(target, *breakpoint_p);
{ switch (retval) {
switch (retval) case ERROR_OK:
{ break;
case ERROR_TARGET_RESOURCE_NOT_AVAILABLE: case ERROR_TARGET_RESOURCE_NOT_AVAILABLE:
LOG_INFO("can't add %s breakpoint, resource not available (BPID=%d)", reason = "resource not available";
breakpoint_type_strings[(*breakpoint_p)->type], goto fail;
(*breakpoint_p)->unique_id ); case ERROR_TARGET_NOT_HALTED:
reason = "target running";
free((*breakpoint_p)->orig_instr); goto fail;
free(*breakpoint_p); default:
*breakpoint_p = NULL; reason = "unknown reason";
return retval; fail:
break; LOG_ERROR("can't add breakpoint: %s", reason);
case ERROR_TARGET_NOT_HALTED: free((*breakpoint_p)->orig_instr);
LOG_INFO("can't add breakpoint while target is running (BPID: %d)", free(*breakpoint_p);
(*breakpoint_p)->unique_id ); *breakpoint_p = NULL;
free((*breakpoint_p)->orig_instr); return retval;
free(*breakpoint_p);
*breakpoint_p = NULL;
return retval;
break;
default:
break;
}
} }
LOG_DEBUG("added %s breakpoint at 0x%8.8" PRIx32 " of length 0x%8.8x, (BPID: %d)", LOG_DEBUG("added %s breakpoint at 0x%8.8" PRIx32 " of length 0x%8.8x, (BPID: %d)",