archive-gh-me/OpenCorePkg
1
0
Fork 0
mirror of https://github.com/acidanthera/OpenCorePkg.git synced 2025-12-08 19:25:01 +00:00
Code Issues Projects Releases Wiki Activity

OcAppleKernelLib: Treat scattered relocs as normal ones, as done in KXLD. Check relocation skipability earlier.

Browse Source
This commit is contained in:
Download-Fritz 2019-03-22 11:50:32 +01:00 committed by vit9696
parent 5d434aded5
commit dbf90dbd2a
1 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Library/OcAppleKernelLib/Link.c
View File

@ -464,13 +464,6 @@ InternalCalculateTargetsIntel64 (
//
TargetAddress = LoadAddress;
//
// Assertion: Scattered Relocations are only supported by i386.
//
if (((UINT32)Relocation->Address & MACH_RELOC_SCATTERED) != 0) {
DEBUG ((DEBUG_WARN, "Prelink: Scattered symbols are not supported.\n"));
}
if (Relocation->Extern != 0) {
Symbol = MachoGetSymbolByIndex64 (
MachoContext,
@ -633,26 +626,11 @@ InternalRelocateRelocationIntel64 (
ASSERT (RelocationBase != 0);
ASSERT (Relocation != NULL);
//
// Scattered Relocations are only supported by i386.
//
if (((UINT32)Relocation->Address & MACH_RELOC_SCATTERED) != 0) {
DEBUG ((DEBUG_WARN, "Prelink: Scattered symbols are not supported.\n"));
}
IsPair = FALSE;
Adjustment = 0;
IsNormalLocal = FALSE;
if ((Relocation->Extern == 0)
&& (Relocation->SymbolNumber == MACH_RELOC_ABSOLUTE)) {
//
// A section-based relocation entry can be skipped for absolute
// symbols.
//
return 0;
}
Address = Relocation->Address;
Length = Relocation->Size;
Type = (UINT8)Relocation->Type;
@ -901,6 +879,19 @@ InternalRelocateAndCopyRelocations64 (
PreservedRelocations = 0;
for (Index = 0; Index < *NumRelocations; ++Index) {
//
// Assertion: Not i386. Scattered Relocations are only supported by i386.
// && ((UINT32)Relocation->Address & MACH_RELOC_SCATTERED) == 0
//
if ((SourceRelocations[Index].Extern == 0)
&& (SourceRelocations[Index].SymbolNumber == MACH_RELOC_ABSOLUTE)) {
//
// A section-based relocation entry can be skipped for absolute
// symbols.
//
continue;
}
NextRelocation = &SourceRelocations[Index + 1];
//
// The last Relocation does not have a successor.
@ -928,13 +919,6 @@ InternalRelocateAndCopyRelocations64 (
if ((Result & ~(UINTN)BIT31) != 0) {
Relocation = &TargetRelocations[PreservedRelocations];
//
// Assertion: Scattered Relocations are only supported by i386.
//
if (((UINT32)Relocation->Address & MACH_RELOC_SCATTERED) != 0) {
DEBUG ((DEBUG_WARN, "Prelink: Scattered symbols are not supported.\n"));
}
CopyMem (Relocation, &SourceRelocations[Index], sizeof (*Relocation));
if (Relocation->Extern != 0) {