michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch: arm: aarch32: Fix syscall inline asm

Browse source 
The inline asm code was not conveying in all cases that registers r1-r3
would get clobbered by the SVC handler code.  In the cases that we can't
list r1-r3 in the clobber list the registers need to show up as outputs
to know that they values are not preserved by the callee.

Fixes #30393

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2021-01-14 07:17:57 -06:00 • committed by Ioannis Glaropoulos
commit 1badf77961
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/arch/arm/aarch32/syscall.h
View file

@ -50,7 +50,7 @@ static inline uintptr_t arch_syscall_invoke6(uintptr_t arg1, uintptr_t arg2,
register uint32_t r6 __asm__("r6") = call_id; register uint32_t r6 __asm__("r6") = call_id;
__asm__ volatile("svc %[svid]\n" __asm__ volatile("svc %[svid]\n"
: "=r"(ret) : "=r"(ret), "=r"(r1), "=r"(r2), "=r"(r3)
: [svid] "i" (_SVC_CALL_SYSTEM_CALL), : [svid] "i" (_SVC_CALL_SYSTEM_CALL),
"r" (ret), "r" (r1), "r" (r2), "r" (r3), "r" (ret), "r" (r1), "r" (r2), "r" (r3),
"r" (r4), "r" (r5), "r" (r6) "r" (r4), "r" (r5), "r" (r6)
@ -72,7 +72,7 @@ static inline uintptr_t arch_syscall_invoke5(uintptr_t arg1, uintptr_t arg2,
register uint32_t r6 __asm__("r6") = call_id; register uint32_t r6 __asm__("r6") = call_id;
__asm__ volatile("svc %[svid]\n" __asm__ volatile("svc %[svid]\n"
: "=r"(ret) : "=r"(ret), "=r"(r1), "=r"(r2), "=r"(r3)
: [svid] "i" (_SVC_CALL_SYSTEM_CALL), : [svid] "i" (_SVC_CALL_SYSTEM_CALL),
"r" (ret), "r" (r1), "r" (r2), "r" (r3), "r" (ret), "r" (r1), "r" (r2), "r" (r3),
"r" (r4), "r" (r6) "r" (r4), "r" (r6)
@ -92,7 +92,7 @@ static inline uintptr_t arch_syscall_invoke4(uintptr_t arg1, uintptr_t arg2,
register uint32_t r6 __asm__("r6") = call_id; register uint32_t r6 __asm__("r6") = call_id;
__asm__ volatile("svc %[svid]\n" __asm__ volatile("svc %[svid]\n"
: "=r"(ret) : "=r"(ret), "=r"(r1), "=r"(r2), "=r"(r3)
: [svid] "i" (_SVC_CALL_SYSTEM_CALL), : [svid] "i" (_SVC_CALL_SYSTEM_CALL),
"r" (ret), "r" (r1), "r" (r2), "r" (r3), "r" (ret), "r" (r1), "r" (r2), "r" (r3),
"r" (r6) "r" (r6)
@ -111,7 +111,7 @@ static inline uintptr_t arch_syscall_invoke3(uintptr_t arg1, uintptr_t arg2,
register uint32_t r6 __asm__("r6") = call_id; register uint32_t r6 __asm__("r6") = call_id;
__asm__ volatile("svc %[svid]\n" __asm__ volatile("svc %[svid]\n"
: "=r"(ret) : "=r"(ret), "=r"(r1), "=r"(r2)
: [svid] "i" (_SVC_CALL_SYSTEM_CALL), : [svid] "i" (_SVC_CALL_SYSTEM_CALL),
"r" (ret), "r" (r1), "r" (r2), "r" (r6) "r" (ret), "r" (r1), "r" (r2), "r" (r6)
: "r8", "memory", "r3", "ip"); : "r8", "memory", "r3", "ip");
@ -127,7 +127,7 @@ static inline uintptr_t arch_syscall_invoke2(uintptr_t arg1, uintptr_t arg2,
register uint32_t r6 __asm__("r6") = call_id; register uint32_t r6 __asm__("r6") = call_id;
__asm__ volatile("svc %[svid]\n" __asm__ volatile("svc %[svid]\n"
: "=r"(ret) : "=r"(ret), "=r"(r1)
: [svid] "i" (_SVC_CALL_SYSTEM_CALL), : [svid] "i" (_SVC_CALL_SYSTEM_CALL),
"r" (ret), "r" (r1), "r" (r6) "r" (ret), "r" (r1), "r" (r6)
: "r8", "memory", "r2", "r3", "ip"); : "r8", "memory", "r2", "r3", "ip");