From 0c0b43214104217fe4616a7600e2165d192202df Mon Sep 17 00:00:00 2001 From: Tat-Chee Wan (USM) Date: Wed, 20 Jul 2011 10:32:49 +0800 Subject: fix register corruption when using setstate macro We must preserve R0 and R1 which are destroyed by the setstate macro. --- Debugger/debug_stub.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Debugger/debug_stub.S b/Debugger/debug_stub.S index eacdd5d..1b0ef8c 100644 --- a/Debugger/debug_stub.S +++ b/Debugger/debug_stub.S @@ -739,8 +739,9 @@ _exit_dmg__cmd_Status: * r0, r1, r2, r3: destroyed */ _dbg__cmd_Query: - stmfd sp!, {lr} + stmfd sp!, {r0,r1, lr} _dbg_setstate DBG_CONFIGURED /* We have exchanged query messages with the GDB server */ + ldmfd sp!, {r0, r1} /* Restore parameters needed for subsequent processing */ bl __dbg__cmdParamLen cmp r1, #CMD_QUERY_CURRTID_PARAMLEN bne _dbg__cmd_Query_default -- cgit v1.2.3