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 32896cc328abf6c509468f91eadc56d3eb533741..171cc83c65228c5eaeba5dc29d00e013cc919f2b 100644 (file)
--- 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));