summaryrefslogtreecommitdiff
path: root/tools/llvm-readobj/MachODumper.cpp
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2013-04-11 16:31:37 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2013-04-11 16:31:37 +0000
commit4edf092787cab37d46da96eb1e9df0677ca30b1d (patch)
treee93afc34f00e5934acf623c7cbc4511db77d828f /tools/llvm-readobj/MachODumper.cpp
parentc37cb66e6ee256bcb3ba138383e4cb9aab55ddb9 (diff)
Print more information about relocations.
With this patch llvm-readobj now prints if a relocation is pcrel, its length, if it is extern and if it is scattered. It also refactors the code a bit to use bit fields instead of shifts and masks all over the place. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@179294 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-readobj/MachODumper.cpp')
-rw-r--r--tools/llvm-readobj/MachODumper.cpp16
1 files changed, 12 insertions, 4 deletions
diff --git a/tools/llvm-readobj/MachODumper.cpp b/tools/llvm-readobj/MachODumper.cpp
index 2073ddf4639..b027d40beac 100644
--- a/tools/llvm-readobj/MachODumper.cpp
+++ b/tools/llvm-readobj/MachODumper.cpp
@@ -330,20 +330,28 @@ void MachODumper::printRelocation(section_iterator SecI,
relocation_iterator RelI) {
uint64_t Offset;
SmallString<32> RelocName;
- int64_t Info;
StringRef SymbolName;
SymbolRef Symbol;
if (error(RelI->getOffset(Offset))) return;
if (error(RelI->getTypeName(RelocName))) return;
- if (error(RelI->getAdditionalInfo(Info))) return;
if (error(RelI->getSymbol(Symbol))) return;
if (error(Symbol.getName(SymbolName))) return;
+ DataRefImpl DR = RelI->getRawDataRefImpl();
+ const MachOObjectFileBase::RelocationEntry *RE = Obj->getRelocation(DR);
+ bool IsScattered = Obj->isScattered(RE);
+
raw_ostream& OS = W.startLine();
OS << W.hex(Offset)
- << " " << RelocName
+ << " " << Obj->isPCRel(RE)
+ << " " << Obj->getLength(RE);
+ if (IsScattered)
+ OS << " n/a";
+ else
+ OS << " " << RE->External;
+ OS << " " << RelocName
+ << " " << IsScattered
<< " " << (SymbolName.size() > 0 ? SymbolName : "-")
- << " " << W.hex(Info)
<< "\n";
}