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

OcMachoLib: Adapt to the new Mach-O header.

Browse Source
This commit is contained in:
Download-Fritz 2018-10-20 01:04:33 +02:00
parent 22c2cb9b44
commit e54de715d4
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Library/OcMachoLib/Header.c
View File

@ -65,7 +65,7 @@ MachoInitializeContext (
// Verify MACH-O Header sanity.
//
TopOfCommands = ((UINTN)MachHeader->Commands + MachHeader->CommandsSize);
MinCommandsSize = (MachHeader->NumberOfCommands * sizeof (*MachHeader->Commands));
MinCommandsSize = (MachHeader->NumCommands * sizeof (*MachHeader->Commands));
if ((FileSize < sizeof (*MachHeader))
|| (MachHeader->Signature != MACH_HEADER_64_SIGNATURE)
|| (MachHeader->CommandsSize < MinCommandsSize)
@ -77,7 +77,7 @@ MachoInitializeContext (
for (
Index = 0, Command = MachHeader->Commands;
Index < MachHeader->NumberOfCommands;
Index < MachHeader->NumCommands;
++Index, Command = NEXT_MACH_LOAD_COMMAND (Command)
) {
if (((UINTN)Command >= ((UINTN)MachHeader + MachHeader->CommandsSize))
@ -283,7 +283,7 @@ MachoGetSectionByName64 (
SectionWalker = &Segment->Sections[0];
for (Index = 0; Index < Segment->NumberOfSections; ++Index) {
for (Index = 0; Index < Segment->NumSections; ++Index) {
Result = AsciiStrnCmp (
SectionWalker->SectionName,
SectionName,
@ -395,10 +395,10 @@ MachoGetNextSection64 (
if (Section != NULL) {
++Section;
if ((UINTN)(Section - Segment->Sections) < Segment->NumberOfSections) {
if ((UINTN)(Section - Segment->Sections) < Segment->NumSections) {
return (MACH_SECTION_64 *)Section;
}
} else if (Segment->NumberOfSections > 0) {
} else if (Segment->NumSections > 0) {
return (MACH_SECTION_64 *)&Segment->Sections[0];
}
@ -432,11 +432,11 @@ MachoGetSectionByIndex64 (
Segment != NULL;
Segment = MachoGetNextSegment64 (Context, Segment)
) {
if (Index <= (SectionIndex + (Segment->NumberOfSections - 1))) {
if (Index <= (SectionIndex + (Segment->NumSections - 1))) {
return &Segment->Sections[Index - SectionIndex];
}
SectionIndex += Segment->NumberOfSections;
SectionIndex += Segment->NumSections;
}
return NULL;
@ -472,7 +472,7 @@ MachoGetSectionByAddress64 (
&& (Address < (Segment->VirtualAddress + Segment->Size))) {
Section = &Segment->Sections[0];
for (Index = 0; Index < Segment->NumberOfSections; ++Index) {
for (Index = 0; Index < Segment->NumSections; ++Index) {
if ((Address >= Section->Address)
&& (Address < Section->Address + Section->Size)) {
return Section;

8
Library/OcMachoLib/Symbols.c
View File

@ -123,7 +123,7 @@ MachoSymbolIsLocalDefined (
// its storage location for Undefined or Indirect.
//
UndefinedSymbols = &SymbolTable[DySymtab->UndefinedSymbolsIndex];
UndefinedSymbolsTop = &UndefinedSymbols[DySymtab->NumberOfUndefinedSymbols];
UndefinedSymbolsTop = &UndefinedSymbols[DySymtab->NumUndefinedSymbols];
if (((UINTN)Symbol >= (UINTN)UndefinedSymbols)
&& ((UINTN)Symbol < (UINTN)UndefinedSymbolsTop)) {
@ -134,7 +134,7 @@ MachoSymbolIsLocalDefined (
(UINTN)((CONST OC_MACHO_CONTEXT *)Context)->MachHeader
+ DySymtab->IndirectSymbolsOffset
);
IndirectSymbolsTop = &IndirectSymbols[DySymtab->NumberOfIndirectSymbols];
IndirectSymbolsTop = &IndirectSymbols[DySymtab->NumIndirectSymbols];
if (((UINTN)Symbol >= (UINTN)IndirectSymbols)
&& ((UINTN)Symbol < (UINTN)IndirectSymbolsTop)) {
@ -210,14 +210,14 @@ MachoGetLocalDefinedSymbolByName (
Symbol = MachoGetSymbolByName (
&SymbolTable[DySymtab->LocalSymbolsIndex],
StringTable,
DySymtab->NumberOfLocalSymbols,
DySymtab->NumLocalSymbols,
Name
);
if (Symbol == NULL) {
Symbol = MachoGetSymbolByName (
&SymbolTable[DySymtab->ExternalSymbolsIndex],
StringTable,
DySymtab->NumberOfExternalSymbols,
DySymtab->NumExternalSymbols,
Name
);
}