Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the memory alignment within the Cortex-R5 port asm code #1023

Merged
merged 3 commits into from
Apr 9, 2024
Merged

Update the memory alignment within the Cortex-R5 port asm code #1023

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57ffbc0
Update the memory alignment within the Cortex-R5 port asm code
laroche Apr 7, 2024
ebb2b5f
Merge branch 'main' into lr1
Skptak Apr 9, 2024
d05c677
Merge branch 'main' into lr1
aggarg Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions portable/GCC/ARM_CR5/portASM.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@

/* Save the floating point context, if any. */
FMRXNE R1, FPSCR
VPUSHNE {D0-D15}
PUSHNE {R1}
VPUSHNE {D0-D15}

/* Save ulPortTaskHasFPUContext itself. */
PUSH {R3}
Expand Down Expand Up @@ -110,8 +110,8 @@
CMP R1, #0

/* Restore the floating point context, if any. */
POPNE {R0}
VPOPNE {D0-D15}
POPNE {R0}
VMSRNE FPSCR, R0
#endif /* __ARM_FP */

Expand Down Expand Up @@ -147,8 +147,15 @@
FreeRTOS_SWI_Handler:
/* Save the context of the current task and select a new task to run. */
portSAVE_CONTEXT

/* Ensure bit 2 of the stack pointer is clear. */
MOV r2, sp
AND r2, r2, #4
SUB sp, sp, r2

LDR R0, vTaskSwitchContextConst
BLX R0

portRESTORE_CONTEXT


Expand Down Expand Up @@ -256,6 +263,11 @@ switch_before_exit:
POP {LR}
portSAVE_CONTEXT

/* Ensure bit 2 of the stack pointer is clear. */
MOV r2, sp
AND r2, r2, #4
SUB sp, sp, r2

/* Call the function that selects the new task to execute.
vTaskSwitchContext() if vTaskSwitchContext() uses LDRD or STRD
instructions, or 8 byte aligned stack allocated data. LR does not need
Expand Down
Loading