summaryrefslogtreecommitdiff
path: root/AT91SAM7S256
diff options
context:
space:
mode:
authorTat-Chee Wan (USM)2011-02-21 17:33:03 +0800
committerTat-Chee Wan (USM)2011-02-21 17:33:03 +0800
commitde6b7fb5213e2cc8a83283e95575519b6584d22e (patch)
tree253557d6da120d2f2164ecf81aae5a57bcffb801 /AT91SAM7S256
parent7e3b5f891b2aabb891ad901cea715668dd2aeeef (diff)
parent111cce555a3d07bf10a6851ed666a9f9a596d8db (diff)
Merge branch 'master' of ssh://svc.cs.usm.my/~/gitrepo-bare/armdebug
Diffstat (limited to 'AT91SAM7S256')
-rw-r--r--AT91SAM7S256/armdebug/Debugger/debug_stub.S5
-rwxr-xr-xAT91SAM7S256/armdebug/Host/nxt-gdb-server.py4
2 files changed, 5 insertions, 4 deletions
diff --git a/AT91SAM7S256/armdebug/Debugger/debug_stub.S b/AT91SAM7S256/armdebug/Debugger/debug_stub.S
index a7f3815..2f688c9 100644
--- a/AT91SAM7S256/armdebug/Debugger/debug_stub.S
+++ b/AT91SAM7S256/armdebug/Debugger/debug_stub.S
@@ -533,9 +533,9 @@ dbg__bkpt_offset_outofrange:
*
****************************************************************************/
dbg__bkpt_waitCMD:
-1: 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 addr in R0, 0 if none, -1 if error */
cmp r0, #0
- beq 1b /* No message yet, keep checking */
+ 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 */
@@ -560,6 +560,7 @@ _dbg__cmdExists:
_dbg__cmdError:
_dbg_outputMsgStatusErr
bl dbg__putDebugMsg /* Send error response to the GDB server */
+_dbg__housekeeping:
bl dbg__runloopTasks /* Execute platform run loop tasks while in ABRT mode */
b dbg__bkpt_waitCMD
diff --git a/AT91SAM7S256/armdebug/Host/nxt-gdb-server.py b/AT91SAM7S256/armdebug/Host/nxt-gdb-server.py
index c745f85..6e73f53 100755
--- a/AT91SAM7S256/armdebug/Host/nxt-gdb-server.py
+++ b/AT91SAM7S256/armdebug/Host/nxt-gdb-server.py
@@ -91,9 +91,9 @@ class NXTGDBServer:
try:
s, segno = self.unpack (sock.recv ())
if len (s) == 0:
- if segno == 0 && prev_segno == 0:
+ if segno == 0 & prev_segno == 0:
return '' # No message pending
- else
+ else:
segno = NXT_RECV_ERR # Keep waiting for segments
# Ignore error packets
if segno >= 0: