mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2025-04-19 21:11:57 -04:00
Move assembly instructions to portASM file
This commit is contained in:
parent
e4d3814b31
commit
e4b924f881
|
@ -32,6 +32,7 @@
|
|||
.set SYS_MODE, 0x1f
|
||||
.set SVC_MODE, 0x13
|
||||
.set IRQ_MODE, 0x12
|
||||
.set CPSR_I_BIT, 0x80
|
||||
|
||||
/* Variables and functions. */
|
||||
.extern pxCurrentTCB
|
||||
|
@ -47,6 +48,10 @@
|
|||
.global vPortRestoreTaskContext
|
||||
.global vPortInitialiseFPSCR
|
||||
.global ulReadAPSR
|
||||
.global vPortYield
|
||||
.global vPortEnableInterrupts
|
||||
.global vPortDisableInterrupts
|
||||
.global ulPortSetInterruptMaskFromISR
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
|
@ -142,6 +147,8 @@ FreeRTOS_SVC_Handler:
|
|||
/*-----------------------------------------------------------*/
|
||||
|
||||
/*
|
||||
* void vPortRestoreTaskContext( void );
|
||||
*
|
||||
* vPortRestoreTaskContext is used to start the scheduler.
|
||||
*/
|
||||
.align 4
|
||||
|
@ -154,6 +161,8 @@ vPortRestoreTaskContext:
|
|||
/*-----------------------------------------------------------*/
|
||||
|
||||
/*
|
||||
* void vPortInitialiseFPSCR( void );
|
||||
*
|
||||
* vPortInitialiseFPSCR is used to initialize the FPSCR register.
|
||||
*/
|
||||
.align 4
|
||||
|
@ -166,6 +175,8 @@ vPortInitialiseFPSCR:
|
|||
/*-----------------------------------------------------------*/
|
||||
|
||||
/*
|
||||
* uint32_t ulReadAPSR( void );
|
||||
*
|
||||
* ulReadAPSR is used to read the value of APSR context.
|
||||
*/
|
||||
.align 4
|
||||
|
@ -176,6 +187,57 @@ ulReadAPSR:
|
|||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
/*
|
||||
* void vPortYield( void );
|
||||
*/
|
||||
.align 4
|
||||
.type vPortYield, %function
|
||||
vPortYield:
|
||||
SVC 0
|
||||
ISB
|
||||
BX LR
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
/*
|
||||
* void vPortEnableInterrupts( void );
|
||||
*/
|
||||
.align 4
|
||||
.type vPortEnableInterrupts, %function
|
||||
vPortEnableInterrupts:
|
||||
CPSIE I
|
||||
BX LR
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
/*
|
||||
* void vPortDisableInterrupts( void );
|
||||
*/
|
||||
.align 4
|
||||
.type vPortDisableInterrupts, %function
|
||||
vPortDisableInterrupts:
|
||||
CPSID I
|
||||
DSB
|
||||
ISB
|
||||
BX LR
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
/*
|
||||
* uint32_t ulPortSetInterruptMaskFromISR( void );
|
||||
*/
|
||||
.align 4
|
||||
.type ulPortSetInterruptMaskFromISR, %function
|
||||
ulPortSetInterruptMaskFromISR:
|
||||
MRS R0, CPSR
|
||||
AND R0, R0, #CPSR_I_BIT
|
||||
CPSID I
|
||||
DSB
|
||||
ISB
|
||||
BX LR
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
.align 4
|
||||
.type FreeRTOS_IRQ_Handler, %function
|
||||
FreeRTOS_IRQ_Handler:
|
||||
|
|
|
@ -88,9 +88,10 @@ typedef uint32_t TickType_t;
|
|||
}
|
||||
|
||||
#define portYIELD_FROM_ISR( x ) portEND_SWITCHING_ISR( x )
|
||||
#define portYIELD() \
|
||||
__asm volatile ( "SWI 0 \n" \
|
||||
"ISB " ::: "memory" );
|
||||
|
||||
void vPortYield( void );
|
||||
|
||||
#define portYIELD() vPortYield();
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
|
@ -100,9 +101,9 @@ typedef uint32_t TickType_t;
|
|||
|
||||
extern void vPortEnterCritical( void );
|
||||
extern void vPortExitCritical( void );
|
||||
extern uint32_t ulPortSetInterruptMask( void );
|
||||
extern void vPortClearInterruptMask( uint32_t ulNewMaskValue );
|
||||
extern void vPortInstallFreeRTOSVectorTable( void );
|
||||
extern void vPortEnableInterrupts( void );
|
||||
extern void vPortDisableInterrupts( void );
|
||||
extern uint32_t ulPortSetInterruptMaskFromISR( void );
|
||||
|
||||
/* The I bit within the CPSR. */
|
||||
#define portINTERRUPT_ENABLE_BIT ( 1 << 7 )
|
||||
|
@ -111,25 +112,10 @@ extern void vPortInstallFreeRTOSVectorTable( void );
|
|||
* globally enable and disable interrupts. */
|
||||
#define portENTER_CRITICAL() vPortEnterCritical();
|
||||
#define portEXIT_CRITICAL() vPortExitCritical();
|
||||
#define portENABLE_INTERRUPTS() __asm volatile ( "CPSIE i \n" ::: "memory" );
|
||||
#define portDISABLE_INTERRUPTS() \
|
||||
__asm volatile ( "CPSID i \n" \
|
||||
"DSB \n" \
|
||||
"ISB " ::: "memory" );
|
||||
|
||||
__attribute__( ( always_inline ) ) static __inline uint32_t portINLINE_SET_INTERRUPT_MASK_FROM_ISR( void )
|
||||
{
|
||||
volatile uint32_t ulCPSR;
|
||||
|
||||
__asm volatile ( "MRS %0, CPSR" : "=r" ( ulCPSR )::"memory" );
|
||||
|
||||
ulCPSR &= portINTERRUPT_ENABLE_BIT;
|
||||
portDISABLE_INTERRUPTS();
|
||||
return ulCPSR;
|
||||
}
|
||||
|
||||
#define portSET_INTERRUPT_MASK_FROM_ISR() portINLINE_SET_INTERRUPT_MASK_FROM_ISR()
|
||||
#define portCLEAR_INTERRUPT_MASK_FROM_ISR( x ) do { if( x == 0 ) portENABLE_INTERRUPTS( ); } while( 0 )
|
||||
#define portENABLE_INTERRUPTS() vPortEnableInterrupts();
|
||||
#define portDISABLE_INTERRUPTS() vPortDisableInterrupts();
|
||||
#define portSET_INTERRUPT_MASK_FROM_ISR() ulPortSetInterruptMaskFromISR();
|
||||
#define portCLEAR_INTERRUPT_MASK_FROM_ISR( x ) do { if( x == 0 ) portENABLE_INTERRUPTS(); } while( 0 )
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
|
|
Loading…
Reference in a new issue