Skip to content

Backport CMSIS_6#102 to CMSIS 5.9.0 #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 5, 2025
Merged

Backport CMSIS_6#102 to CMSIS 5.9.0 #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions CMSIS/Core/Include/cmsis_iccarm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,13 +309,22 @@ __STATIC_FORCEINLINE void __TZ_set_STACKSEAL_S (uint32_t* stackTop) {

#include "iccarm_builtin.h"

#define __disable_fault_irq __iar_builtin_disable_fiq
#define __disable_irq __iar_builtin_disable_interrupt
#define __enable_fault_irq __iar_builtin_enable_fiq
#define __enable_irq __iar_builtin_enable_interrupt
#define __arm_rsr __iar_builtin_rsr
#define __arm_wsr __iar_builtin_wsr

#if (defined(__ARM_ARCH_ISA_THUMB) && __ARM_ARCH_ISA_THUMB >= 2)
__IAR_FT void __disable_fault_irq()
{
__ASM volatile ("CPSID F" ::: "memory");
}

__IAR_FT void __enable_fault_irq()
{
__ASM volatile ("CPSIE F" ::: "memory");
}
#endif

#define __get_APSR() (__arm_rsr("APSR"))
#define __get_BASEPRI() (__arm_rsr("BASEPRI"))
Expand Down Expand Up @@ -639,9 +648,15 @@ __STATIC_FORCEINLINE void __TZ_set_CONTROL_NS(uint32_t control)
}


#define __enable_fault_irq __enable_fiq
#define __disable_fault_irq __disable_fiq
__IAR_FT void __disable_fault_irq()
{
__ASM volatile ("CPSID F" ::: "memory");
}

__IAR_FT void __enable_fault_irq()
{
__ASM volatile ("CPSIE F" ::: "memory");
}

#endif /* (__CORTEX_M >= 0x03) */

Expand Down