andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

consistency improvements 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@14848 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2021-09-29 12:54:09 +00:00
parent 4dd944b332
commit a2bdca5a24
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
os/common/ports/ARMv7-M-ALT/compilers/GCC/chcoreasm.S
View File

@ -82,7 +82,7 @@
.endm .endm
/* Load integer context through R0.*/ /* Load integer context through R0.*/
.macro PORT_RESTORE_INTEGER_CONTEXT .macro PORT_LOAD_INTEGER_CONTEXT
ldmia r0!, {r2-r11, lr} ldmia r0!, {r2-r11, lr}
msr PSP, r2 msr PSP, r2
msr BASEPRI, r3 msr BASEPRI, r3
@ -95,14 +95,14 @@
.endm .endm
/* Load float context through R0.*/ /* Load float context through R0.*/
.macro PORT_RESTORE_FLOAT_CONTEXT .macro PORT_LOAD_FLOAT_CONTEXT
vldmia r0!, {s16-s31} vldmia r0!, {s16-s31}
.endm .endm
#else #else
.macro PORT_STORE_FLOAT_CONTEXT .macro PORT_STORE_FLOAT_CONTEXT
.endm .endm
.macro PORT_RESTORE_FLOAT_CONTEXT .macro PORT_LOAD_FLOAT_CONTEXT
.endm .endm
#endif #endif
@ -210,8 +210,8 @@ SVC_Handler:
/* Context load for new thread.*/ /* Context load for new thread.*/
adds r0, #CONTEXT_OFFSET adds r0, #CONTEXT_OFFSET
PORT_RESTORE_INTEGER_CONTEXT PORT_LOAD_INTEGER_CONTEXT
PORT_RESTORE_FLOAT_CONTEXT PORT_LOAD_FLOAT_CONTEXT
PORT_LOAD_MPU_CONTEXT PORT_LOAD_MPU_CONTEXT
bx lr bx lr
@ -224,8 +224,6 @@ SVC_Handler:
PendSV_Handler: PendSV_Handler:
/* Pointer to the current instance, assuming single instance.*/ /* Pointer to the current instance, assuming single instance.*/
ldr r0, =ch0 ldr r0, =ch0
// movw r0, #:lower16:ch
// movt r0, #:upper16:ch
ldr r1, [r0, #CURRENT_OFFSET] ldr r1, [r0, #CURRENT_OFFSET]
/* Context store for old thread.*/ /* Context store for old thread.*/
@ -239,8 +237,8 @@ PendSV_Handler:
/* Context load for new thread.*/ /* Context load for new thread.*/
adds r0, #CONTEXT_OFFSET adds r0, #CONTEXT_OFFSET
PORT_RESTORE_INTEGER_CONTEXT PORT_LOAD_INTEGER_CONTEXT
PORT_RESTORE_FLOAT_CONTEXT PORT_LOAD_FLOAT_CONTEXT
PORT_LOAD_MPU_CONTEXT PORT_LOAD_MPU_CONTEXT
bx lr bx lr