summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTat-Chee Wan (USM)2011-06-08 12:57:26 +0800
committerTat-Chee Wan (USM)2011-06-08 12:57:26 +0800
commitbace9cc5636552fe67216fab77a6536ee0edc90f (patch)
tree23773b0e4895c77dbdcef4178bcf1c9076334226
parent9ac83aa9bc7071a9dc997b841f1d325e5949da82 (diff)
fix bug in activate_one_breakpoint where it is clearing the breakpoint instruction
-rw-r--r--Debugger/debug_stub.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/Debugger/debug_stub.S b/Debugger/debug_stub.S
index b102dc1..9c69ce7 100644
--- a/Debugger/debug_stub.S
+++ b/Debugger/debug_stub.S
@@ -2908,7 +2908,7 @@ _nx_is_arm_bp:
teq r2, r3 /* check that the two instructions are identical */
bne _dbg__breakpoint_invalid_arm
ldr r2, =BKPT32_INSTR /* ARM BKPT instruction */
- and r2, r2, r0 /* Merge Breakpoint index */
+ orr r2, r2, r0 /* Merge Breakpoint index */
str r2, [r1] /* Store it into memory location */
_dbg__breakpoint_invalid_arm:
bx lr
@@ -2918,7 +2918,7 @@ _nx_is_thumb_bp:
teq r2, r3 /* check that the two instructions are identical */
bne _dbg__breakpoint_invalid_thumb
ldr r2, =BKPT16_INSTR /* Thumb BKPT instruction */
- and r2, r2, r0 /* Merge Breakpoint index */
+ orr r2, r2, r0 /* Merge Breakpoint index */
strh r2, [r1] /* Store it into memory location */
_dbg__breakpoint_invalid_thumb:
bx lr