X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftarget%2Fbreakpoints.c;h=d7c10e0573436fe0e1666327a2ffb3b0aa33291d;hb=45674af63ad9ab9029abeff18237b9421dc0356a;hp=6320d2ea83bbecb6a788e4662ac19062160d3d13;hpb=8c1ec4f0e1a7dd37a2549d83b6cd5c8c57eb34aa;p=fw%2Fopenocd diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c index 6320d2ea8..d7c10e057 100644 --- a/src/target/breakpoints.c +++ b/src/target/breakpoints.c @@ -21,15 +21,11 @@ #include "config.h" #endif -#include - -#include "binarybuffer.h" #include "target.h" #include "log.h" -#include "types.h" - #include "breakpoints.h" + static char *breakpoint_type_strings[] = { "hardware", @@ -43,20 +39,29 @@ static char *watchpoint_rw_strings[] = "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; } - + (*breakpoint_p) = malloc(sizeof(breakpoint_t)); (*breakpoint_p)->address = address; (*breakpoint_p)->length = length; @@ -64,20 +69,25 @@ int breakpoint_add(target_t *target, u32 address, u32 length, enum breakpoint_ty (*breakpoint_p)->set = 0; (*breakpoint_p)->orig_instr = malloc(length); (*breakpoint_p)->next = NULL; - - if ((retval = target->type->add_breakpoint(target, *breakpoint_p)) != ERROR_OK) + (*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: - LOG_INFO("can't add %s breakpoint, resource not available", breakpoint_type_strings[(*breakpoint_p)->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: - LOG_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; @@ -87,11 +97,12 @@ int breakpoint_add(target_t *target, u32 address, u32 length, enum breakpoint_ty break; } } - - LOG_DEBUG("added %s breakpoint at 0x%8.8x of length 0x%8.8x", - breakpoint_type_strings[(*breakpoint_p)->type], - (*breakpoint_p)->address, (*breakpoint_p)->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; } @@ -100,30 +111,31 @@ static void breakpoint_free(target_t *target, breakpoint_t *breakpoint_remove) { breakpoint_t *breakpoint = target->breakpoints; breakpoint_t **breakpoint_p = &target->breakpoints; - + while (breakpoint) { - if (breakpoint==breakpoint_remove) + if (breakpoint == breakpoint_remove) break; breakpoint_p = &breakpoint->next; breakpoint = breakpoint->next; } - - if (breakpoint==NULL) + + if (breakpoint == NULL) return; - - target->type->remove_breakpoint(target, breakpoint); - + + 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, u32 address) +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) @@ -131,46 +143,47 @@ void breakpoint_remove(target_t *target, u32 address) breakpoint_p = &breakpoint->next; breakpoint = breakpoint->next; } - + if (breakpoint) { breakpoint_free(target, breakpoint); } else { - LOG_ERROR("no breakpoint at address 0x%8.8x found", address); + LOG_ERROR("no breakpoint at address 0x%8.8" PRIx32 " found", address); } } void breakpoint_clear_target(target_t *target) { breakpoint_t *breakpoint; - while ((breakpoint = target->breakpoints)!=NULL) + 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, u32 address) +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; int retval; - + while (watchpoint) { if (watchpoint->address == address) @@ -178,7 +191,7 @@ int watchpoint_add(target_t *target, u32 address, u32 length, enum watchpoint_rw watchpoint_p = &watchpoint->next; watchpoint = watchpoint->next; } - + (*watchpoint_p) = malloc(sizeof(watchpoint_t)); (*watchpoint_p)->address = address; (*watchpoint_p)->length = length; @@ -187,19 +200,23 @@ int watchpoint_add(target_t *target, u32 address, u32 length, enum watchpoint_rw (*watchpoint_p)->rw = rw; (*watchpoint_p)->set = 0; (*watchpoint_p)->next = NULL; - - if ((retval = target->type->add_watchpoint(target, *watchpoint_p)) != ERROR_OK) + (*watchpoint_p)->unique_id = bpwp_unique_id++; + + if ((retval = target_add_watchpoint(target, *watchpoint_p)) != ERROR_OK) { switch (retval) { case ERROR_TARGET_RESOURCE_NOT_AVAILABLE: - LOG_INFO("can't add %s watchpoint, resource not available", watchpoint_rw_strings[(*watchpoint_p)->rw]); + LOG_INFO("can't add %s watchpoint, resource not available (WPID: %d)", + watchpoint_rw_strings[(*watchpoint_p)->rw], + (*watchpoint_p)->unique_id ); free (*watchpoint_p); *watchpoint_p = NULL; return retval; break; case ERROR_TARGET_NOT_HALTED: - LOG_INFO("can't add watchpoint while target is running"); + LOG_INFO("can't add watchpoint while target is running (WPID: %d)", + (*watchpoint_p)->unique_id ); free (*watchpoint_p); *watchpoint_p = NULL; return retval; @@ -210,11 +227,13 @@ int watchpoint_add(target_t *target, u32 address, u32 length, enum watchpoint_rw break; } } - - LOG_DEBUG("added %s watchpoint at 0x%8.8x of length 0x%8.8x", - watchpoint_rw_strings[(*watchpoint_p)->rw], - (*watchpoint_p)->address, (*watchpoint_p)->length); - + + 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; } @@ -230,19 +249,20 @@ static void watchpoint_free(target_t *target, watchpoint_t *watchpoint_remove) watchpoint_p = &watchpoint->next; watchpoint = watchpoint->next; } - - if (watchpoint==NULL) + + if (watchpoint == NULL) return; - target->type->remove_watchpoint(target, watchpoint); + target_remove_watchpoint(target, watchpoint); + LOG_DEBUG("WPID: %d", watchpoint->unique_id ); (*watchpoint_p) = watchpoint->next; free(watchpoint); } -void watchpoint_remove(target_t *target, u32 address) +void watchpoint_remove(target_t *target, uint32_t address) { watchpoint_t *watchpoint = target->watchpoints; watchpoint_t **watchpoint_p = &target->watchpoints; - + while (watchpoint) { if (watchpoint->address == address) @@ -250,21 +270,22 @@ void watchpoint_remove(target_t *target, u32 address) watchpoint_p = &watchpoint->next; watchpoint = watchpoint->next; } - + if (watchpoint) { watchpoint_free(target, watchpoint); } else { - LOG_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) { watchpoint_t *watchpoint; - while ((watchpoint = target->watchpoints)!=NULL) + LOG_DEBUG("Delete all watchpoints for target: %s", target_get_name( target )); + while ((watchpoint = target->watchpoints) != NULL) { watchpoint_free(target, watchpoint); }