From daae56959466e127231f3bf27c0d148b2a6ab907 Mon Sep 17 00:00:00 2001 From: Tat-Chee Wan (USM) Date: Mon, 21 Feb 2011 17:09:25 +0800 Subject: return from dbg__bkpt_init using bx lr since we may have been called from thumb mode --- Debugger/debug_stub.S | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Debugger/debug_stub.S b/Debugger/debug_stub.S index d187cb6..a7f3815 100644 --- a/Debugger/debug_stub.S +++ b/Debugger/debug_stub.S @@ -418,7 +418,7 @@ cCommHandleDebug: * GDB set_debug_traps() routine */ dbg__bkpt_init: - stmfd sp!, {lr} + push {lr} bl _dbg__clear_breakpoints mov r2, #0 ldr r1, =debug_curr_breakpoint @@ -431,7 +431,8 @@ dbg__bkpt_init: /* FIXME: Initialize other stuff here */ _dbg_setstate DBG_INIT - ldmfd sp!, {pc} + pop {lr} + bx lr /* Must return via BX; may have been called from Thumb mode (NXT Firmware) */ /* _dbg__flush_icache -- cgit v1.2.3