len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-04-20 05:21:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

A little optimisation.

Browse source
This commit is contained in:
Richard Barry 2008-05-23 15:16:25 +00:00
parent b6aa1d6ca8
commit f689c709ab
3 changed files with 19 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Source/portable/MPLAB/PIC32MX/port.c
View file

@ -167,19 +167,6 @@ extern void *pxCurrentTCB;
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
void vPortYield( void )
{
unsigned portLONG ulStatus;
SetCoreSW0();
/* Unmask all interrupts. */
ulStatus = _CP0_GET_STATUS();
ulStatus &= ~portALL_IPL_BITS;
_CP0_SET_STATUS( ulStatus );
}
/*-----------------------------------------------------------*/
void vPortIncrementTick( void ) void vPortIncrementTick( void )
{ {
unsigned portBASE_TYPE uxSavedStatus; unsigned portBASE_TYPE uxSavedStatus;

16
Source/portable/MPLAB/PIC32MX/port_asm.S
View file

@ -51,7 +51,6 @@
#include <sys/asm.h> #include <sys/asm.h>
#include "ISR_Support.h" #include "ISR_Support.h"
#define portEXC_CODE_MASK ( 0x1f << 2 )
.set nomips16 .set nomips16
.set noreorder .set noreorder
@ -138,10 +137,9 @@ vPortYieldISR:
la sp, xISRStackTop la sp, xISRStackTop
lw sp, (sp) lw sp, (sp)
/* Increment and save the nesting count in case this gets preempted. */ /* Set the nesting count. */
la k0, uxInterruptNesting la k0, uxInterruptNesting
lw s6, (k0) addiu s6, zero, 1
addiu s6, s6, 1
sw s6, 0(k0) sw s6, 0(k0)
/* s6 holds the EPC value, this is saved with the rest of the context /* s6 holds the EPC value, this is saved with the rest of the context
@ -261,11 +259,10 @@ vPortYieldISR:
/* Protect access to the k registers, and others. */ /* Protect access to the k registers, and others. */
di di
/* Decrement the nesting count. */ /* Set nesting back to zero. As the lowest priority interrupt this
interrupt cannot have nested. */
la k0, uxInterruptNesting la k0, uxInterruptNesting
lw k1, (k0) sw zero, 0(k0)
addiu k1, k1, -1
sw k1, 0(k0)
/* Switch back to use the real stack pointer. */ /* Switch back to use the real stack pointer. */
add sp, zero, s5 add sp, zero, s5
@ -273,8 +270,7 @@ vPortYieldISR:
/* Restore the real s5 value. */ /* Restore the real s5 value. */
lw s5, 40(sp) lw s5, 40(sp)
/* If the critical nesting is not zero and a yield is not pended /* Pop the status and epc values. */
then set status as if within a critical section. */
lw k1, portSTATUS_STACK_LOCATION(sp) lw k1, portSTATUS_STACK_LOCATION(sp)
lw k0, portEPC_STACK_LOCATION(sp) lw k0, portEPC_STACK_LOCATION(sp)

14
Source/portable/MPLAB/PIC32MX/portmacro.h
View file

@ -94,6 +94,7 @@ extern "C" {
/* Critical section management. */ /* Critical section management. */
#define portIPL_SHIFT ( 10 ) #define portIPL_SHIFT ( 10 )
#define portALL_IPL_BITS ( 0x3f << portIPL_SHIFT ) #define portALL_IPL_BITS ( 0x3f << portIPL_SHIFT )
#define portSW0_BIT ( 0x01 << 8 )
#define portDISABLE_INTERRUPTS() \ #define portDISABLE_INTERRUPTS() \
{ \ { \
@ -130,8 +131,17 @@ extern void vPortClearInterruptMaskFromISR( unsigned portBASE_TYPE );
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
/* Task utilities. */ /* Task utilities. */
extern void vPortYield( void );
#define portYIELD() vPortYield() #define portYIELD() \
{ \
unsigned portLONG ulStatus; \
\
/* Unmask all interrupts. */ \
ulStatus = _CP0_GET_CAUSE(); \
ulStatus |= portSW0_BIT; \
_CP0_SET_CAUSE( ulStatus ); \
}
#define portNOP() asm volatile ( "nop" ) #define portNOP() asm volatile ( "nop" )