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);
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;
return retval;
}
- LOG_DEBUG("added %s watchpoint at " TARGET_ADDR_FMT
- " of length 0x%8.8" PRIx32 " (WPID: %d)",
+ LOG_DEBUG("[%d] added %s watchpoint at " TARGET_ADDR_FMT
+ " of length 0x%8.8" PRIx32 " (WPID: %d)",
+ target->coreid,
watchpoint_rw_strings[(*watchpoint_p)->rw],
(*watchpoint_p)->address,
(*watchpoint_p)->length,
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;
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;
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)
+{
+ if (target->smp) {
+ unsigned int num_watchpoints = 0;
+ struct target_list *head;
+ struct target *curr;
+ head = target->head;
+ while (head) {
+ curr = head->target;
+ num_watchpoints += watchpoint_remove_internal(curr, address);
+ head = head->next;
+ }
+ if (num_watchpoints == 0)
+ LOG_ERROR("no watchpoint at address " TARGET_ADDR_FMT " num_watchpoints", address);
+ } else {
+ watchpoint_remove_internal(target, address);
+ }
}
void watchpoint_clear_target(struct target *target)