aboutsummaryrefslogtreecommitdiff
path: root/AT91SAM7S256/armdebug
diff options
context:
space:
mode:
authorTat-Chee Wan (USM)2011-02-21 17:10:23 +0800
committerTat-Chee Wan (USM)2011-02-21 17:10:23 +0800
commit7e3b5f891b2aabb891ad901cea715668dd2aeeef (patch)
treeaf7052f1681a7f3001e639dd2bb9d633649ad4e1 /AT91SAM7S256/armdebug
parent7419707ba2e511f9c7f02d1c2cac4a9263719d5e (diff)
parentdaae56959466e127231f3bf27c0d148b2a6ab907 (diff)
Merge branch 'master' of ssh://svc.cs.usm.my/~/gitrepo-bare/armdebug
Diffstat (limited to 'AT91SAM7S256/armdebug')
-rw-r--r--AT91SAM7S256/armdebug/Debugger/debug_stub.S5
1 files changed, 3 insertions, 2 deletions
diff --git a/AT91SAM7S256/armdebug/Debugger/debug_stub.S b/AT91SAM7S256/armdebug/Debugger/debug_stub.S
index d187cb6..a7f3815 100644
--- a/AT91SAM7S256/armdebug/Debugger/debug_stub.S
+++ b/AT91SAM7S256/armdebug/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