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

Properly clean up SMP watchpoints. 

42/43 tests pass.

Change-Id: Ia800ffacf914742e8b9bdb1799ca3817856448a4
This commit is contained in:
Tim Newsome 2019-01-25 09:19:33 -08:00
parent afedcb337a
commit b29215735c
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/target/breakpoints.c
View File

@ -497,7 +497,7 @@ static void watchpoint_free(struct target *target, struct watchpoint *watchpoint
free(watchpoint); free(watchpoint);
} }
void watchpoint_remove(struct target *target, target_addr_t address) int watchpoint_remove_internal(struct target *target, target_addr_t address)
{ {
struct watchpoint *watchpoint = target->watchpoints; struct watchpoint *watchpoint = target->watchpoints;
@ -507,10 +507,32 @@ void watchpoint_remove(struct target *target, target_addr_t address)
watchpoint = watchpoint->next; watchpoint = watchpoint->next;
} }
if (watchpoint) if (watchpoint) {
watchpoint_free(target, watchpoint); watchpoint_free(target, watchpoint);
else return 1;
LOG_ERROR("no watchpoint at address " TARGET_ADDR_FMT " found", address); } else {
if (!target->smp)
LOG_ERROR("no watchpoint at address " TARGET_ADDR_FMT " found", address);
return 0;
}
}
void watchpoint_remove(struct target *target, target_addr_t address)
{
int found = 0;
if (target->smp) {
struct target_list *head;
struct target *curr;
head = target->head;
while (head != (struct target_list *)NULL) {
curr = head->target;
found += watchpoint_remove_internal(curr, address);
head = head->next;
}
if (found == 0)
LOG_ERROR("no watchpoint at address " TARGET_ADDR_FMT " found", address);
} else
watchpoint_remove_internal(target, address);
} }
void watchpoint_clear_target(struct target *target) void watchpoint_clear_target(struct target *target)