aboutsummaryrefslogtreecommitdiff
path: root/AT91SAM7S256/armdebug/Debugger/debug_stub.S
diff options
context:
space:
mode:
authorTat-Chee Wan (USM)2011-03-15 09:31:01 +0800
committerTat-Chee Wan (USM)2011-03-15 09:31:01 +0800
commit00a0b7a3fffa6664d1a71b6feec795d50cbffb44 (patch)
treea0e6983de4127f4d5655454246ddd1753e7da0c9 /AT91SAM7S256/armdebug/Debugger/debug_stub.S
parentaa10f35b0d56f1f84c4d486d480a66ec2df316f4 (diff)
parentc5537648e1378aed86b32488f83bd86e4a3f55ff (diff)
Merge branch 'master' of ssh://svc.cs.usm.my/~/gitrepo-bare/armdebug
Diffstat (limited to 'AT91SAM7S256/armdebug/Debugger/debug_stub.S')
-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 2f688c9..f40b6fb 100644
--- a/AT91SAM7S256/armdebug/Debugger/debug_stub.S
+++ b/AT91SAM7S256/armdebug/Debugger/debug_stub.S
@@ -533,13 +533,14 @@ dbg__bkpt_offset_outofrange:
*
****************************************************************************/
dbg__bkpt_waitCMD:
- bl dbg__getDebugMsg /* Read new message from Debugger, message buffer addr in R0, 0 if none, -1 if error */
+ bl dbg__getDebugMsg /* Read new message from Debugger, message buffer length in R0, 0 if none, -1 if error */
cmp r0, #0
beq _dbg__housekeeping /* No message yet, do housekeeping tasks */
movlt r0, #MSG_ERRCHKSUM /* Message invalid, checksum error? */
blt _dbg__cmdError /* Send response to GDB server */
/* Message now has $<packet info>\0 */
- mov r4, r0 /* Use R4 as Message Buffer pointer */
+ ldr r4, =debug_msgRxBufPtr
+ ldr r4, [r4] /* Rx buffer Start Address */
ldrb r0, [r4], #1 /* Look for '$' */
teq r0, #MSGBUF_STARTCHAR
movne r0, #MSG_ERRFORMAT /* Message Format invalid (not '$') */