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

[llvm-objump] Simplify the code. NFCI. 

llvm-svn: 281844
This commit is contained in:
Davide Italiano 2016-09-18 04:39:15 +00:00
parent a416d11357
commit 1bdaa20b01
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
llvm/tools/llvm-objdump/llvm-objdump.cpp
View File

@ -1877,27 +1877,18 @@ static void printFaultMaps(const ObjectFile *Obj) {
outs() << FMP; outs() << FMP;
} }
static void printPrivateFileHeaders(const ObjectFile *o) { static void printPrivateFileHeaders(const ObjectFile *o, bool onlyFirst) {
if (o->isELF()) if (o->isELF())
printELFFileHeader(o); return printELFFileHeader(o);
else if (o->isCOFF()) if (o->isCOFF())
printCOFFFileHeader(o); return printCOFFFileHeader(o);
else if (o->isMachO()) { if (o->isMachO()) {
printMachOFileHeader(o); printMachOFileHeader(o);
printMachOLoadCommands(o); if (!onlyFirst)
} else printMachOLoadCommands(o);
report_fatal_error("Invalid/Unsupported object file format"); return;
} }
report_fatal_error("Invalid/Unsupported object file format");
static void printFirstPrivateFileHeader(const ObjectFile *o) {
if (o->isELF())
printELFFileHeader(o);
else if (o->isCOFF())
printCOFFFileHeader(o);
else if (o->isMachO())
printMachOFileHeader(o);
else
report_fatal_error("Invalid/Unsupported object file format");
} }
static void DumpObject(const ObjectFile *o, const Archive *a = nullptr) { static void DumpObject(const ObjectFile *o, const Archive *a = nullptr) {
@ -1924,10 +1915,8 @@ static void DumpObject(const ObjectFile *o, const Archive *a = nullptr) {
PrintSymbolTable(o, ArchiveName); PrintSymbolTable(o, ArchiveName);
if (UnwindInfo) if (UnwindInfo)
PrintUnwindInfo(o); PrintUnwindInfo(o);
if (PrivateHeaders) if (PrivateHeaders || FirstPrivateHeader)
printPrivateFileHeaders(o); printPrivateFileHeaders(o, FirstPrivateHeader);
if (FirstPrivateHeader)
printFirstPrivateFileHeader(o);
if (ExportsTrie) if (ExportsTrie)
printExportsTrie(o); printExportsTrie(o);
if (Rebase) if (Rebase)