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

breakpoints: Fix endless loop in bp/wp_clear_target 

If we can't remove bp/wp, we will stuck in endless loop

Change-Id: I44c0a164db1d15c0a0637d33c75087a49cf5c0f4
Signed-off-by: Kirill Radkin <kirill.radkin@syntacore.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/7940
Tested-by: jenkins
Reviewed-by: Anatoly P <kupokupokupopo@gmail.com>
Reviewed-by: Tim Newsome <tim@sifive.com>
Reviewed-by: Jan Matyas <jan.matyas@codasip.com>
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
Kirill Radkin 2023-10-18 19:13:25 +03:00 committed by Tim Newsome
parent 84bcf9aa8b
commit c5185e9219
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/target/breakpoints.c
View File

@ -312,6 +312,8 @@ static int breakpoint_free(struct target *data_target, struct target *breakpoint
static int breakpoint_remove_all_internal(struct target *target) static int breakpoint_remove_all_internal(struct target *target)
{ {
LOG_TARGET_DEBUG(target, "Delete all breakpoints");
struct breakpoint *breakpoint = target->breakpoints; struct breakpoint *breakpoint = target->breakpoints;
int retval = ERROR_OK; int retval = ERROR_OK;
@ -436,22 +438,6 @@ int breakpoint_remove_all(struct target *target)
return retval; return retval;
} }
static int breakpoint_clear_target_internal(struct target *target)
{
LOG_DEBUG("Delete all breakpoints for target: %s",
target_name(target));
int retval = ERROR_OK;
while (target->breakpoints) {
int status = breakpoint_free(target, target, target->breakpoints);
if (status != ERROR_OK)
retval = status;
}
return retval;
}
int breakpoint_clear_target(struct target *target) int breakpoint_clear_target(struct target *target)
{ {
int retval = ERROR_OK; int retval = ERROR_OK;
@ -461,13 +447,13 @@ int breakpoint_clear_target(struct target *target)
foreach_smp_target(head, target->smp_targets) { foreach_smp_target(head, target->smp_targets) {
struct target *curr = head->target; struct target *curr = head->target;
int status = breakpoint_clear_target_internal(curr); int status = breakpoint_remove_all_internal(curr);
if (status != ERROR_OK) if (status != ERROR_OK)
retval = status; retval = status;
} }
} else { } else {
retval = breakpoint_clear_target_internal(target); retval = breakpoint_remove_all_internal(target);
} }
return retval; return retval;
@ -663,16 +649,19 @@ int watchpoint_remove(struct target *target, target_addr_t address)
int watchpoint_clear_target(struct target *target) int watchpoint_clear_target(struct target *target)
{ {
int retval = ERROR_OK;
LOG_DEBUG("Delete all watchpoints for target: %s", LOG_DEBUG("Delete all watchpoints for target: %s",
target_name(target)); target_name(target));
while (target->watchpoints) {
int status = watchpoint_free(target, target->watchpoints); struct watchpoint *watchpoint = target->watchpoints;
int retval = ERROR_OK;
while (watchpoint) {
struct watchpoint *tmp = watchpoint;
watchpoint = watchpoint->next;
int status = watchpoint_free(target, tmp);
if (status != ERROR_OK) if (status != ERROR_OK)
retval = status; retval = status;
} }
return retval; return retval;
} }