This is an automated email from Gerrit. Spencer Oliver ([email protected]) just uploaded a new patch set to Gerrit, which you can find at http://openocd.zylin.com/931
-- gerrit commit ec118afe666c08a19ec0447b3b1edf1bfc7b0302 Author: Spencer Oliver <[email protected]> Date: Thu Oct 25 16:37:14 2012 +0100 hla: fix watchpoints not being set Watchpoints were not being enabled when the hl adapter target was resumed. This effects both stlink and icdi interfaces. Change-Id: Ia9f8a9415be97a467cd099b63b6bc9f7f37d0c0d Signed-off-by: Spencer Oliver <[email protected]> diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c index 74505a8..f8782b4 100644 --- a/src/target/cortex_m.c +++ b/src/target/cortex_m.c @@ -677,7 +677,7 @@ static int cortex_m3_soft_reset_halt(struct target *target) return ERROR_OK; } -static void cortex_m3_enable_breakpoints(struct target *target) +void cortex_m3_enable_breakpoints(struct target *target) { struct breakpoint *breakpoint = target->breakpoints; diff --git a/src/target/cortex_m.h b/src/target/cortex_m.h index a10368d..733b976 100644 --- a/src/target/cortex_m.h +++ b/src/target/cortex_m.h @@ -189,6 +189,7 @@ int cortex_m3_set_watchpoint(struct target *target, struct watchpoint *watchpoin int cortex_m3_unset_watchpoint(struct target *target, struct watchpoint *watchpoint); int cortex_m3_add_watchpoint(struct target *target, struct watchpoint *watchpoint); int cortex_m3_remove_watchpoint(struct target *target, struct watchpoint *watchpoint); +void cortex_m3_enable_breakpoints(struct target *target); void cortex_m3_enable_watchpoints(struct target *target); void cortex_m3_dwt_setup(struct cortex_m3_common *cm3, struct target *target); diff --git a/src/target/hla_target.c b/src/target/hla_target.c index 272c25e..3c3b841 100644 --- a/src/target/hla_target.c +++ b/src/target/hla_target.c @@ -551,6 +551,12 @@ static int adapter_resume(struct target *target, int current, return ERROR_TARGET_NOT_HALTED; } + if (!debug_execution) { + target_free_all_working_areas(target); + cortex_m3_enable_breakpoints(target); + cortex_m3_enable_watchpoints(target); + } + pc = armv7m->arm.pc; if (!current) { buf_set_u32(pc->value, 0, 32, address); -- ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_sfd2d_oct _______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
