Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-10-12 08:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

arm/armv6-m: fix build break if enable syntax unified

Browse source 
armv6-m/arm_exception.S: Assembler messages:
armv6-m/arm_exception.S:171: Error: cannot honor width suffix -- `lsl r7,r7,#2'

Signed-off-by: chao an <anchao@xiaomi.com>
This commit is contained in:
chao an 2022-10-25 10:27:31 +08:00 • committed by Xiang Xiao
parent 42a0f444ee
commit 9804320cae
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/src/armv6-m/arm_exception.S
View file

@ -116,7 +116,7 @@ exception_common:
#ifdef CONFIG_BUILD_PROTECTED
mov r0, r14 /* Copy high register to low register */
lsl r0, #(31 - EXC_RETURN_PROCESS_BITNO) /* Move to bit 31 */
lsls r0, #(31 - EXC_RETURN_PROCESS_BITNO) /* Move to bit 31 */
bmi 1f /* Test bit 31 */
mrs r1, msp /* R1=The main stack pointer */
b 2f
@ -225,7 +225,7 @@ exception_common:
#ifdef CONFIG_BUILD_PROTECTED
mov r0, r14 /* Copy high register to low register */
lsl r0, #(31 - EXC_RETURN_PROCESS_BITNO) /* Move to bit 31 */
lsls r0, #(31 - EXC_RETURN_PROCESS_BITNO) /* Move to bit 31 */
bmi 3f /* Test bit 31 */
msr msp, r1 /* R1=The main stack pointer */
b 4f

2
arch/arm/src/rp2040/chip.h
View file

@ -70,7 +70,7 @@
.macro setintstack, tmp1, tmp2
ldr \tmp1, =RP2040_SIO_CPUID
ldr \tmp1, [\tmp1, #0]
lsl \tmp1, \tmp1, #2
lsls \tmp1, \tmp1, #2
ldr \tmp2, =g_cpu_intstack_top
add \tmp2, \tmp2, \tmp1
ldr \tmp2, [\tmp2, #0]