From 32c1af05dead0deb7dd21720312815b71469b7e5 Mon Sep 17 00:00:00 2001 From: Gareth McMullin Date: Sat, 19 May 2012 11:53:41 +1200 Subject: Don't clobber watchpoints used for trace. --- src/cortexm3.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/cortexm3.c') diff --git a/src/cortexm3.c b/src/cortexm3.c index 2ba10a3..9353c89 100644 --- a/src/cortexm3.c +++ b/src/cortexm3.c @@ -660,7 +660,9 @@ cm3_set_hw_wp(struct target_s *target, uint8_t type, uint32_t addr, uint8_t len) } for(i = 0; i < hw_watchpoint_max; i++) - if((hw_watchpoint[i].type) == 0) break; + if((hw_watchpoint[i].type == 0) && + ((adiv5_ap_mem_read(t->ap, CM3_DWT_FUNC(i)) & 0xF) == 0)) + break; if(i == hw_watchpoint_max) return -2; -- cgit v1.2.3