CloudEdge/FreeRTOS-Kernel
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update TriCore port to work with latest GCC compiler.

Browse Source
This commit is contained in:
Richard Barry 2017-08-09 16:57:35 +00:00
parent b6f2402f3f
commit 037abdddf2
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
FreeRTOS/Source/portable/GCC/TriCore_1782/port.c
View File

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

6
FreeRTOS/Source/portable/GCC/TriCore_1782/portmacro.h
View File

@ -155,7 +155,7 @@ extern void vTaskExitCritical( void );
#define portDISABLE_INTERRUPTS() { \ #define portDISABLE_INTERRUPTS() { \
uint32_t ulICR; \ uint32_t ulICR; \
_disable(); \ _disable(); \
ulICR = _mfcr( $ICR ); /* Get current ICR value. */ \ ulICR = __MFCR( $ICR ); /* Get current ICR value. */ \
ulICR &= ~portCCPN_MASK; /* Clear down mask bits. */ \ ulICR &= ~portCCPN_MASK; /* Clear down mask bits. */ \
ulICR |= configMAX_SYSCALL_INTERRUPT_PRIORITY; /* Set mask bits to required priority mask. */ \ ulICR |= configMAX_SYSCALL_INTERRUPT_PRIORITY; /* Set mask bits to required priority mask. */ \
_mtcr( $ICR, ulICR ); /* Write back updated ICR. */ \ _mtcr( $ICR, ulICR ); /* Write back updated ICR. */ \
@ -167,7 +167,7 @@ extern void vTaskExitCritical( void );
#define portENABLE_INTERRUPTS() { \ #define portENABLE_INTERRUPTS() { \
uint32_t ulICR; \ uint32_t ulICR; \
_disable(); \ _disable(); \
ulICR = _mfcr( $ICR ); /* Get current ICR value. */ \ ulICR = __MFCR( $ICR ); /* Get current ICR value. */ \
ulICR &= ~portCCPN_MASK; /* Clear down mask bits. */ \ ulICR &= ~portCCPN_MASK; /* Clear down mask bits. */ \
_mtcr( $ICR, ulICR ); /* Write back updated ICR. */ \ _mtcr( $ICR, ulICR ); /* Write back updated ICR. */ \
_isync(); \ _isync(); \
@ -178,7 +178,7 @@ extern void vTaskExitCritical( void );
#define portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedMaskValue ) { \ #define portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedMaskValue ) { \
uint32_t ulICR; \ uint32_t ulICR; \
_disable(); \ _disable(); \
ulICR = _mfcr( $ICR ); /* Get current ICR value. */ \ ulICR = __MFCR( $ICR ); /* Get current ICR value. */ \
ulICR &= ~portCCPN_MASK; /* Clear down mask bits. */ \ ulICR &= ~portCCPN_MASK; /* Clear down mask bits. */ \
ulICR |= uxSavedMaskValue; /* Set mask bits to previously saved mask value. */ \ ulICR |= uxSavedMaskValue; /* Set mask bits to previously saved mask value. */ \
_mtcr( $ICR, ulICR ); /* Write back updated ICR. */ \ _mtcr( $ICR, ulICR ); /* Write back updated ICR. */ \

2
FreeRTOS/Source/portable/GCC/TriCore_1782/porttrap.c
View File

@ -234,7 +234,7 @@ void vInternalProtectionTrap( int iTrapIdentification )
default: default:
pxCurrentTCB[ 0 ] = _mfcr( $PCXI ); pxCurrentTCB[ 0 ] = __MFCR( $PCXI );
_debug(); _debug();
break; break;
} }