From 99b10c16afa405e76defbfd30b21296cbd4fa624 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Sat, 8 Sep 2012 23:45:18 +0200 Subject: merge armdebug d881039 --- AT91SAM7S256/armdebug/Debugger/abort_handler.S | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'AT91SAM7S256/armdebug/Debugger/abort_handler.S') diff --git a/AT91SAM7S256/armdebug/Debugger/abort_handler.S b/AT91SAM7S256/armdebug/Debugger/abort_handler.S index f4d1bd0..dab25d1 100644 --- a/AT91SAM7S256/armdebug/Debugger/abort_handler.S +++ b/AT91SAM7S256/armdebug/Debugger/abort_handler.S @@ -55,10 +55,8 @@ .extern default_prefetch_abort_handler .extern default_data_abort_handler - .global prefetch_abort_handler - .global data_abort_handler -prefetch_abort_handler: + dbg_interwork prefetch_abort_handler ldr sp, =__debugger_stack__ stmfd sp, {r0-r15}^ /* Save workspace, previous mode's pc via 'S' flag, R13-R15: placeholders */ mov r2, #PREFETCH_OFFSET @@ -66,7 +64,7 @@ prefetch_abort_handler: mov r5, #DBG_ABORT_PREFETCH /* Debugger Abort Type */ b _common_abort_handler -data_abort_handler: + dbg_interwork data_abort_handler ldr sp, =__debugger_stack__ stmfd sp, {r0-r15}^ /* Save workspace, previous mode's pc via 'S' flag, R13-R15: placeholders */ mov r2, #DATA_OFFSET -- cgit v1.2.3