From: Spencer Oliver <spen@spen-soft.co.uk>
Date: Wed, 29 Feb 2012 15:20:24 +0000 (+0000)
Subject: stlink: fix incorrect pc console output
X-Git-Tag: v0.6.0-rc1~201
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=dfe8f3a4417b03253977ae1be23f3c8196d35b21;p=openocd

stlink: fix incorrect pc console output

target_call_event_callbacks needs to be called after debug entry otherwise
we will get a console pc mismatch.

Change-Id: I278137736d5e85ca9662c306f6ac81336d8eb6cf
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/499
Tested-by: jenkins
Reviewed-by: Øyvind Harboe <oyvindharboe@gmail.com>
---

diff --git a/src/target/stm32_stlink.c b/src/target/stm32_stlink.c
index 32896cc3..171cc83c 100644
--- a/src/target/stm32_stlink.c
+++ b/src/target/stm32_stlink.c
@@ -605,10 +605,8 @@ static int stm32_stlink_step(struct target *target, int current,
 	if (breakpoint)
 		cortex_m3_set_breakpoint(target, breakpoint);
 
-	target->debug_reason = DBG_REASON_SINGLESTEP;
-	target_call_event_callbacks(target, TARGET_EVENT_HALTED);
-
 	stlink_debug_entry(target);
+	target_call_event_callbacks(target, TARGET_EVENT_HALTED);
 
 	LOG_INFO("halted: PC: 0x%x", buf_get_u32(armv7m->arm.pc->value, 0, 32));