From 0451f85157573f18d9959098f83b67336966a0e1 Mon Sep 17 00:00:00 2001 From: Tat-Chee Wan (USM) Date: Wed, 30 Mar 2011 10:08:43 +0800 Subject: fixup obsolete autobreakpoint return code --- Debugger/debug_stub.S | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'Debugger/debug_stub.S') diff --git a/Debugger/debug_stub.S b/Debugger/debug_stub.S index 1ade29c..4520c32 100644 --- a/Debugger/debug_stub.S +++ b/Debugger/debug_stub.S @@ -568,7 +568,17 @@ _process_auto_breakpoint: bl _dbg__restore_singlestep bl _dbg__clear_singlestep _dbg_set_bkpt_type DBG_AUTO_BKPT - b __dbg__resume_execution + /* b _dbg__switch2undefmode */ + +/* _dbg__switch2undefmode + * Common internal routine to return execution to user program + */ +_dbg__switch2undefmode: + bl _dbg__flush_icache + msr cpsr_c, #(MODE_UND | CPSR_FIQ | CPSR_IRQ) /* Configure Undef Mode */ + _dbg_setmode FALSE /* Debug Mode = False */ + ldr lr, =resume_execution + mov pc, lr /* Exit via UNDEF mode */ _process_manual_breakpoint_thumb: _dbg_set_bkpt_type DBG_MANUAL_BKPT_THUMB @@ -1151,15 +1161,7 @@ __dbg__sendOkBeforeResume: b __dbg__sendOkBeforeResume /* Retry retransmission */ #endif -/* _dbg__switch2undefmode - * Common internal routine to return execution to user program - */ -_dbg__switch2undefmode: - bl _dbg__flush_icache - msr cpsr_c, #(MODE_UND | CPSR_FIQ | CPSR_IRQ) /* Configure Undef Mode */ - _dbg_setmode FALSE /* Debug Mode = False */ - ldr lr, =resume_execution - mov pc, lr /* Exit via UNDEF mode */ + b _dbg__switch2undefmode /* _dbg__cmd_Step * Step User Program Execution Command Handler -- cgit v1.2.3