Просмотр исходного кода

Core(M): Removed __MVE_PRESENT and __MVE_USED macros for Armv8.1-M based devices.
Instead of using those macros we decided to rely on the ACLE macros defined
by the Compiler (i.e. __ARM_FEATURE_MVE).

Change-Id: Ib04aa3a32f02d855db2e24431ea351dc82809637

Jonatan Antoni 5 лет назад
Родитель
Сommit
01f1b6be67
2 измененных файлов с 2 добавлено и 58 удалено
  1. 1 39
      CMSIS/Core/Include/core_armv81mml.h
  2. 1 19
      CMSIS/Core/Include/core_cm55.h

+ 1 - 39
CMSIS/Core/Include/core_armv81mml.h

@@ -2,7 +2,7 @@
  * @file     core_armv81mml.h
  * @brief    CMSIS Armv8.1-M Mainline Core Peripheral Access Layer Header File
  * @version  V1.3.1
- * @date     03. March 2020
+ * @date     18. March 2020
  ******************************************************************************/
 /*
  * Copyright (c) 2018-2020 Arm Limited. All rights reserved.
@@ -97,17 +97,6 @@
     #define __DSP_USED         0U
   #endif
 
-  #if defined(__ARM_FEATURE_MVE)
-    #if defined(__MVE_PRESENT) && (__MVE_PRESENT == 1U)
-      #define __MVE_USED       1U
-    #else
-      #error "Compiler generates MVE instructions for a devices without MVE extensions (check __MVE_PRESENT)"
-      #define __MVE_USED         0U
-    #endif
-  #else
-    #define __MVE_USED         0U
-  #endif
-
 #elif defined ( __GNUC__ )
   #if defined (__VFP_FP__) && !defined(__SOFTFP__)
     #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
@@ -131,17 +120,6 @@
     #define __DSP_USED         0U
   #endif
 
-  #if defined(__ARM_FEATURE_MVE)
-    #if defined(__MVE_PRESENT) && (__MVE_PRESENT == 1U)
-      #define __MVE_USED       1U
-    #else
-      #error "Compiler generates MVE instructions for a devices without MVE extensions (check __MVE_PRESENT)"
-      #define __MVE_USED         0U
-    #endif
-  #else
-    #define __MVE_USED         0U
-  #endif
-
 #elif defined ( __ICCARM__ )
   #if defined __ARMVFP__
     #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
@@ -165,17 +143,6 @@
     #define __DSP_USED         0U
   #endif
 
-  #if defined(__ARM_FEATURE_MVE)
-    #if defined(__MVE_PRESENT) && (__MVE_PRESENT == 1U)
-      #define __MVE_USED       1U
-    #else
-      #error "Compiler generates MVE instructions for a devices without MVE extensions (check __MVE_PRESENT)"
-      #define __MVE_USED         0U
-    #endif
-  #else
-    #define __MVE_USED         0U
-  #endif
-
 #elif defined ( __TI_ARM__ )
   #if defined __TI_VFP_SUPPORT__
     #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
@@ -259,11 +226,6 @@
     #warning "__DSP_PRESENT not defined in device header file; using default!"
   #endif
 
-  #ifndef __MVE_PRESENT
-    #define __MVE_PRESENT             0U
-    #warning "__MVE_PRESENT not defined in device header file; using default!"
-  #endif
-
   #ifndef __NVIC_PRIO_BITS
     #define __NVIC_PRIO_BITS          3U
     #warning "__NVIC_PRIO_BITS not defined in device header file; using default!"

+ 1 - 19
CMSIS/Core/Include/core_cm55.h

@@ -2,7 +2,7 @@
  * @file     core_cm55.h
  * @brief    CMSIS Cortex-M55 Core Peripheral Access Layer Header File
  * @version  V1.0.0
- * @date     03. March 2020
+ * @date     18. March 2020
  ******************************************************************************/
 /*
  * Copyright (c) 2018-2020 Arm Limited. All rights reserved.
@@ -97,12 +97,6 @@
     #define __DSP_USED         0U
   #endif
 
-  #if defined(__ARM_FEATURE_MVE)
-    #define __MVE_USED         1U
-  #else
-    #define __MVE_USED         0U
-  #endif
-
 #elif defined ( __GNUC__ )
   #if defined (__VFP_FP__) && !defined(__SOFTFP__)
     #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
@@ -126,12 +120,6 @@
     #define __DSP_USED         0U
   #endif
 
-  #if defined(__ARM_FEATURE_MVE)
-    #define __MVE_USED         1U
-  #else
-    #define __MVE_USED         0U
-  #endif
-
 #elif defined ( __ICCARM__ )
   #if defined __ARMVFP__
     #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
@@ -155,12 +143,6 @@
     #define __DSP_USED         0U
   #endif
 
-  #if defined(__ARM_FEATURE_MVE)
-    #define __MVE_USED         1U
-  #else
-    #define __MVE_USED         0U
-  #endif
-
 #elif defined ( __TI_ARM__ )
   #if defined __TI_VFP_SUPPORT__
     #if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)