From 5d8674f2bdd536124b1dd026dfa729a1376b3cac Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Sat, 30 Nov 2024 12:36:15 -0700 Subject: Import edk2 edk2-stable202411 (hash 0f3867fa6ef0553e26c42f7d71ff6bdb98429742) Bring in the latest stable branch for updated defines (especailly Loongson). Remove ^M as described in sys/contrib/edk2/FREEBSD-upgrade. Not the absolute latest, but aligned to the edk2-stable202411 tag. Sponsored by: Netflix --- MdePkg/Library/BaseLib/Arm/SetJumpLongJump.asm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'MdePkg/Library/BaseLib/Arm/SetJumpLongJump.asm') diff --git a/MdePkg/Library/BaseLib/Arm/SetJumpLongJump.asm b/MdePkg/Library/BaseLib/Arm/SetJumpLongJump.asm index 0dc6917df960..124c9216d99c 100644 --- a/MdePkg/Library/BaseLib/Arm/SetJumpLongJump.asm +++ b/MdePkg/Library/BaseLib/Arm/SetJumpLongJump.asm @@ -19,7 +19,6 @@ ; value to be returned by SetJump(). ; ; If JumpBuffer is NULL, then ASSERT(). -; For IPF CPUs, if JumpBuffer is not aligned on a 16-byte boundary, then ASSERT(). ; ; @param JumpBuffer A pointer to CPU context buffer. ; @@ -34,7 +33,7 @@ SetJump MOV R3, R13 STM R0, {R3-R12,R14} - EOR R0, R0 + MOV R0, #0 BX LR ;/** @@ -42,7 +41,7 @@ SetJump ; ; Restores the CPU context from the buffer specified by JumpBuffer. ; This function never returns to the caller. -; Instead is resumes execution based on the state of JumpBuffer. +; Instead it resumes execution based on the state of JumpBuffer. ; ; @param JumpBuffer A pointer to CPU context buffer. ; @param Value The value to return when the SetJump() context is restored. @@ -58,6 +57,8 @@ SetJump InternalLongJump LDM R0, {R3-R12,R14} MOV R13, R3 + CMP R1, #0 + MOVEQ R1, #1 MOV R0, R1 BX LR -- cgit v1.3