summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Debugger/debug_stub.S6
-rw-r--r--Debugger/debug_stub.h8
2 files changed, 7 insertions, 7 deletions
diff --git a/Debugger/debug_stub.S b/Debugger/debug_stub.S
index 8e3e337..217e462 100644
--- a/Debugger/debug_stub.S
+++ b/Debugger/debug_stub.S
@@ -213,12 +213,12 @@ debug_thumbDecodeTable:
* N Z C V
* Indexed according to Instruction Encoding order (pg 30, Table 6, ATMEL ARM7TDMI Data Sheet)
* Condition Code stored in MSN(set), LSN(clear) order
- * Note1: 0x00 = AL
+ * Note1: 0x00 = AL. NV is deprecated, treat as AL
* Note2: 0xFF indicates that the condition checks needs to be handled separately (complex checks)
*/
debug_armCondCodetable:
- /* EQ, NE, HS/CS, LO/CC, MI, PL, VS, VC, HI, LS, GE, LT, GT, LE, AL, NV */
- .byte 0x40, 0x04, 0x20, 0x02, 0x80, 0x08, 0x10, 0x01, 0x24, 0x42, 0xFF, 0xFF, 0xFF, 0xFF, 0x00,
+ /* EQ, NE, HS/CS, LO/CC, MI, PL, VS, VC, HI, LS, GE, LT, GT, LE, AL, NV */
+ .byte 0x40, 0x04, 0x20, 0x02, 0x80, 0x08, 0x10, 0x01, 0x24, 0x42, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00
.code 32
.text
diff --git a/Debugger/debug_stub.h b/Debugger/debug_stub.h
index dd2f433..ada5858 100644
--- a/Debugger/debug_stub.h
+++ b/Debugger/debug_stub.h
@@ -158,14 +158,14 @@ FUNCDEF void dbg__bkpt_handler(void);
/** dbg_breakpoint_arm.
* Equivalent to GDB breakpoint() routine for ARM code
*/
-/* FUNCDEF void dbg_breakpoint_arm(void); */
-inline void dbg_breakpoint_arm(void) { asm volatile (".word BKPT32_INSTR | BKPT32_MANUAL_BKPT"); }
+FUNCDEF void dbg_breakpoint_arm(void);
+inline void dbg_breakpoint_arm(void) { asm volatile (".word 0xE127FF7F" /* (BKPT32_INSTR | BKPT32_MANUAL_BKPT) */ ); }
/** dbg_breakpoint_thumb.
* Equivalent to GDB breakpoint() routine for Thumb code
*/
-/* FUNCDEF void dbg_breakpoint_thumb(void); */
-inline void dbg_breakpoint_thumb(void) { asm volatile (".hword BKPT16_INSTR | BKPT16_MANUAL_BKPT"); }
+FUNCDEF void dbg_breakpoint_thumb(void);
+inline void dbg_breakpoint_thumb(void) { asm volatile (".hword 0xBE7F" /* (BKPT16_INSTR | BKPT16_MANUAL_BKPT) */); }
/*@}*/