nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

llvm-objdump output hex to match binutils' objdump

Browse Source 
Patch by Ted Woodward

llvm-svn: 204409
This commit is contained in:
Greg Fitzgerald
2014-03-20 22:55:15 +00:00
parent 7c41451bc9
commit 1843227551
4 changed files with 51 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -382,6 +382,9 @@ static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) {
}
}
StringRef Fmt = Obj->getBytesInAddress() > 4 ? "\t\t%016" PRIx64 ": " :
"\t\t\t%08" PRIx64 ": ";
// Create a mapping, RelocSecs = SectionRelocMap[S], where sections
// in RelocSecs contain the relocations for section S.
error_code EC;
@@ -536,7 +539,7 @@ static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) {
if (error(rel_cur->getTypeName(name))) goto skip_print_rel;
if (error(rel_cur->getValueString(val))) goto skip_print_rel;
outs() << format("\t\t\t%8" PRIx64 ": ", SectionAddr + addr) << name
outs() << format(Fmt.data(), SectionAddr + addr) << name
<< "\t" << val << "\n";
skip_print_rel:
@@ -548,6 +551,8 @@ static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) {
}
static void PrintRelocations(const ObjectFile *Obj) {
StringRef Fmt = Obj->getBytesInAddress() > 4 ? "%016" PRIx64 :
"%08" PRIx64;
for (const SectionRef &Section : Obj->sections()) {
if (Section.relocation_begin() == Section.relocation_end())
continue;
@@ -570,7 +575,8 @@ static void PrintRelocations(const ObjectFile *Obj) {
continue;
if (error(Reloc.getValueString(valuestr)))
continue;
outs() << address << " " << relocname << " " << valuestr << "\n";
outs() << format(Fmt.data(), address) << " " << relocname << " "
<< valuestr << "\n";
}
outs() << "\n";
}