Skip to content

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

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

Merged
xiaoxiang781216 merged 1 commit into from
Oct 25, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions arch/arm/src/armv6-m/arm_exception.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/src/rp2040/chip.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down