ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reformat except.S 

Tidy up formatting, and make all 3 toolchain versions more consistent,
for ease of diffing and transferring changes between them.
pull/12824/head
Kevin Bracey 2020-04-17 12:04:07 +03:00
parent 5e765487c4
commit c1641e79c5
3 changed files with 350 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/source/TARGET_CORTEX_M/TOOLCHAIN_ARM/except.S
View File

@ -65,11 +65,12 @@ UsageFault_Handler\
B Fault_Handler B Fault_Handler
ENDP ENDP
Fault_Handler PROC Fault_Handler\
PROC
EXPORT Fault_Handler EXPORT Fault_Handler
#if (DOMAIN_NS == 1) #if (DOMAIN_NS == 1)
IMPORT mbed_fault_handler
IMPORT mbed_fault_context IMPORT mbed_fault_context
IMPORT mbed_fault_handler
MRS R0,MSP MRS R0,MSP
LDR R1,=0x4 LDR R1,=0x4
@ -156,7 +157,6 @@ Fault_Handler_Continue2
#endif #endif
B . ; Just in case we come back here B . ; Just in case we come back here
ENDP ENDP
#endif #endif
END END

2
platform/source/TARGET_CORTEX_M/TOOLCHAIN_GCC/except.S
View File

@ -195,5 +195,3 @@ Fault_Handler_Continue2:
#endif #endif
.end .end

18
platform/source/TARGET_CORTEX_M/TOOLCHAIN_IAR/except.S
View File

@ -17,27 +17,27 @@
; * ; *
; * ----------------------------------------------------------------------------- ; * -----------------------------------------------------------------------------
; * ; *
; * Title: Cortex-M Fault Exception handlers ( Common for both ARMv7M and ARMV6M ); ; * Title: Cortex-M Fault Exception handlers ( Common for both ARMv7M and ARMV6M )
; * ; *
; * ----------------------------------------------------------------------------- ; * -----------------------------------------------------------------------------
; */ ; */
NAME except.S NAME except.S
FAULT_TYPE_HARD_FAULT EQU 0x10
FAULT_TYPE_MEMMANAGE_FAULT EQU 0x20
FAULT_TYPE_BUS_FAULT EQU 0x30
FAULT_TYPE_USAGE_FAULT EQU 0x40
#ifndef MBED_FAULT_HANDLER_DISABLED #ifndef MBED_FAULT_HANDLER_DISABLED
#ifndef DOMAIN_NS #ifndef DOMAIN_NS
#define DOMAIN_NS 1 #define DOMAIN_NS 1
#endif #endif
PRESERVE8
SECTION .rodata:DATA:NOROOT(2)
FAULT_TYPE_HARD_FAULT EQU 0x10
FAULT_TYPE_MEMMANAGE_FAULT EQU 0x20
FAULT_TYPE_BUS_FAULT EQU 0x30
FAULT_TYPE_USAGE_FAULT EQU 0x40
PRESERVE8
THUMB THUMB
SECTION .text:CODE:NOROOT(2) SECTION .text:CODE:NOROOT(2)
HardFault_Handler HardFault_Handler
@ -150,6 +150,6 @@ Fault_Handler_Continue2
BL mbed_fault_handler BL mbed_fault_handler
#endif #endif
B . ; Just in case we come back here B . ; Just in case we come back here
#endif ; #if (MBED_FAULT_HANDLER_SUPPORT == 1) #endif
END END