This is an automated email from Gerrit.
"Tim Newsome <t...@sifive.com>" just uploaded a new patch set to Gerrit, which
you can find at https://review.openocd.org/c/openocd/+/6528
-- gerrit
commit 4e3ecfe264a34ea2bb6e3a9d302ab33861e984ab
Author: Tim Newsome <t...@sifive.com>
Date: Wed Sep 1 14:25:10 2021 -0700
In SMP config, replicate watchpoints on each core
This works well with gdb on RISC-V, since hardware breakpoints are
per-core and gdb thinks that targets are really processes on a machine.
Are there targets where this is a bad idea? Should the target definition
specify whether this behavior is desired or not?
Change-Id: Ia32be2707b04347fd8bf2ca6fbb2b0ceaad3704a
Signed-off-by: Tim Newsome <t...@sifive.com>
diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index 4ba9d6b46..c7719ab84 100644
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -95,7 +95,9 @@ fail:
return retval;
}
- LOG_DEBUG("added %s breakpoint at " TARGET_ADDR_FMT " of length
0x%8.8x, (BPID: %" PRIu32 ")",
+ LOG_DEBUG("[%d] added %s breakpoint at " TARGET_ADDR_FMT
+ " of length 0x%8.8x, (BPID: %" PRIu32 ")",
+ target->coreid,
breakpoint_type_strings[(*breakpoint_p)->type],
(*breakpoint_p)->address, (*breakpoint_p)->length,
(*breakpoint_p)->unique_id);
@@ -410,8 +412,8 @@ struct breakpoint *breakpoint_find(struct target *target,
target_addr_t address)
return NULL;
}
-int watchpoint_add(struct target *target, target_addr_t address, uint32_t
length,
- enum watchpoint_rw rw, uint32_t value, uint32_t mask)
+int watchpoint_add_internal(struct target *target, target_addr_t address,
+ uint32_t length, enum watchpoint_rw rw, uint32_t value,
uint32_t mask)
{
struct watchpoint *watchpoint = target->watchpoints;
struct watchpoint **watchpoint_p = &target->watchpoints;
@@ -476,6 +478,29 @@ bye:
return ERROR_OK;
}
+int watchpoint_add(struct target *target, target_addr_t address,
+ uint32_t length, enum watchpoint_rw rw, uint32_t value,
uint32_t mask)
+{
+ int retval = ERROR_OK;
+ if (target->smp) {
+ struct target_list *head;
+ struct target *curr;
+ head = target->head;
+
+ while (head != (struct target_list *)NULL) {
+ curr = head->target;
+ retval = watchpoint_add_internal(curr, address, length,
rw, value,
+ mask);
+ if (retval != ERROR_OK)
+ return retval;
+ head = head->next;
+ }
+ return retval;
+ } else
+ return watchpoint_add_internal(target, address, length, rw,
value,
+ mask);
+}
+
static void watchpoint_free(struct target *target, struct watchpoint
*watchpoint_to_remove)
{
struct watchpoint *watchpoint = target->watchpoints;
@@ -497,7 +522,7 @@ static void watchpoint_free(struct target *target, struct
watchpoint *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;
@@ -507,10 +532,32 @@ void watchpoint_remove(struct target *target,
target_addr_t address)
watchpoint = watchpoint->next;
}
- if (watchpoint)
+ if (watchpoint) {
watchpoint_free(target, watchpoint);
- else
- LOG_ERROR("no watchpoint at address " TARGET_ADDR_FMT " found",
address);
+ return 1;
+ } 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)
--
