From 429eae4eeb874925e4394bc6a0aaa8f089d71ac6 Mon Sep 17 00:00:00 2001 From: carlo-dev-git <79503870+carlo-dev-git@users.noreply.github.com> Date: Mon, 22 Mar 2021 16:47:26 +0100 Subject: [PATCH] Fix ASM style Fix ASM style --- portable/RVDS/ARM_CM4F/port.c | 14 +++++++------- portable/RVDS/ARM_CM7/r0p1/port.c | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/portable/RVDS/ARM_CM4F/port.c b/portable/RVDS/ARM_CM4F/port.c index 54351d9f7..d48c9e3dd 100644 --- a/portable/RVDS/ARM_CM4F/port.c +++ b/portable/RVDS/ARM_CM4F/port.c @@ -247,7 +247,7 @@ __asm void vPortSVCHandler( void ) ldr r1, [ r3 ] ldr r0, [ r1 ] /* Pop the core registers. */ - ldmia r0 !, { r4 - r11, r14 } + ldmia r0!, {r4-r11,r14} msr psp, r0 isb mov r0, #0 @@ -468,15 +468,15 @@ __asm void xPortPendSVHandler( void ) /* Is the task using the FPU context? If so, push high vfp registers. */ tst r14, #0x10 it eq - vstmdbeq r0 !, { s16 - s31 } + vstmdbeq r0!, {s16-s31} /* Save the core registers. */ - stmdb r0 !, { r4 - r11, r14 } + stmdb r0!, {r4-r11, r14} /* Save the new top of stack into the first member of the TCB. */ str r0, [ r2 ] - stmdb sp !, { r0, r3 } + stmdb sp!, {r0, r3} mov r0, #configMAX_SYSCALL_INTERRUPT_PRIORITY msr basepri, r0 dsb @@ -484,20 +484,20 @@ __asm void xPortPendSVHandler( void ) bl vTaskSwitchContext mov r0, #0 msr basepri, r0 - ldmia sp !, { r0, r3 } + ldmia sp!, {r0, r3} /* The first item in pxCurrentTCB is the task top of stack. */ ldr r1, [ r3 ] ldr r0, [ r1 ] /* Pop the core registers. */ - ldmia r0 !, { r4 - r11, r14 } + ldmia r0!, {r4-r11, r14} /* Is the task using the FPU context? If so, pop the high vfp registers * too. */ tst r14, #0x10 it eq - vldmiaeq r0 !, { s16 - s31 } + vldmiaeq r0!, {s16-s31} msr psp, r0 isb diff --git a/portable/RVDS/ARM_CM7/r0p1/port.c b/portable/RVDS/ARM_CM7/r0p1/port.c index 3dc95edcf..daadd678c 100644 --- a/portable/RVDS/ARM_CM7/r0p1/port.c +++ b/portable/RVDS/ARM_CM7/r0p1/port.c @@ -241,7 +241,7 @@ __asm void vPortSVCHandler( void ) ldr r1, [ r3 ] ldr r0, [ r1 ] /* Pop the core registers. */ - ldmia r0 !, { r4 - r11, r14 } + ldmia r0!, { r4-r11, r14 } msr psp, r0 isb mov r0, #0 @@ -452,15 +452,15 @@ __asm void xPortPendSVHandler( void ) /* Is the task using the FPU context? If so, push high vfp registers. */ tst r14, #0x10 it eq - vstmdbeq r0 !, { s16 - s31 } + vstmdbeq r0!, {s16-s31} /* Save the core registers. */ - stmdb r0 !, { r4 - r11, r14 } + stmdb r0!, {r4-r11, r14 } /* Save the new top of stack into the first member of the TCB. */ str r0, [ r2 ] - stmdb sp !, { r0, r3 } + stmdb sp!, { r0, r3 } mov r0, #configMAX_SYSCALL_INTERRUPT_PRIORITY cpsid i msr basepri, r0 @@ -470,20 +470,20 @@ __asm void xPortPendSVHandler( void ) bl vTaskSwitchContext mov r0, #0 msr basepri, r0 - ldmia sp !, { r0, r3 } + ldmia sp!, { r0, r3 } /* The first item in pxCurrentTCB is the task top of stack. */ ldr r1, [ r3 ] ldr r0, [ r1 ] /* Pop the core registers. */ - ldmia r0 !, { r4 - r11, r14 } + ldmia r0!, { r4-r11, r14 } /* Is the task using the FPU context? If so, pop the high vfp registers * too. */ tst r14, #0x10 it eq - vldmiaeq r0 !, { s16 - s31 } + vldmiaeq r0!, { s16-s31 } msr psp, r0 isb