summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2009-12-04 18:57:31 -0800
committerDavid Brownell <dbrownell@users.sourceforge.net>2009-12-04 18:57:31 -0800
commitf67f6fe5bb8a466cc4d49f83608f026c4b233949 (patch)
tree455eedc5f064a232b702a07c920f89016d0d5fe8 /src
parenta0edb8a328ceea23186ab74c941454fb146c9a48 (diff)
downloadopenocd_libswd-f67f6fe5bb8a466cc4d49f83608f026c4b233949.tar.gz
openocd_libswd-f67f6fe5bb8a466cc4d49f83608f026c4b233949.tar.bz2
openocd_libswd-f67f6fe5bb8a466cc4d49f83608f026c4b233949.tar.xz
openocd_libswd-f67f6fe5bb8a466cc4d49f83608f026c4b233949.zip
ARM11: report watchpoint trigger insn
As with Cortex-A8, the WFAR register holds useful information that should be recorded and, where relevant, displayed. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src')
-rw-r--r--src/target/arm11.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/target/arm11.c b/src/target/arm11.c
index 943ab8ae..0486b04c 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -217,6 +217,19 @@ static int arm11_debug_entry(struct arm11_common *arm11)
}
+ if (arm11->arm.target->debug_reason == DBG_REASON_WATCHPOINT) {
+ uint32_t wfar;
+
+ /* MRC p15, 0, <Rd>, c6, c0, 1 ; Read WFAR */
+ retval = arm11_run_instr_data_from_core_via_r0(arm11,
+ ARMV4_5_MRC(15, 0, 0, 6, 0, 1),
+ &wfar);
+ if (retval != ERROR_OK)
+ return retval;
+ arm_dpm_report_wfar(arm11->arm.dpm, wfar);
+ }
+
+
retval = arm11_run_instr_data_finish(arm11);
if (retval != ERROR_OK)
return retval;
@@ -356,12 +369,17 @@ static int arm11_poll(struct target *target)
/* architecture specific status reply */
static int arm11_arch_state(struct target *target)
{
+ struct arm11_common *arm11 = target_to_arm11(target);
int retval;
retval = armv4_5_arch_state(target);
/* REVISIT also display ARM11-specific MMU and cache status ... */
+ if (target->debug_reason == DBG_REASON_WATCHPOINT)
+ LOG_USER("Watchpoint triggered at PC %#08x",
+ (unsigned) arm11->dpm.wp_pc);
+
return retval;
}