Update RX GCC port - including extracting all inline asm into separate asm file.

[freertos] / Source / portable / GCC / RX600 / portmacro.h

diff --git a/Source/portable/GCC/RX600/portmacro.h b/Source/portable/GCC/RX600/portmacro.h
index 592cfcee99706aad2fbe09413e49f9f53d690e08..91223530c101fd81f9820c100f8e20d34196ab93 100644 (file)
--- a/Source/portable/GCC/RX600/portmacro.h
+++ b/Source/portable/GCC/RX600/portmacro.h
@@ -92,7 +92,7 @@ portSTACK_TYPE and portBASE_TYPE. */
 #define portBYTE_ALIGNMENT                     8       /* Could make four, according to manual. */\r
 #define portSTACK_GROWTH                       -1\r
 #define portTICK_RATE_MS                       ( ( portTickType ) 1000 / configTICK_RATE_HZ )          \r
-#define portNOP()                                      __asm( "NOP" )\r
+#define portNOP()                                      __asm volatile( "NOP" )\r
 \r
 /* The location of the software interrupt register.  Software interrupts use\r
 vector 27. */\r
@@ -104,8 +104,8 @@ vector 27. */
  * These macros should be called directly, but through the taskENTER_CRITICAL()\r
  * and taskEXIT_CRITICAL() macros.\r
  */\r
-#define portENABLE_INTERRUPTS()        __asm ( "MVTIPL #0" );\r
-#define portDISABLE_INTERRUPTS()       __asm ( "MVTIPL %0" ::"i"(configMAX_SYSCALL_INTERRUPT_PRIORITY) )\r
+#define portENABLE_INTERRUPTS()        __asm volatile ( "MVTIPL        #0" );\r
+#define portDISABLE_INTERRUPTS()       __asm volatile ( "MVTIPL        %0" ::"i"(configMAX_SYSCALL_INTERRUPT_PRIORITY) )\r
 \r
 /* Critical nesting counts are stored in the TCB. */\r
 #define portCRITICAL_NESTING_IN_TCB ( 1 )\r
@@ -117,8 +117,8 @@ extern void vTaskExitCritical( void );
 #define portEXIT_CRITICAL()            vTaskExitCritical();\r
 \r
 /* As this port allows interrupt nesting... */\r
-unsigned long ulPortGetIPL( void ) __attribute__((naked));\r
-void vPortSetIPL( unsigned long ulNewIPL ) __attribute__((naked));\r
+unsigned long ulPortGetIPL( void );\r
+void vPortSetIPL( unsigned long ulNewIPL );\r
 #define portSET_INTERRUPT_MASK_FROM_ISR() ulPortGetIPL(); portDISABLE_INTERRUPTS()\r
 #define portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus ) vPortSetIPL( uxSavedInterruptStatus )\r
 \r