aboutsummaryrefslogtreecommitdiff
path: root/src/target/target.c
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2009-11-28 10:40:26 -0800
committerDavid Brownell <dbrownell@users.sourceforge.net>2009-11-28 10:40:26 -0800
commitacbe054a38a45432f5948026e1e9258b4e2910c2 (patch)
tree126e4c5fbe6d3d8261e994171f7f45855bf59a16 /src/target/target.c
parent68889ea02f28bfd61f0b4b85aad4b0bf8826a947 (diff)
downloadriscv-openocd-acbe054a38a45432f5948026e1e9258b4e2910c2.zip
riscv-openocd-acbe054a38a45432f5948026e1e9258b4e2910c2.tar.gz
riscv-openocd-acbe054a38a45432f5948026e1e9258b4e2910c2.tar.bz2
target: uplevel add_{break,watch}point() error checks
In target_type.h it's documented that the target must be halted for add_breakpoint() ... and with slight ambiguity, also for its add_watchpoint() sibling. So rather than verifying that constraint in the CPU drivers, do it in the target_add_{break,watch}point() routines. Add minor paranoia on the remove_*point() paths too: save the return value, and print it out in in the LOG_DEBUG message in case it's nonzero. Note that with some current cores, like all ARMv7 ones I've looked at, there's no technical issue preventing watchpoint or breakpoint add/remove operations on active cores. This model seems deeply wired into OpenOCD though. ALSO: the ARM targets were fairly "good" about enforcing that constraint themselves. The MIPS ones were relied on other code to catch such stuff, but it's not clear such code existed ... keep an eye out for new issues on MIPS. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src/target/target.c')
-rw-r--r--src/target/target.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/target/target.c b/src/target/target.c
index a2bd886..28387f4 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -606,6 +606,10 @@ int target_bulk_write_memory(struct target *target,
int target_add_breakpoint(struct target *target,
struct breakpoint *breakpoint)
{
+ if (target->state != TARGET_HALTED) {
+ LOG_WARNING("target %s is not halted", target->cmd_name);
+ return ERROR_TARGET_NOT_HALTED;
+ }
return target->type->add_breakpoint(target, breakpoint);
}
int target_remove_breakpoint(struct target *target,
@@ -617,6 +621,10 @@ int target_remove_breakpoint(struct target *target,
int target_add_watchpoint(struct target *target,
struct watchpoint *watchpoint)
{
+ if (target->state != TARGET_HALTED) {
+ LOG_WARNING("target %s is not halted", target->cmd_name);
+ return ERROR_TARGET_NOT_HALTED;
+ }
return target->type->add_watchpoint(target, watchpoint);
}
int target_remove_watchpoint(struct target *target,