X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fbreakpoints.c;h=08008c226d22f8f4f675e8d250b1e09a2a1ce62c;hp=efba25c9d04d87270e1db3497a0af503c3ea3d6d;hb=ccde06a08fbf9c4f57b321dbec0509f73239c2de;hpb=8b4e882a1630d63bbc9840fa3f968e36b6ac3702 diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c index efba25c9d0..08008c226d 100644 --- a/src/target/breakpoints.c +++ b/src/target/breakpoints.c @@ -17,82 +17,125 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif -#include - -#include "binarybuffer.h" #include "target.h" #include "log.h" -#include "types.h" - #include "breakpoints.h" -char *breakpoint_type_strings[] = + +static char *breakpoint_type_strings[] = { "hardware", "software" }; -char *watchpoint_rw_strings[] = +static char *watchpoint_rw_strings[] = { "read", "write", "access" }; -int breakpoint_add(target_t *target, u32 address, u32 length, enum breakpoint_type type) +// monotonic counter/id-number for breakpoints and watch points +static int bpwp_unique_id; + +int breakpoint_add(target_t *target, uint32_t address, uint32_t length, enum breakpoint_type type) { breakpoint_t *breakpoint = target->breakpoints; breakpoint_t **breakpoint_p = &target->breakpoints; int retval; - + int n; + + n = 0; while (breakpoint) { - if (breakpoint->address == address) + n++; + if (breakpoint->address == address){ + LOG_DEBUG("Duplicate Breakpoint address: 0x%08" PRIx32 " (BP %d)", + address, breakpoint->unique_id ); return ERROR_OK; + } breakpoint_p = &breakpoint->next; breakpoint = breakpoint->next; } - - if ((retval = target->type->add_breakpoint(target, address, length, type)) != ERROR_OK) + + (*breakpoint_p) = malloc(sizeof(breakpoint_t)); + (*breakpoint_p)->address = address; + (*breakpoint_p)->length = length; + (*breakpoint_p)->type = type; + (*breakpoint_p)->set = 0; + (*breakpoint_p)->orig_instr = malloc(length); + (*breakpoint_p)->next = NULL; + (*breakpoint_p)->unique_id = bpwp_unique_id++; + + if ((retval = target_add_breakpoint(target, *breakpoint_p)) != ERROR_OK) { switch (retval) { case ERROR_TARGET_RESOURCE_NOT_AVAILABLE: - INFO("can't add %s breakpoint, resource not available", breakpoint_type_strings[type]); + LOG_INFO("can't add %s breakpoint, resource not available (BPID=%d)", + breakpoint_type_strings[(*breakpoint_p)->type], + (*breakpoint_p)->unique_id ); + + free((*breakpoint_p)->orig_instr); + free(*breakpoint_p); + *breakpoint_p = NULL; return retval; break; case ERROR_TARGET_NOT_HALTED: - INFO("can't add breakpoint while target is running"); + LOG_INFO("can't add breakpoint while target is running (BPID: %d)", + (*breakpoint_p)->unique_id ); + free((*breakpoint_p)->orig_instr); + free(*breakpoint_p); + *breakpoint_p = NULL; return retval; break; default: - ERROR("unknown error"); - exit(-1); break; } } - - (*breakpoint_p) = malloc(sizeof(breakpoint_t)); - (*breakpoint_p)->address = address; - (*breakpoint_p)->length = length; - (*breakpoint_p)->type = type; - (*breakpoint_p)->set = 0; - (*breakpoint_p)->orig_instr = malloc(CEIL(length, 8)); - (*breakpoint_p)->next = NULL; - - DEBUG("added %s breakpoint at 0x%8.8x of length 0x%8.8x", breakpoint_type_strings[type], address, length); - + + LOG_DEBUG("added %s breakpoint at 0x%8.8" PRIx32 " of length 0x%8.8x, (BPID: %d)", + breakpoint_type_strings[(*breakpoint_p)->type], + (*breakpoint_p)->address, (*breakpoint_p)->length, + (*breakpoint_p)->unique_id ); + return ERROR_OK; } -int breakpoint_remove(target_t *target, u32 address) +/* free up a breakpoint */ +static void breakpoint_free(target_t *target, breakpoint_t *breakpoint_remove) { breakpoint_t *breakpoint = target->breakpoints; breakpoint_t **breakpoint_p = &target->breakpoints; - int retval; - + + while (breakpoint) + { + if (breakpoint == breakpoint_remove) + break; + breakpoint_p = &breakpoint->next; + breakpoint = breakpoint->next; + } + + if (breakpoint == NULL) + return; + + target_remove_breakpoint(target, breakpoint); + + LOG_DEBUG("BPID: %d", breakpoint->unique_id ); + (*breakpoint_p) = breakpoint->next; + free(breakpoint->orig_instr); + free(breakpoint); +} + +void breakpoint_remove(target_t *target, uint32_t address) +{ + breakpoint_t *breakpoint = target->breakpoints; + breakpoint_t **breakpoint_p = &target->breakpoints; + while (breakpoint) { if (breakpoint->address == address) @@ -100,98 +143,133 @@ int breakpoint_remove(target_t *target, u32 address) breakpoint_p = &breakpoint->next; breakpoint = breakpoint->next; } - + if (breakpoint) { - if ((retval = target->type->remove_breakpoint(target, breakpoint)) != ERROR_OK) - { - switch (retval) - { - case ERROR_TARGET_NOT_HALTED: - INFO("can't remove breakpoint while target is running"); - return retval; - break; - default: - ERROR("unknown error"); - exit(-1); - break; - } - } - (*breakpoint_p) = breakpoint->next; - free(breakpoint->orig_instr); - free(breakpoint); + breakpoint_free(target, breakpoint); } else { - ERROR("no breakpoint at address 0x%8.8x found", address); + LOG_ERROR("no breakpoint at address 0x%8.8" PRIx32 " found", address); } - - return ERROR_OK; } -breakpoint_t* breakpoint_find(target_t *target, u32 address) +void breakpoint_clear_target(target_t *target) +{ + breakpoint_t *breakpoint; + LOG_DEBUG("Delete all breakpoints for target: %s", target_get_name( target )); + while ((breakpoint = target->breakpoints) != NULL) + { + breakpoint_free(target, breakpoint); + } +} + +breakpoint_t* breakpoint_find(target_t *target, uint32_t address) { breakpoint_t *breakpoint = target->breakpoints; - + while (breakpoint) { if (breakpoint->address == address) return breakpoint; breakpoint = breakpoint->next; } - + return NULL; } -int watchpoint_add(target_t *target, u32 address, u32 length, enum watchpoint_rw rw, u32 value, u32 mask) +int watchpoint_add(target_t *target, uint32_t address, uint32_t length, + enum watchpoint_rw rw, uint32_t value, uint32_t mask) { - watchpoint_t *watchpoint = target->watchpoints; - watchpoint_t **watchpoint_p = &target->watchpoints; + struct watchpoint *watchpoint = target->watchpoints; + struct watchpoint **watchpoint_p = &target->watchpoints; int retval; - + char *reason; + while (watchpoint) { - if (watchpoint->address == address) + if (watchpoint->address == address) { + if (watchpoint->length != length + || watchpoint->value != value + || watchpoint->mask != mask + || watchpoint->rw != rw) { + LOG_ERROR("address 0x%8.8" PRIx32 + "already has watchpoint %d", + address, watchpoint->unique_id); + return ERROR_FAIL; + } + + /* ignore duplicate watchpoint */ return ERROR_OK; + } watchpoint_p = &watchpoint->next; watchpoint = watchpoint->next; } - - if ((retval = target->type->add_watchpoint(target, address, length, rw)) != ERROR_OK) - { - switch (retval) - { - case ERROR_TARGET_RESOURCE_NOT_AVAILABLE: - INFO("can't add %s watchpoint, resource not available", watchpoint_rw_strings[rw]); - return retval; - break; - default: - ERROR("unknown error"); - exit(-1); - break; - } - } - - (*watchpoint_p) = malloc(sizeof(watchpoint_t)); + + (*watchpoint_p) = calloc(1, sizeof(struct watchpoint)); (*watchpoint_p)->address = address; (*watchpoint_p)->length = length; (*watchpoint_p)->value = value; (*watchpoint_p)->mask = mask; (*watchpoint_p)->rw = rw; - (*watchpoint_p)->set = 0; - (*watchpoint_p)->next = NULL; - - DEBUG("added %s watchpoint at 0x%8.8x of length 0x%8.8x", watchpoint_rw_strings[rw], address, length); - + (*watchpoint_p)->unique_id = bpwp_unique_id++; + + retval = target_add_watchpoint(target, *watchpoint_p); + switch (retval) { + case ERROR_OK: + break; + case ERROR_TARGET_RESOURCE_NOT_AVAILABLE: + reason = "resource not available"; + goto bye; + case ERROR_TARGET_NOT_HALTED: + reason = "target running"; + goto bye; + default: + reason = "unrecognized error"; +bye: + LOG_ERROR("can't add %s watchpoint at 0x%8.8" PRIx32 ", %s", + watchpoint_rw_strings[(*watchpoint_p)->rw], + address, reason); + free (*watchpoint_p); + *watchpoint_p = NULL; + return retval; + } + + LOG_DEBUG("added %s watchpoint at 0x%8.8" PRIx32 " of length 0x%8.8x (WPID: %d)", + watchpoint_rw_strings[(*watchpoint_p)->rw], + (*watchpoint_p)->address, + (*watchpoint_p)->length, + (*watchpoint_p)->unique_id ); + return ERROR_OK; } -int watchpoint_remove(target_t *target, u32 address) +static void watchpoint_free(target_t *target, struct watchpoint *watchpoint_remove) { - watchpoint_t *watchpoint = target->watchpoints; - watchpoint_t **watchpoint_p = &target->watchpoints; - int retval; - + struct watchpoint *watchpoint = target->watchpoints; + struct watchpoint **watchpoint_p = &target->watchpoints; + + while (watchpoint) + { + if (watchpoint == watchpoint_remove) + break; + watchpoint_p = &watchpoint->next; + watchpoint = watchpoint->next; + } + + if (watchpoint == NULL) + return; + target_remove_watchpoint(target, watchpoint); + LOG_DEBUG("WPID: %d", watchpoint->unique_id ); + (*watchpoint_p) = watchpoint->next; + free(watchpoint); +} + +void watchpoint_remove(target_t *target, uint32_t address) +{ + struct watchpoint *watchpoint = target->watchpoints; + struct watchpoint **watchpoint_p = &target->watchpoints; + while (watchpoint) { if (watchpoint->address == address) @@ -199,21 +277,23 @@ int watchpoint_remove(target_t *target, u32 address) watchpoint_p = &watchpoint->next; watchpoint = watchpoint->next; } - + if (watchpoint) { - if ((retval = target->type->remove_watchpoint(target, watchpoint)) != ERROR_OK) - { - ERROR("BUG: can't remove watchpoint"); - exit(-1); - } - (*watchpoint_p) = watchpoint->next; - free(watchpoint); + watchpoint_free(target, watchpoint); } else { - ERROR("no watchpoint at address 0x%8.8x found", address); + LOG_ERROR("no watchpoint at address 0x%8.8" PRIx32 " found", address); + } +} + +void watchpoint_clear_target(target_t *target) +{ + struct watchpoint *watchpoint; + LOG_DEBUG("Delete all watchpoints for target: %s", target_get_name( target )); + while ((watchpoint = target->watchpoints) != NULL) + { + watchpoint_free(target, watchpoint); } - - return ERROR_OK; }