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

Add v8.1-M architecture awareness 

Add v8.1-M architecture awareness to Mbed CRC, HAL, and Mbed Atomic.

Fixes #14433
pull/14588/head
Jaeden Amero 2021-04-23 14:59:47 +01:00
parent 9738b27c7d
commit 5d20374bc3
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/include/drivers/MbedCRC.h
View File

@ -649,6 +649,7 @@ private:
#if (__ARM_ARCH_7M__ == 1U) || \ #if (__ARM_ARCH_7M__ == 1U) || \
(__ARM_ARCH_7EM__ == 1U) || \ (__ARM_ARCH_7EM__ == 1U) || \
(__ARM_ARCH_8M_MAIN__ == 1U) || \ (__ARM_ARCH_8M_MAIN__ == 1U) || \
(__ARM_ARCH_8_1M_MAIN__ == 1U) || \
(__ARM_ARCH_7A__ == 1U) (__ARM_ARCH_7A__ == 1U)
/* ARM that has Thumb-2 - same unified assembly is good for either ARM or Thumb state (LSRS; IT CS; EORCS reg/imm) */ /* ARM that has Thumb-2 - same unified assembly is good for either ARM or Thumb state (LSRS; IT CS; EORCS reg/imm) */
#define MBED_CRC_ARM_THUMB2 1 #define MBED_CRC_ARM_THUMB2 1

2
hal/source/mpu/mbed_mpu_v8m.c
View File

@ -18,7 +18,7 @@
#include "platform/mbed_assert.h" #include "platform/mbed_assert.h"
#include "cmsis.h" #include "cmsis.h"
#if ((__ARM_ARCH_8M_BASE__ == 1U) || (__ARM_ARCH_8M_MAIN__ == 1U)) && \ #if ((__ARM_ARCH_8M_BASE__ == 1U) || (__ARM_ARCH_8M_MAIN__ == 1U) || (__ARM_ARCH_8_1M_MAIN__ == 1U)) && \
defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U) && \ defined (__MPU_PRESENT) && (__MPU_PRESENT == 1U) && \
!defined(MBED_MPU_CUSTOM) !defined(MBED_MPU_CUSTOM)

5
hal/tests/TESTS/mbed_hal/mpu/main.cpp
View File

@ -177,7 +177,10 @@ utest::v1::status_t fault_override_teardown(const Case *const source, const size
Case cases[] = { Case cases[] = {
Case("MPU - init", fault_override_setup, mpu_init_test, fault_override_teardown), Case("MPU - init", fault_override_setup, mpu_init_test, fault_override_teardown),
Case("MPU - free", fault_override_setup, mpu_free_test, fault_override_teardown), Case("MPU - free", fault_override_setup, mpu_free_test, fault_override_teardown),
#if !((__ARM_ARCH_8M_BASE__ == 1U) || (__ARM_ARCH_8M_MAIN__ == 1U)) #if !((__ARM_ARCH_8M_BASE__ == 1U) || \
(__ARM_ARCH_8M_MAIN__ == 1U) || \
(__ARM_ARCH_8_1M_MAIN__ == 1U) \
)
// Skip fault tests for ARMv8-M until a fault handler hook is provided // Skip fault tests for ARMv8-M until a fault handler hook is provided
Case("MPU - data fault", fault_override_setup, mpu_fault_test_data, fault_override_teardown), Case("MPU - data fault", fault_override_setup, mpu_fault_test_data, fault_override_teardown),
Case("MPU - bss fault", fault_override_setup, mpu_fault_test_bss, fault_override_teardown), Case("MPU - bss fault", fault_override_setup, mpu_fault_test_bss, fault_override_teardown),

3
platform/include/platform/mbed_atomic.h
View File

@ -69,7 +69,8 @@ typedef enum mbed_memory_order {
#if ((__ARM_ARCH_7M__ == 1U) || \ #if ((__ARM_ARCH_7M__ == 1U) || \
(__ARM_ARCH_7EM__ == 1U) || \ (__ARM_ARCH_7EM__ == 1U) || \
(__ARM_ARCH_8M_BASE__ == 1U) || \ (__ARM_ARCH_8M_BASE__ == 1U) || \
(__ARM_ARCH_8M_MAIN__ == 1U)) || \ (__ARM_ARCH_8M_MAIN__ == 1U) || \
(__ARM_ARCH_8_1M_MAIN__ == 1U)) || \
(__ARM_ARCH_7A__ == 1U) (__ARM_ARCH_7A__ == 1U)
#define MBED_EXCLUSIVE_ACCESS 1U #define MBED_EXCLUSIVE_ACCESS 1U
#define MBED_EXCLUSIVE_ACCESS_THUMB1 (__ARM_ARCH_8M_BASE__ == 1U) #define MBED_EXCLUSIVE_ACCESS_THUMB1 (__ARM_ARCH_8M_BASE__ == 1U)