summaryrefslogtreecommitdiff
path: root/AT91SAM7S256/armdebug/Debugger/undef_handler.S
diff options
context:
space:
mode:
authorTC Wan2010-12-16 17:03:50 +0800
committerTC Wan2010-12-16 17:03:50 +0800
commit2e32cda30ad266069ecb9b8c93229b0269ba1547 (patch)
treef2e42e49f32cb1b748a5952b6dd59ae00f454798 /AT91SAM7S256/armdebug/Debugger/undef_handler.S
parent941a22c0adadb5098f8f33335a864fc7d0356bf5 (diff)
parent35c9bf7fc8e5f5a8176c9365566df6a9c9555494 (diff)
Merge branch 'master' of ssh://svc.cs.usm.my/~/gitrepo-bare/armdebug
Diffstat (limited to 'AT91SAM7S256/armdebug/Debugger/undef_handler.S')
-rw-r--r--AT91SAM7S256/armdebug/Debugger/undef_handler.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/AT91SAM7S256/armdebug/Debugger/undef_handler.S b/AT91SAM7S256/armdebug/Debugger/undef_handler.S
index 385bf0c..61b8a5d 100644
--- a/AT91SAM7S256/armdebug/Debugger/undef_handler.S
+++ b/AT91SAM7S256/armdebug/Debugger/undef_handler.S
@@ -41,7 +41,7 @@ undef_handler:
tst r1, #CPSR_THUMB /* Check for Thumb Mode */
beq _is_arm /* Clear, so it's ARM mode */
_is_thumb:
- sub r0, lr, #-2 /* LR points to instruction after UNDEF instruction */
+ sub r0, lr, #2 /* LR points to instruction after UNDEF instruction */
stmfd sp!, {r0,r1} /* Save UNDEF instruction addr and previous mode's CPSR to stack */
ldrh r0, [r0] /* load UNDEF instruction into r0 */
ldr r1, =BKPT16_ENUM_MASK /* Thumb BKPT enum mask */
@@ -55,7 +55,7 @@ _is_thumb:
ldr lr, =dbg__thumb_bkpt_handler /* handle BKPT, BKPT index in r0 */
mov pc, lr /* Invoke Debugger State (Supervisor Mode) */
_is_arm:
- sub r0, lr, #-4 /* LR points to instruction after UNDEF instruction */
+ sub r0, lr, #4 /* LR points to instruction after UNDEF instruction */
stmfd sp!, {r0,r1} /* Save UNDEF instruction addr and previous mode's CPSR to stack */
ldr r0, [r0] /* load UNDEF instruction into r0 */
ldr r1, =BKPT32_ENUM_MASK /* ARM BKPT enum mask */