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

Fix OcMachoLib compilation

Browse Source
This commit is contained in:
vit9696 2018-10-14 12:01:45 +03:00
parent 663697ce20
commit 36da7261a1
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/OcMachoLib/CxxSymbols.c
View File

@ -86,7 +86,7 @@ MachoSymbolIsSmcp64 (
ASSERT (Symbol != NULL);
ASSERT (StringTable != NULL);
Name = (StringTable + Symbol->StringIndex);
Name = (StringTable + Symbol->UnifiedName.StringIndex);
return (AsciiStrStr (Name, SUPER_METACLASS_POINTER_TOKEN) != NULL);
}
@ -108,7 +108,7 @@ MachoSymbolIsMetaclassPointer64 (
ASSERT (Symbol != NULL);
ASSERT (StringTable != NULL);
Name = (StringTable + Symbol->StringIndex);
Name = (StringTable + Symbol->UnifiedName.StringIndex);
return (AsciiStrStr (Name, METACLASS_TOKEN) != NULL);
}
@ -148,7 +148,7 @@ MachoGetClassNameFromSuperMetaClassPointer (
return FALSE;
}
SuperMetaClassName = (StringTable + SmcpSymbol->StringIndex);
SuperMetaClassName = (StringTable + SmcpSymbol->UnifiedName.StringIndex);
PrefixLength = (ARRAY_SIZE (OSOBJ_PREFIX) - 1);
StringLength = AsciiStrLen (SuperMetaClassName);
@ -274,7 +274,7 @@ MachoGetClassNameFromMetaClassPointer (
return FALSE;
}
MetaClassName = (StringTable + MetaClassPtrSymbol->StringIndex);
MetaClassName = (StringTable + MetaClassPtrSymbol->UnifiedName.StringIndex);
PrefixLength = (ARRAY_SIZE (OSOBJ_PREFIX) - 1);
StringLength = AsciiStrLen (MetaClassName);
@ -474,7 +474,7 @@ MachoSymbolIsVtable64 (
ASSERT (Symbol != NULL);
ASSERT (StringTable != NULL);
Name = (StringTable + Symbol->StringIndex);
Name = (StringTable + Symbol->UnifiedName.StringIndex);
//
// Implicitely checks for METACLASS_VTABLE_PREFIX.
//

6
Library/OcMachoLib/Header.c
View File

@ -140,7 +140,7 @@ MachoGetSegmentByName64 (
SegmentWalker = (MACH_SEGMENT_COMMAND_64 *)&MachHeader->Commands[0];
for (Index = 0; Index < MachHeader->NumberOfCommands; ++Index) {
if (SegmentWalker->Command.Type == MACH_LOAD_COMMAND_SEGMENT_64) {
if (SegmentWalker->Hdr.Type == MACH_LOAD_COMMAND_SEGMENT_64) {
Result = AsciiStrnCmp (
SegmentWalker->SegmentName,
SegmentName,
@ -278,7 +278,7 @@ MachoGetFirstSegment64 (
SegmentWalker = (MACH_SEGMENT_COMMAND_64 *)&MachHeader->Commands[0];
for (Index = 0; Index < MachHeader->NumberOfCommands; ++Index) {
if (SegmentWalker->Command.Type == MACH_LOAD_COMMAND_SEGMENT_64) {
if (SegmentWalker->Hdr.Type == MACH_LOAD_COMMAND_SEGMENT_64) {
return (MACH_SEGMENT_COMMAND_64 *)SegmentWalker;
}
@ -329,7 +329,7 @@ MachoGetNextSegment64 (
SegmentCommand = NEXT_MACH_SEGMENT_64 (SegmentCommand);
for (; Index < MachHeader->NumberOfCommands; ++Index) {
if (SegmentCommand->Command.Type == MACH_LOAD_COMMAND_SEGMENT_64) {
if (SegmentCommand->Hdr.Type == MACH_LOAD_COMMAND_SEGMENT_64) {
return (MACH_SEGMENT_COMMAND_64 *)SegmentCommand;
}

4
Library/OcMachoLib/Symbols.c
View File

@ -170,7 +170,7 @@ MachoGetSymbolByName (
for (Index = 0; Index < NumberOfSymbols; ++Index) {
Result = AsciiStrCmp (
Name,
(StringTable + SymbolTable[Index].StringIndex)
(StringTable + SymbolTable[Index].UnifiedName.StringIndex)
);
if (Result == 0) {
return &SymbolTable[Index];
@ -303,7 +303,7 @@ MachoGetCxxSymbolByRelocation64 (
);
for (Index = 0; Index < NumberOfSymbols; ++Index) {
Symbol = &SymbolTable[Index];
Name = (StringTable + Symbol->StringIndex);
Name = (StringTable + Symbol->UnifiedName.StringIndex);
if ((Symbol->Value == Value) && MachoIsSymbolNameCxx (Name)) {
return Symbol;