From 80bbea192aa44ab664ba8be29ac06c83f246e99c Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Thu, 1 Oct 2020 19:37:09 +0100 Subject: MdePkg/BaseLib: add ASSERT in ARM* SetJump implementations The SetJump comment header states that: If JumpBuffer is NULL, then ASSERT(). However, this was not currently done. Add a call to InternalAssertJumpBuffer. Signed-off-by: Leif Lindholm Cc: Ard Biesheuvel Cc: Sami Mujawar Reviewed-by: Sami Mujawar --- MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.S | 8 ++++++++ MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.asm | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.S b/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.S index 78db9b3d1e..de79ad3a0a 100644 --- a/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.S +++ b/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.S @@ -46,6 +46,14 @@ GCC_ASM_EXPORT(InternalLongJump) # ASM_PFX(SetJump): AARCH64_BTI(c) +#ifndef MDEPKG_NDEBUG + stp x29, x30, [sp, #-32]! + mov x29, sp + str x0, [sp, #16] + bl InternalAssertJumpBuffer + ldr x0, [sp, #16] + ldp x29, x30, [sp], #32 +#endif mov x16, sp // use IP0 so save SP #define REG_PAIR(REG1, REG2, OFFS) stp REG1, REG2, [x0, OFFS] #define REG_ONE(REG1, OFFS) str REG1, [x0, OFFS] diff --git a/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.asm b/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.asm index d8b267addc..c2774eece3 100644 --- a/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.asm +++ b/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.asm @@ -44,6 +44,14 @@ ; ); ; SetJump +#ifndef MDEPKG_NDEBUG + stp x29, x30, [sp, #-32]! + mov x29, sp + str x0, [sp, #16] + bl InternalAssertJumpBuffer + ldr x0, [sp, #16] + ldp x29, x30, [sp], #32 +#endif mov x16, sp // use IP0 so save SP #define REG_PAIR(REG1, REG2, OFFS) stp REG1, REG2, [x0, OFFS] #define REG_ONE(REG1, OFFS) str REG1, [x0, OFFS] -- cgit