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

RP2040: Use indirect reference for pxCurrentTCB (#525)

Browse source
This commit is contained in:
NomiChirps 2022-07-18 16:05:30 -07:00 committed by GitHub
parent 2dfdfc4ba4
commit 859dbaf504
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
portable/ThirdParty/GCC/RP2040/port.c vendored
View file

@ -206,7 +206,7 @@ void vPortStartFirstTask( void )
{ {
__asm volatile ( __asm volatile (
" .syntax unified \n" " .syntax unified \n"
" ldr r2, =pxCurrentTCB \n"/* Obtain location of pxCurrentTCB. */ " ldr r2, pxCurrentTCBConst1 \n"/* Obtain location of pxCurrentTCB. */
" ldr r3, [r2] \n" " ldr r3, [r2] \n"
" ldr r0, [r3] \n"/* The first item in pxCurrentTCB is the task top of stack. */ " ldr r0, [r3] \n"/* The first item in pxCurrentTCB is the task top of stack. */
" adds r0, #32 \n"/* Discard everything up to r0. */ " adds r0, #32 \n"/* Discard everything up to r0. */
@ -220,6 +220,8 @@ void vPortStartFirstTask( void )
" pop {r2} \n"/* Pop and discard XPSR. */ " pop {r2} \n"/* Pop and discard XPSR. */
" cpsie i \n"/* The first task has its context and interrupts can be enabled. */ " cpsie i \n"/* The first task has its context and interrupts can be enabled. */
" bx r3 \n"/* Finally, jump to the user defined task code. */ " bx r3 \n"/* Finally, jump to the user defined task code. */
" .align 4 \n"
"pxCurrentTCBConst1: .word pxCurrentTCB\n"
); );
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
@ -380,7 +382,7 @@ void xPortPendSVHandler( void )
" .syntax unified \n" " .syntax unified \n"
" mrs r0, psp \n" " mrs r0, psp \n"
" \n" " \n"
" ldr r3, =pxCurrentTCB \n"/* Get the location of the current TCB. */ " ldr r3, pxCurrentTCBConst2 \n"/* Get the location of the current TCB. */
" ldr r2, [r3] \n" " ldr r2, [r3] \n"
" \n" " \n"
" subs r0, r0, #32 \n"/* Make space for the remaining low registers. */ " subs r0, r0, #32 \n"/* Make space for the remaining low registers. */
@ -450,6 +452,8 @@ void xPortPendSVHandler( void )
" ldmia r0!, {r4-r7} \n"/* Pop low registers. */ " ldmia r0!, {r4-r7} \n"/* Pop low registers. */
" \n" " \n"
" bx r3 \n" " bx r3 \n"
" .align 4 \n"
"pxCurrentTCBConst2: .word pxCurrentTCB \n"
); );
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/