]> git.sur5r.net Git - freertos/commitdiff
Ensure that fault handlers are declared naked.
authorgaurav-aws <gaurav-aws@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Sun, 5 May 2019 02:26:42 +0000 (02:26 +0000)
committergaurav-aws <gaurav-aws@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Sun, 5 May 2019 02:26:42 +0000 (02:26 +0000)
git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2655 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/NonSecure/main_ns.c
FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/NonSecure/main_ns.c
FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/NonSecure/main_ns.c

index df76975013d824d91ae7fce7a3f38275aba71bde..781cc840262357138405d7a7cb61e8662925807e 100644 (file)
@@ -65,6 +65,13 @@ const uint32_t * __unprivileged_sram_end__                   = ( uint32_t * ) ( 0x30018000 - 0x1
  * @brief Create all demo tasks.\r
  */\r
 static void prvCreateTasks( void );\r
+\r
+/**\r
+ * @brief The hard fault handler.\r
+ *\r
+ * It calls a function called vHandleMemoryFault.\r
+ */\r
+void HardFault_Handler( void ) __attribute__ ( ( naked ) );\r
 /*-----------------------------------------------------------*/\r
 \r
 static void prvCreateTasks( void )\r
@@ -166,10 +173,6 @@ void vApplicationGetTimerTaskMemory( StaticTask_t ** ppxTimerTaskTCBBuffer,
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-/**\r
- * @brief The fault handler implementation calls a function called\r
- * vHandleMemoryFault.\r
- */\r
 void HardFault_Handler( void )\r
 {\r
        __asm volatile\r
index 055413bff3f44556f4c02cd9d9f4678ade4237e4..fe654cffbe6ee6a95d0bde7625a482bd225e2117 100644 (file)
@@ -57,7 +57,7 @@ void SystemInit( void );
  *\r
  * It calls a function called vHandleMemoryFault.\r
  */\r
-void MemManage_Handler( void )  __attribute__ ( ( naked ) );\r
+void MemManage_Handler( void ) __attribute__ ( ( naked ) );\r
 /*-----------------------------------------------------------*/\r
 \r
 static void prvCreateTasks( void )\r
index 13e18ab225a7eb8e326f6e6eab0442bf642e79f3..e5d974d3f23c7f4ca8ab059e4696558a68a38750 100644 (file)
@@ -63,6 +63,13 @@ const uint32_t * __unprivileged_sram_end__                   = ( uint32_t * ) ( 0x20220000 - 0x1
  * @brief Create all demo tasks.\r
  */\r
 static void prvCreateTasks( void );\r
+\r
+/**\r
+ * @brief The mem fault handler.\r
+ *\r
+ * It calls a function called vHandleMemoryFault.\r
+ */\r
+void MemManage_Handler( void ) __attribute__ ( ( naked ) );\r
 /*-----------------------------------------------------------*/\r
 \r
 /*\r
@@ -170,10 +177,6 @@ void vApplicationGetTimerTaskMemory( StaticTask_t ** ppxTimerTaskTCBBuffer,
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-/**\r
- * @brief The mem fault handler implementation calls a function called\r
- * vHandleMemoryFault.\r
- */\r
 void MemManage_Handler( void )\r
 {\r
        __asm volatile\r