michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arm: swap: cleanup an #ifdef statement in swap routine

Browse source 
Cleanup an #ifdef statement in swap_helper.S; use
ARMV6_M_ARMV8_M_BASELINE instead of listing all
Cortex-M baseline implementation variants. This
fixes an issue with Cortex-M23 whose Kconfig
define was not included in the original list.

Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
This commit is contained in:
Ioannis Glaropoulos 2021-07-28 14:36:22 +02:00 • committed by Christopher Friedt
commit ca5623d288
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/core/aarch32/swap_helper.S
View file

@ -209,8 +209,7 @@ out_fp_endif:
/* Restore previous interrupt disable state (irq_lock key)
* (We clear the arch.basepri field after restoring state)
*/
#if (defined(CONFIG_CPU_CORTEX_M0PLUS) || defined(CONFIG_CPU_CORTEX_M0) || \
defined(CONFIG_CPU_CORTEX_M1)) && _thread_offset_to_basepri > 124
#if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE) && (_thread_offset_to_basepri > 124)
/* Doing it this way since the offset to thread->arch.basepri can in
* some configurations be larger than the maximum of 124 for ldr/str
* immediate offsets.