tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-25 14:44:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

MdePkg/BaseLib: correct register sizes in AArch64 SetJump/LongJump

Browse Source 
Both in SetJump and in InternalLongJump, 32-bit w register views were
used for the UINTN return value. In SetJump, this did not cause errors;
it was only counterintuitive. But in InternalLongJump, it meant the top
32 bits of Value were stripped off.

Change all of these to use the 64-bit x register views.

Signed-off-by: Leif Lindholm <quic_llindhol@quicinc.com>
Reanimated-by: Andrei Warkentin <andrei.warkentin@intel.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
Reviewed-by: Andrei Warkentin <andrei.warkentin@intel.com>
This commit is contained in:
Leif Lindholm 2020-10-01 19:37:11 +01:00 committed by mergify[bot]
parent ae79efb7bd
commit 2b2705343a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.S
View File

@ -61,7 +61,7 @@ ASM_PFX(SetJump):
FPR_LAYOUT FPR_LAYOUT
#undef REG_PAIR #undef REG_PAIR
#undef REG_ONE #undef REG_ONE
mov w0, #0 mov x0, #0
ret ret
#/** #/**
@ -91,9 +91,9 @@ ASM_PFX(InternalLongJump):
#undef REG_PAIR #undef REG_PAIR
#undef REG_ONE #undef REG_ONE
mov sp, x16 mov sp, x16
cmp w1, #0 cmp x1, #0
mov w0, #1 mov x0, #1
csel w0, w1, w0, ne csel x0, x1, x0, ne
ret ret
ASM_FUNCTION_REMOVE_IF_UNREFERENCED ASM_FUNCTION_REMOVE_IF_UNREFERENCED

8
MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.asm
View File

@ -59,7 +59,7 @@ SetJump
FPR_LAYOUT FPR_LAYOUT
#undef REG_PAIR #undef REG_PAIR
#undef REG_ONE #undef REG_ONE
mov w0, #0 mov x0, #0
ret ret
;/** ;/**
@ -88,10 +88,10 @@ InternalLongJump
#undef REG_PAIR #undef REG_PAIR
#undef REG_ONE #undef REG_ONE
mov sp, x16 mov sp, x16
cmp w1, #0 cmp x1, #0
mov w0, #1 mov x0, #1
beq exit beq exit
mov w0, w1 mov x0, x1
exit exit
// use br not ret, as ret is guaranteed to mispredict // use br not ret, as ret is guaranteed to mispredict
br x30 br x30