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

MdePkg/BasePeCoffLib2: Fix ARM Thumb apply relocation routine

Browse Source 
Thumb instructions are either 16-bit or 32-bit, and are aligned on
a two-byte boundary

Signed-off-by: Savva Mitrofanov <savvamtr@gmail.com>
This commit is contained in:
Mikhail Krichanov 2023-03-17 12:13:27 +03:00 committed by Marvin Häuser
parent a07a2ce546
commit 60e0471175
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MdePkg/Library/BasePeCoffLib2/PeCoffRelocate.c
View File

@ -195,7 +195,7 @@ ThumbMovwMovtImmediatePatch (
STATIC STATIC
VOID VOID
ThumbMovwMovtImmediateFixup ( ThumbMovwMovtImmediateFixup (
IN OUT VOID *Fixup, IN OUT VOID *Instructions,
IN UINT64 Adjust IN UINT64 Adjust
) )
{ {
@ -203,8 +203,8 @@ ThumbMovwMovtImmediateFixup (
// //
// Relocate the instruction pair. // Relocate the instruction pair.
// //
Fixup32 = ThumbMovwMovtImmediateAddress (Fixup) + (UINT32) Adjust; Fixup32 = ThumbMovwMovtImmediateAddress (Instructions) + (UINT32) Adjust;
ThumbMovwMovtImmediatePatch (Fixup, Fixup32); ThumbMovwMovtImmediatePatch (Instructions, Fixup32);
} }
/** /**
@ -379,9 +379,9 @@ InternalApplyRelocation (
} }
// //
// Verify the Base Relocation target is sufficiently aligned. // Verify the Base Relocation target is sufficiently aligned.
// The ARM THunb instruction pait must start on a 32-bit boundary. // The ARM Thumb instruction pair must start on a 16-bit boundary.
// //
if (!IS_ALIGNED (RelocTargetRva, ALIGNOF (UINT32))) { if (!IS_ALIGNED (RelocTargetRva, ALIGNOF (UINT16))) {
DEBUG_RAISE (); DEBUG_RAISE ();
return RETURN_VOLUME_CORRUPTED; return RETURN_VOLUME_CORRUPTED;
} }