From 51cf36077885f26e325739a60d45f822287a551f Mon Sep 17 00:00:00 2001 From: Tat-Chee Wan (USM) Date: Fri, 18 Mar 2011 12:51:07 +0800 Subject: we should only invoke bkpt in ccommhandledebug in normal operation mode Before invoking Breakpoint in cCommHandleDebug, we need to check if we're already in Abort (Debug) mode. Refactored header files to allow access to Mode Bit definitions from other files. --- Debugger/debug_comm.S | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Debugger/debug_comm.S') diff --git a/Debugger/debug_comm.S b/Debugger/debug_comm.S index 6a7aa11..efe44a9 100644 --- a/Debugger/debug_comm.S +++ b/Debugger/debug_comm.S @@ -408,7 +408,8 @@ _dbg__usb_readbuf_reset: * R1: USB Command Bit * R2: USB Raw Message Length * On Exit: - * R0-R3: Destroyed + * R0: CPSR + * R1-R3: Destroyed */ dbg__copyNxtDebugMsg: @@ -416,6 +417,7 @@ dbg__copyNxtDebugMsg: str r2, [r1] ldr r1, =debug_InUSBBuf _dbg_memcpy r1, r0, r2, r3 /* r3: scratch register */ + mrs r0, cpsr bx lr #endif -- cgit v1.2.3