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

CMSIS/RTX: Pre-processor defines used for assembly 

CMSIS repo does not support pre-processor defines, hence multiple assembly
files are added for secure/non-secure and floating point tools.

Mbed OS tools support assembly file pre-processing, but the build system
does not support multiple assembly files for each target, hence updating
the assembly files.
pull/6273/head
deepikabhavnani 2018-02-06 21:52:19 -06:00 committed by Bartek Szatkowski
parent b88254809e
commit 287121ffdc
7 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtos/TARGET_CORTEX/TARGET_CORTEX_M/TOOLCHAIN_ARM/except.S
View File

@ -23,8 +23,8 @@
; */ ; */
#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
FAULT_TYPE_HARD_FAULT EQU 0x10 FAULT_TYPE_HARD_FAULT EQU 0x10
@ -67,7 +67,7 @@ UsageFault_Handler\
Fault_Handler PROC Fault_Handler PROC
EXPORT Fault_Handler EXPORT Fault_Handler
#if (__DOMAIN_NS == 1) #if (DOMAIN_NS == 1)
IMPORT osRtxInfo IMPORT osRtxInfo
IMPORT mbed_fault_handler IMPORT mbed_fault_handler
IMPORT mbed_fault_context IMPORT mbed_fault_context

6
rtos/TARGET_CORTEX/TARGET_CORTEX_M/TOOLCHAIN_GCC/except.S
View File

@ -26,8 +26,8 @@
.file "except.S" .file "except.S"
.syntax unified .syntax unified
#ifndef __DOMAIN_NS #ifndef DOMAIN_NS
#define __DOMAIN_NS 1 #define DOMAIN_NS 1
#endif #endif
.equ FAULT_TYPE_HARD_FAULT, 0x10 .equ FAULT_TYPE_HARD_FAULT, 0x10
@ -103,7 +103,7 @@ UsageFault_Handler:
.cantunwind .cantunwind
Fault_Handler: Fault_Handler:
#if (__DOMAIN_NS == 1) #if (DOMAIN_NS == 1)
MRS R0,MSP MRS R0,MSP
LDR R1,=0x4 LDR R1,=0x4
MOV R2,LR MOV R2,LR

6
rtos/TARGET_CORTEX/TARGET_CORTEX_M/TOOLCHAIN_IAR/except.S
View File

@ -31,8 +31,8 @@ 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 PRESERVE8
SECTION .rodata:DATA:NOROOT(2) SECTION .rodata:DATA:NOROOT(2)
@ -62,7 +62,7 @@ UsageFault_Handler
Fault_Handler Fault_Handler
EXPORT Fault_Handler EXPORT Fault_Handler
#if (__DOMAIN_NS == 1) #if (DOMAIN_NS == 1)
IMPORT osRtxInfo IMPORT osRtxInfo
IMPORT mbed_fault_context IMPORT mbed_fault_context
IMPORT mbed_fault_handler IMPORT mbed_fault_handler

6
rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M23/irq_armv8mbl.S
View File

@ -24,9 +24,9 @@
; */ ; */
IF :LNOT::DEF:DOMAIN_NS #ifndef DOMAIN_NS
DOMAIN_NS EQU 0 DOMAIN_NS EQU 0
ENDIF #endif
I_T_RUN_OFS EQU 20 ; osRtxInfo.thread.run offset I_T_RUN_OFS EQU 20 ; osRtxInfo.thread.run offset
TCB_SM_OFS EQU 48 ; TCB.stack_mem offset TCB_SM_OFS EQU 48 ; TCB.stack_mem offset

12
rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M33/irq_armv8mml.S
View File

@ -24,15 +24,13 @@
; */ ; */
IF :LNOT::DEF:DOMAIN_NS #ifndef DOMAIN_NS
DOMAIN_NS EQU 0 DOMAIN_NS EQU 0
ENDIF #endif
IF ({FPU}="FPv5-SP") || ({FPU}="FPv5_D16") #ifndef __FPU_USED
__FPU_USED EQU 1
ELSE
__FPU_USED EQU 0 __FPU_USED EQU 0
ENDIF #endif
I_T_RUN_OFS EQU 20 ; osRtxInfo.thread.run offset I_T_RUN_OFS EQU 20 ; osRtxInfo.thread.run offset
TCB_SM_OFS EQU 48 ; TCB.stack_mem offset TCB_SM_OFS EQU 48 ; TCB.stack_mem offset

4
rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M23/irq_armv8mbl.S
View File

@ -27,9 +27,9 @@
.file "irq_armv8mbl.S" .file "irq_armv8mbl.S"
.syntax unified .syntax unified
.ifndef DOMAIN_NS #ifndef DOMAIN_NS
.equ DOMAIN_NS, 0 .equ DOMAIN_NS, 0
.endif #endif
.equ I_T_RUN_OFS, 20 // osRtxInfo.thread.run offset .equ I_T_RUN_OFS, 20 // osRtxInfo.thread.run offset
.equ TCB_SM_OFS, 48 // TCB.stack_mem offset .equ TCB_SM_OFS, 48 // TCB.stack_mem offset

8
rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml.S
View File

@ -27,13 +27,13 @@
.file "irq_armv8mml.S" .file "irq_armv8mml.S"
.syntax unified .syntax unified
.ifndef DOMAIN_NS #ifndef DOMAIN_NS
.equ DOMAIN_NS, 0 .equ DOMAIN_NS, 0
.endif #endif
.ifndef __FPU_USED #ifndef __FPU_USED
.equ __FPU_USED, 0 .equ __FPU_USED, 0
.endif #endif
.equ I_T_RUN_OFS, 20 // osRtxInfo.thread.run offset .equ I_T_RUN_OFS, 20 // osRtxInfo.thread.run offset
.equ TCB_SM_OFS, 48 // TCB.stack_mem offset .equ TCB_SM_OFS, 48 // TCB.stack_mem offset