aboutsummaryrefslogtreecommitdiff
path: root/AT91SAM7S256/armdebug/Debugger/debug_macros.h
diff options
context:
space:
mode:
authorTat-Chee Wan (USM)2011-04-04 17:32:42 +0800
committerTat-Chee Wan (USM)2011-04-04 17:32:42 +0800
commit41528b49b9c8e0c20663f3f7becc6276eeff94b0 (patch)
tree9fb75ff2e4fbaf70dd406ef347687e3f0d37b85e /AT91SAM7S256/armdebug/Debugger/debug_macros.h
parenta49b11a219f6876e63844c2b89f45122f64ab702 (diff)
parent373c665e5015040f402771a106e802c909c81d17 (diff)
Merge branch 'master' of ssh://svc.cs.usm.my/~/gitrepo-bare/armdebug
Diffstat (limited to 'AT91SAM7S256/armdebug/Debugger/debug_macros.h')
-rw-r--r--AT91SAM7S256/armdebug/Debugger/debug_macros.h27
1 files changed, 3 insertions, 24 deletions
diff --git a/AT91SAM7S256/armdebug/Debugger/debug_macros.h b/AT91SAM7S256/armdebug/Debugger/debug_macros.h
index e71d9ca..75d6299 100644
--- a/AT91SAM7S256/armdebug/Debugger/debug_macros.h
+++ b/AT91SAM7S256/armdebug/Debugger/debug_macros.h
@@ -52,7 +52,8 @@
add \instrmask, \instrmask, \indexreg, lsl #3
ldm \instrmask, {\instrreg, \codehandler} /* LSHW: IID, MSHW: IBM */
mov \instrmask, \instrreg, lsr #16
- and \instrreg, \instrreg, #HLFWRD0
+ mov \instrreg, \instrreg, lsl #16
+ mov \instrreg, \instrreg, lsr #16 /* Keep HLFWORD0 containing instruction */
.endm
/* _dbg_armDecodeEntry
@@ -247,8 +248,7 @@
* indexreg contains debugger stack index value (0-max index)
*/
.macro _regenum2index indexenum, indexreg
- mov \indexreg, #indexenum
- add \indexreg, \indexreg, #DBGSTACK_USERREG_INDEX /* Convert register index to Debug Stack index, keep in R1 */
+ add \indexreg, \indexenum, #DBGSTACK_USERREG_INDEX /* Convert register index to Debug Stack index */
.endm
/* _getdbgregisterfromindex
@@ -381,27 +381,6 @@
strb \reg, [r1]
.endm
-/* _dbg_getabortedinstr_addr
- * Get aborted instruction address
- * On exit:
- * reg: aborted instruction address
- */
- .macro _dbg_getabortedinstr_addr reg
- ldr \reg, =__debugger_stack_bottom__
- ldr \reg, [\reg]
- .endm
-
-/* _dbg_setabortedinstr_addr
- * Set aborted instruction address
- * On exit:
- * r1: destroyed
- */
- .macro _dbg_setabortedinstr_addr reg
- ldr r1, =__debugger_stack_bottom__
- str \reg, [r1]
- .endm
-
-
/*@}*/
#endif /* __DEBUG_MACROS_H__ */