Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-09-24 00:12:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

arm: smh: Allow semihosting trap calls to be inlined

Browse source 
Currently our semihosting trap function is somewhat fragile: we rely
on the current compiler behaviour to assign the second inline assembly
argument to the next free register (r1/x1), which happens to be the
"addr" argument to the smh_trap() function (per the calling convention).
I guess this is also the reason for the noinline attribute.

Make it explicit what we want: the "addr" argument needs to go into r1,
so we add another register variable. This allows to drop the "noinline"
attribute, so now the compiler beautifully inlines just the trap
instruction directly into the calling function.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
This commit is contained in:
Andre Przywara 2022-10-05 17:38:49 +01:00 committed by Tom Rini
parent d660a82934
commit 2e32930087
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/arm/lib/semihosting.c
View file

@ -39,9 +39,10 @@
/* /*
* Call the handler * Call the handler
*/ */
static noinline long smh_trap(unsigned int sysnum, void *addr) static long smh_trap(unsigned int sysnum, void *addr)
{ {
register long result asm("r0"); register long result asm("r0");
register void *_addr asm("r1") = addr;
/* /*
* We need a memory clobber (aka compiler barrier) for two reasons: * We need a memory clobber (aka compiler barrier) for two reasons:
@ -53,7 +54,7 @@ static noinline long smh_trap(unsigned int sysnum, void *addr)
*/ */
asm volatile (SMH_TRAP asm volatile (SMH_TRAP
: "=r" (result) : "=r" (result)
: "0"(sysnum), "r"(USE_PTR(addr)) : "0"(sysnum), "r"(USE_PTR(_addr))
: "memory"); : "memory");
return result; return result;