aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSpencer Oliver <spen@spen-soft.co.uk>2012-02-29 15:20:24 +0000
committerSpencer Oliver <spen@spen-soft.co.uk>2012-03-06 13:32:22 +0000
commitdfe8f3a4417b03253977ae1be23f3c8196d35b21 (patch)
treef106033e36354ac6746f0d35daad35f33be661b4 /src
parent0ab3f83667718e43142222499b7d6a464fe444c6 (diff)
downloadriscv-openocd-dfe8f3a4417b03253977ae1be23f3c8196d35b21.zip
riscv-openocd-dfe8f3a4417b03253977ae1be23f3c8196d35b21.tar.gz
riscv-openocd-dfe8f3a4417b03253977ae1be23f3c8196d35b21.tar.bz2
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>
Diffstat (limited to 'src')
-rw-r--r--src/target/stm32_stlink.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/target/stm32_stlink.c b/src/target/stm32_stlink.c
index 32896cc..171cc83 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));