Update TriCore port to work with latest GCC compiler.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2516 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/FreeRTOS/Source/portable/GCC/TriCore_1782/port.c b/FreeRTOS/Source/portable/GCC/TriCore_1782/port.c
index 33b2b7e6421cb00043438f3049e39ead87a95cdd..80fd58addb2d1a8e368bcc5a7c9bc3cd44afd3b8 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/TriCore_1782/port.c
+++ b/FreeRTOS/Source/portable/GCC/TriCore_1782/port.c
@@ -167,7 +167,7 @@ uint32_t *pulLowerCSA = NULL;
                _dsync();\r
 \r
                /* Consume two free CSAs. */\r
-               pulLowerCSA = portCSA_TO_ADDRESS( _mfcr( $FCX ) );\r
+               pulLowerCSA = portCSA_TO_ADDRESS( __MFCR( $FCX ) );\r
                if( NULL != pulLowerCSA )\r
                {\r
                        /* The Lower Links to the Upper. */\r
@@ -261,7 +261,7 @@ uint32_t *pulLowerCSA = NULL;
 \r
        /* Clear the PSW.CDC to enable the use of an RFE without it generating an\r
        exception because this code is not genuinely in an exception. */\r
-       ulMFCR = _mfcr( $PSW );\r
+       ulMFCR = __MFCR( $PSW );\r
        ulMFCR &= portRESTORE_PSW_MASK;\r
        _dsync();\r
        _mtcr( $PSW, ulMFCR );\r
@@ -388,7 +388,7 @@ int32_t lYieldRequired;
                enabled/disabled. */\r
                _disable();\r
                _dsync();\r
-               xUpperCSA = _mfcr( $PCXI );\r
+               xUpperCSA = __MFCR( $PCXI );\r
                pxUpperCSA = portCSA_TO_ADDRESS( xUpperCSA );\r
                *pxCurrentTCB = pxUpperCSA[ 0 ];\r
                vTaskSwitchContext();\r
@@ -458,7 +458,7 @@ uint32_t *pulNextCSA;
        {\r
                /* Look up the current free CSA head. */\r
                _dsync();\r
-               pxFreeCSA = _mfcr( $FCX );\r
+               pxFreeCSA = __MFCR( $FCX );\r
 \r
                /* Join the current Free onto the Tail of what is being reclaimed. */\r
                portCSA_TO_ADDRESS( pxTailCSA )[ 0 ] = pxFreeCSA;\r
@@ -508,7 +508,7 @@ extern volatile uint32_t *pxCurrentTCB;
                        enabled/disabled. */\r
                        _disable();\r
                        _dsync();\r
-                       xUpperCSA = _mfcr( $PCXI );\r
+                       xUpperCSA = __MFCR( $PCXI );\r
                        pxUpperCSA = portCSA_TO_ADDRESS( xUpperCSA );\r
                        *pxCurrentTCB = pxUpperCSA[ 0 ];\r
                        vTaskSwitchContext();\r
@@ -555,7 +555,7 @@ extern volatile uint32_t *pxCurrentTCB;
        enabled/disabled. */\r
        _disable();\r
        _dsync();\r
-       xUpperCSA = _mfcr( $PCXI );\r
+       xUpperCSA = __MFCR( $PCXI );\r
        pxUpperCSA = portCSA_TO_ADDRESS( xUpperCSA );\r
        *pxCurrentTCB = pxUpperCSA[ 0 ];\r
        vTaskSwitchContext();\r
@@ -570,7 +570,7 @@ uint32_t uxPortSetInterruptMaskFromISR( void )
 uint32_t uxReturn = 0UL;\r
 \r
        _disable();\r
-       uxReturn = _mfcr( $ICR );\r
+       uxReturn = __MFCR( $ICR );\r
        _mtcr( $ICR, ( ( uxReturn & ~portCCPN_MASK ) | configMAX_SYSCALL_INTERRUPT_PRIORITY ) );\r
        _isync();\r
        _enable();\r

diff --git a/FreeRTOS/Source/portable/GCC/TriCore_1782/portmacro.h b/FreeRTOS/Source/portable/GCC/TriCore_1782/portmacro.h
index 90119f3fb0a64698e2bf90f8d7b231eacc831b1e..f4c3f607ef7498996e784528520ad20156bbaf5c 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/TriCore_1782/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/TriCore_1782/portmacro.h
@@ -155,7 +155,7 @@ extern void vTaskExitCritical( void );
 #define portDISABLE_INTERRUPTS()       {                                                                                                                                                                                                       \\r
                                                                                uint32_t ulICR;                                                                                                                                                 \\r
                                                                                _disable();                                                                                                                                                                             \\r
-                                                                               ulICR = _mfcr( $ICR );          /* Get current ICR value. */                                                                            \\r
+                                                                               ulICR = __MFCR( $ICR );                 /* Get current ICR value. */                                                                            \\r
                                                                                ulICR &= ~portCCPN_MASK;        /* Clear down mask bits. */                                                                                     \\r
                                                                                ulICR |= configMAX_SYSCALL_INTERRUPT_PRIORITY; /* Set mask bits to required priority mask. */   \\r
                                                                                _mtcr( $ICR, ulICR );           /* Write back updated ICR. */                                                                           \\r
@@ -167,7 +167,7 @@ extern void vTaskExitCritical( void );
 #define portENABLE_INTERRUPTS()                {                                                                                                                                       \\r
                                                                                uint32_t ulICR;                                                                                 \\r
                                                                                _disable();                                                                                                             \\r
-                                                                               ulICR = _mfcr( $ICR );          /* Get current ICR value. */            \\r
+                                                                               ulICR = __MFCR( $ICR );         /* Get current ICR value. */            \\r
                                                                                ulICR &= ~portCCPN_MASK;        /* Clear down mask bits. */                     \\r
                                                                                _mtcr( $ICR, ulICR );           /* Write back updated ICR. */           \\r
                                                                                _isync();                                                                                                               \\r
@@ -178,7 +178,7 @@ extern void vTaskExitCritical( void );
 #define portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedMaskValue )  {                                                                                                                                                                               \\r
                                                                                                                                        uint32_t ulICR;                                                                                                                         \\r
                                                                                                                                        _disable();                                                                                                                                                     \\r
-                                                                                                                                       ulICR = _mfcr( $ICR );          /* Get current ICR value. */                                                    \\r
+                                                                                                                                       ulICR = __MFCR( $ICR );         /* Get current ICR value. */                                                    \\r
                                                                                                                                        ulICR &= ~portCCPN_MASK;        /* Clear down mask bits. */                                                             \\r
                                                                                                                                        ulICR |= uxSavedMaskValue;      /* Set mask bits to previously saved mask value. */             \\r
                                                                                                                                        _mtcr( $ICR, ulICR );           /* Write back updated ICR. */                                                   \\r

diff --git a/FreeRTOS/Source/portable/GCC/TriCore_1782/porttrap.c b/FreeRTOS/Source/portable/GCC/TriCore_1782/porttrap.c
index 10a3353516fe5b1e0835110d4c7b206b74044fc3..830d2d40bd0d1e0eabddacf27bf2b2a012daf542 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/TriCore_1782/porttrap.c
+++ b/FreeRTOS/Source/portable/GCC/TriCore_1782/porttrap.c
@@ -234,7 +234,7 @@ void vInternalProtectionTrap( int iTrapIdentification )
                        \r
                default:\r
                \r
-                       pxCurrentTCB[ 0 ] = _mfcr( $PCXI );\r
+                       pxCurrentTCB[ 0 ] = __MFCR( $PCXI );\r
                        _debug();\r
                        break;\r
        }\r