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 <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/931
Tested-by: jenkins

diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index 4d9daf5ca09e48de924fda94476f4b207655107d..ca2211fb4387ed3691883671377d1b3f257796bd 100644 (file)
--- 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 a9bd7a4971e9798c063acf539dbf35ea0c281c1a..11d70524bcc7f219cc068e6ca8944670fc36c2d6 100644 (file)
--- a/src/target/cortex_m.h
+++ b/src/target/cortex_m.h
@@ -194,6 +194,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 272c25e0526302a29ee322f91363f01d347da384..3c3b84175704acc6ca84e9f3ff3f4da5b5e19ee1 100644 (file)
--- 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);