6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-09-25 17:20:48 +00:00
Code Issues Projects Releases Wiki Activity

Add printing the LC_SUB_UMBRELLA load command with llvm-objdump’s -private-headers.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224548 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Kevin Enderby
2014-12-18 23:13:26 +00:00
parent 4be95036e7
commit 604a34e086
6 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/Object/MachO.h
View File

@@ -370,6 +370,8 @@ public:
getEncryptionInfoCommand64(const LoadCommandInfo &L) const; getEncryptionInfoCommand64(const LoadCommandInfo &L) const;
MachO::sub_framework_command MachO::sub_framework_command
getSubFrameworkCommand(const LoadCommandInfo &L) const; getSubFrameworkCommand(const LoadCommandInfo &L) const;
MachO::sub_umbrella_command
getSubUmbrellaCommand(const LoadCommandInfo &L) const;
MachO::any_relocation_info getRelocation(DataRefImpl Rel) const; MachO::any_relocation_info getRelocation(DataRefImpl Rel) const;
MachO::data_in_code_entry getDice(DataRefImpl Rel) const; MachO::data_in_code_entry getDice(DataRefImpl Rel) const;

6
include/llvm/Support/MachO.h
View File

@@ -1113,6 +1113,12 @@ namespace llvm {
sys::swapByteOrder(s.umbrella); sys::swapByteOrder(s.umbrella);
} }
inline void swapStruct(sub_umbrella_command &s) {
sys::swapByteOrder(s.cmd);
sys::swapByteOrder(s.cmdsize);
sys::swapByteOrder(s.sub_umbrella);
};
inline void swapStruct(dylinker_command &d) { inline void swapStruct(dylinker_command &d) {
sys::swapByteOrder(d.cmd); sys::swapByteOrder(d.cmd);
sys::swapByteOrder(d.cmdsize); sys::swapByteOrder(d.cmdsize);

5
lib/Object/MachOObjectFile.cpp
View File

@@ -2314,6 +2314,11 @@ MachOObjectFile::getSubFrameworkCommand(const LoadCommandInfo &L) const {
return getStruct<MachO::sub_framework_command>(this, L.Ptr); return getStruct<MachO::sub_framework_command>(this, L.Ptr);
} }
MachO::sub_umbrella_command
MachOObjectFile::getSubUmbrellaCommand(const LoadCommandInfo &L) const {
return getStruct<MachO::sub_umbrella_command>(this, L.Ptr);
}
MachO::any_relocation_info MachO::any_relocation_info
MachOObjectFile::getRelocation(DataRefImpl Rel) const { MachOObjectFile::getRelocation(DataRefImpl Rel) const {
DataRefImpl Sec; DataRefImpl Sec;

BIN
test/tools/llvm-objdump/X86/Inputs/dylibSubUmbrella.macho-x86_64 Executable file
View File

Binary file not shown.

7
test/tools/llvm-objdump/X86/macho-private-headers.test
View File

@@ -7,6 +7,8 @@
// RUN: | FileCheck %s -check-prefix=LD_OPT // RUN: | FileCheck %s -check-prefix=LD_OPT
// RUN: llvm-objdump -p %p/Inputs/dylibSubFramework.macho-x86_64 \ // RUN: llvm-objdump -p %p/Inputs/dylibSubFramework.macho-x86_64 \
// RUN: | FileCheck %s -check-prefix=SUB_FRAME // RUN: | FileCheck %s -check-prefix=SUB_FRAME
// RUN: llvm-objdump -p %p/Inputs/dylibSubUmbrella.macho-x86_64 \
// RUN: | FileCheck %s -check-prefix=SUB_UMB
CHECK: Mach header CHECK: Mach header
CHECK: magic cputype cpusubtype caps filetype ncmds sizeofcmds flags CHECK: magic cputype cpusubtype caps filetype ncmds sizeofcmds flags
@@ -386,3 +388,8 @@ SUB_FRAME: Load command 10
SUB_FRAME: cmd LC_SUB_FRAMEWORK SUB_FRAME: cmd LC_SUB_FRAMEWORK
SUB_FRAME: cmdsize 16 SUB_FRAME: cmdsize 16
SUB_FRAME: umbrella Bar (offset 12) SUB_FRAME: umbrella Bar (offset 12)
SUB_UMB: Load command 5
SUB_UMB: cmd LC_SUB_UMBRELLA
SUB_UMB: cmdsize 16
SUB_UMB: sub_umbrella Foo (offset 12)

19
tools/llvm-objdump/MachODump.cpp
View File

@@ -3690,6 +3690,22 @@ static void PrintSubFrameworkCommand(MachO::sub_framework_command sub,
} }
} }
static void PrintSubUmbrellaCommand(MachO::sub_umbrella_command sub,
const char *Ptr) {
outs() << " cmd LC_SUB_UMBRELLA\n";
outs() << " cmdsize " << sub.cmdsize;
if (sub.cmdsize < sizeof(struct MachO::sub_umbrella_command))
outs() << " Incorrect size\n";
else
outs() << "\n";
if (sub.sub_umbrella < sub.cmdsize) {
const char *P = Ptr + sub.sub_umbrella;
outs() << " sub_umbrella " << P << " (offset " << sub.sub_umbrella << ")\n";
} else {
outs() << " sub_umbrella ?(bad offset " << sub.sub_umbrella << ")\n";
}
}
static void PrintDylibCommand(MachO::dylib_command dl, const char *Ptr) { static void PrintDylibCommand(MachO::dylib_command dl, const char *Ptr) {
if (dl.cmd == MachO::LC_ID_DYLIB) if (dl.cmd == MachO::LC_ID_DYLIB)
outs() << " cmd LC_ID_DYLIB\n"; outs() << " cmd LC_ID_DYLIB\n";
@@ -3849,6 +3865,9 @@ static void PrintLoadCommands(const MachOObjectFile *Obj, uint32_t ncmds,
} else if (Command.C.cmd == MachO::LC_SUB_FRAMEWORK) { } else if (Command.C.cmd == MachO::LC_SUB_FRAMEWORK) {
MachO::sub_framework_command Sf = Obj->getSubFrameworkCommand(Command); MachO::sub_framework_command Sf = Obj->getSubFrameworkCommand(Command);
PrintSubFrameworkCommand(Sf, Command.Ptr); PrintSubFrameworkCommand(Sf, Command.Ptr);
} else if (Command.C.cmd == MachO::LC_SUB_UMBRELLA) {
MachO::sub_umbrella_command Sf = Obj->getSubUmbrellaCommand(Command);
PrintSubUmbrellaCommand(Sf, Command.Ptr);
} else if (Command.C.cmd == MachO::LC_LOAD_DYLIB || } else if (Command.C.cmd == MachO::LC_LOAD_DYLIB ||
Command.C.cmd == MachO::LC_ID_DYLIB || Command.C.cmd == MachO::LC_ID_DYLIB ||
Command.C.cmd == MachO::LC_LOAD_WEAK_DYLIB || Command.C.cmd == MachO::LC_LOAD_WEAK_DYLIB ||