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

target/breakpoints: Remove dead code and cleanup 

Change-Id: I8027178b6e771753775514a8641a050c6e63a1d5
Signed-off-by: Marc Schink <dev@zapb.de>
Reviewed-on: http://openocd.zylin.com/6321
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
Marc Schink 2021-06-15 16:49:37 +02:00 committed by Antonio Borneo
parent 2044df3dac
commit 0478a93ed5
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/target/breakpoints.c
View File

@ -50,11 +50,8 @@ static int breakpoint_add_internal(struct target *target,
struct breakpoint **breakpoint_p = &target->breakpoints; struct breakpoint **breakpoint_p = &target->breakpoints;
const char *reason; const char *reason;
int retval; int retval;
int n;
n = 0;
while (breakpoint) { while (breakpoint) {
n++;
if (breakpoint->address == address) { if (breakpoint->address == address) {
/* FIXME don't assume "same address" means "same /* FIXME don't assume "same address" means "same
* breakpoint" ... check all the parameters before * breakpoint" ... check all the parameters before
@ -114,11 +111,8 @@ static int context_breakpoint_add_internal(struct target *target,
struct breakpoint *breakpoint = target->breakpoints; struct breakpoint *breakpoint = target->breakpoints;
struct breakpoint **breakpoint_p = &target->breakpoints; struct breakpoint **breakpoint_p = &target->breakpoints;
int retval; int retval;
int n;
n = 0;
while (breakpoint) { while (breakpoint) {
n++;
if (breakpoint->asid == asid) { if (breakpoint->asid == asid) {
/* FIXME don't assume "same address" means "same /* FIXME don't assume "same address" means "same
* breakpoint" ... check all the parameters before * breakpoint" ... check all the parameters before
@ -167,10 +161,8 @@ static int hybrid_breakpoint_add_internal(struct target *target,
struct breakpoint *breakpoint = target->breakpoints; struct breakpoint *breakpoint = target->breakpoints;
struct breakpoint **breakpoint_p = &target->breakpoints; struct breakpoint **breakpoint_p = &target->breakpoints;
int retval; int retval;
int n;
n = 0;
while (breakpoint) { while (breakpoint) {
n++;
if ((breakpoint->asid == asid) && (breakpoint->address == address)) { if ((breakpoint->asid == asid) && (breakpoint->address == address)) {
/* FIXME don't assume "same address" means "same /* FIXME don't assume "same address" means "same
* breakpoint" ... check all the parameters before * breakpoint" ... check all the parameters before
@ -238,9 +230,10 @@ int breakpoint_add(struct target *target,
head = head->next; head = head->next;
} }
return retval; return retval;
} else } else {
return breakpoint_add_internal(target, address, length, type); return breakpoint_add_internal(target, address, length, type);
} }
}
int context_breakpoint_add(struct target *target, int context_breakpoint_add(struct target *target,
uint32_t asid, uint32_t asid,
@ -260,9 +253,10 @@ int context_breakpoint_add(struct target *target,
head = head->next; head = head->next;
} }
return retval; return retval;
} else } else {
return context_breakpoint_add_internal(target, asid, length, type); return context_breakpoint_add_internal(target, asid, length, type);
} }
}
int hybrid_breakpoint_add(struct target *target, int hybrid_breakpoint_add(struct target *target,
target_addr_t address, target_addr_t address,
@ -301,7 +295,7 @@ static void breakpoint_free(struct target *target, struct breakpoint *breakpoint
breakpoint = breakpoint->next; breakpoint = breakpoint->next;
} }
if (breakpoint == NULL) if (!breakpoint)
return; return;
retval = target_remove_breakpoint(target, breakpoint); retval = target_remove_breakpoint(target, breakpoint);
@ -346,21 +340,22 @@ static void breakpoint_remove_all_internal(struct target *target)
void breakpoint_remove(struct target *target, target_addr_t address) void breakpoint_remove(struct target *target, target_addr_t address)
{ {
int found = 0;
if (target->smp) { if (target->smp) {
unsigned int num_breakpoints = 0;
struct target_list *head; struct target_list *head;
struct target *curr; struct target *curr;
head = target->head; head = target->head;
while (head != (struct target_list *)NULL) { while (head != (struct target_list *)NULL) {
curr = head->target; curr = head->target;
found += breakpoint_remove_internal(curr, address); num_breakpoints += breakpoint_remove_internal(curr, address);
head = head->next; head = head->next;
} }
if (found == 0) if (!num_breakpoints)
LOG_ERROR("no breakpoint at address " TARGET_ADDR_FMT " found", address); LOG_ERROR("no breakpoint at address " TARGET_ADDR_FMT " found", address);
} else } else {
breakpoint_remove_internal(target, address); breakpoint_remove_internal(target, address);
} }
}
void breakpoint_remove_all(struct target *target) void breakpoint_remove_all(struct target *target)
{ {
@ -397,9 +392,9 @@ void breakpoint_clear_target(struct target *target)
breakpoint_clear_target_internal(curr); breakpoint_clear_target_internal(curr);
head = head->next; head = head->next;
} }
} else } else {
breakpoint_clear_target_internal(target); breakpoint_clear_target_internal(target);
}
} }
struct breakpoint *breakpoint_find(struct target *target, target_addr_t address) struct breakpoint *breakpoint_find(struct target *target, target_addr_t address)
@ -494,7 +489,7 @@ static void watchpoint_free(struct target *target, struct watchpoint *watchpoint
watchpoint = watchpoint->next; watchpoint = watchpoint->next;
} }
if (watchpoint == NULL) if (!watchpoint)
return; return;
retval = target_remove_watchpoint(target, watchpoint); retval = target_remove_watchpoint(target, watchpoint);
LOG_DEBUG("free WPID: %d --> %d", watchpoint->unique_id, retval); LOG_DEBUG("free WPID: %d --> %d", watchpoint->unique_id, retval);