maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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

llvm-svn: 224534
This commit is contained in:
Kevin Enderby 2014-12-18 19:24:35 +00:00
parent 2b0d014834
commit b4b7931748
6 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -1107,6 +1107,12 @@ namespace llvm {
sys::swapByteOrder(d.dylib.compatibility_version);
}
inline void swapStruct(sub_framework_command &s) {
sys::swapByteOrder(s.cmd);
sys::swapByteOrder(s.cmdsize);
sys::swapByteOrder(s.umbrella);
};
inline void swapStruct(dylinker_command &d) {
sys::swapByteOrder(d.cmd);
sys::swapByteOrder(d.cmdsize);

4
llvm/lib/Object/MachOObjectFile.cpp
View File

@ -2309,6 +2309,10 @@ MachOObjectFile::getEncryptionInfoCommand64(const LoadCommandInfo &L) const {
return getStruct<MachO::encryption_info_command_64>(this, L.Ptr);
}
MachO::sub_framework_command
MachOObjectFile::getSubFrameworkCommand(const LoadCommandInfo &L) const {
return getStruct<MachO::sub_framework_command>(this, L.Ptr);
}
MachO::any_relocation_info
MachOObjectFile::getRelocation(DataRefImpl Rel) const {

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

Binary file not shown.

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

@ -5,6 +5,8 @@
// RUN: | FileCheck %s -check-prefix=LOAD
// RUN: llvm-objdump -p %p/Inputs/linkerOption.macho-x86_64 \
// RUN: | FileCheck %s -check-prefix=LD_OPT
// RUN: llvm-objdump -p %p/Inputs/dylibSubFramework.macho-x86_64 \
// RUN: | FileCheck %s -check-prefix=SUB_FRAME
CHECK: Mach header
CHECK: magic cputype cpusubtype caps filetype ncmds sizeofcmds flags
@ -379,3 +381,8 @@ LD_OPT: cmdsize 40
LD_OPT: count 2
LD_OPT: string #1 -framework
LD_OPT: string #2 Foundation
SUB_FRAME: Load command 10
SUB_FRAME: cmd LC_SUB_FRAMEWORK
SUB_FRAME: cmdsize 16
SUB_FRAME: umbrella Bar (offset 12)

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

@ -3674,6 +3674,22 @@ static void PrintLinkerOptionCommand(MachO::linker_option_command lo,
<< "\n";
}
static void PrintSubFrameworkCommand(MachO::sub_framework_command sub,
const char *Ptr) {
outs() << " cmd LC_SUB_FRAMEWORK\n";
outs() << " cmdsize " << sub.cmdsize;
if (sub.cmdsize < sizeof(struct MachO::sub_framework_command))
outs() << " Incorrect size\n";
else
outs() << "\n";
if (sub.umbrella < sub.cmdsize) {
const char *P = Ptr + sub.umbrella;
outs() << " umbrella " << P << " (offset " << sub.umbrella << ")\n";
} else {
outs() << " umbrella ?(bad offset " << sub.umbrella << ")\n";
}
}
static void PrintDylibCommand(MachO::dylib_command dl, const char *Ptr) {
if (dl.cmd == MachO::LC_ID_DYLIB)
outs() << " cmd LC_ID_DYLIB\n";
@ -3830,6 +3846,9 @@ static void PrintLoadCommands(const MachOObjectFile *Obj, uint32_t ncmds,
} else if (Command.C.cmd == MachO::LC_LINKER_OPTION) {
MachO::linker_option_command Lo = Obj->getLinkerOptionLoadCommand(Command);
PrintLinkerOptionCommand(Lo, Command.Ptr);
} else if (Command.C.cmd == MachO::LC_SUB_FRAMEWORK) {
MachO::sub_framework_command Sf = Obj->getSubFrameworkCommand(Command);
PrintSubFrameworkCommand(Sf, Command.Ptr);
} else if (Command.C.cmd == MachO::LC_LOAD_DYLIB ||
Command.C.cmd == MachO::LC_ID_DYLIB ||
Command.C.cmd == MachO::LC_LOAD_WEAK_DYLIB ||