summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSid Manning <sidneym@codeaurora.org>2019-01-16 16:17:19 +0000
committerSid Manning <sidneym@codeaurora.org>2019-01-16 16:17:19 +0000
commit6640ca9634d97c07c5321c78e888cc6e197e64fe (patch)
treed7b31d512545c679df01340099c04d522baddc8c
parentc19f3d94438efaf519a6c41d3928b47d8ad56e6a (diff)
[llvm-readobj] Set correct offset when dumping hex section output.
Differential Revision: https://reviews.llvm.org/D56369
-rw-r--r--llvm/test/tools/llvm-readobj/hexdump.test5
-rw-r--r--llvm/tools/llvm-readobj/ObjDumper.cpp3
2 files changed, 7 insertions, 1 deletions
diff --git a/llvm/test/tools/llvm-readobj/hexdump.test b/llvm/test/tools/llvm-readobj/hexdump.test
new file mode 100644
index 00000000000..cadb7225596
--- /dev/null
+++ b/llvm/test/tools/llvm-readobj/hexdump.test
@@ -0,0 +1,5 @@
+// Check dumping of the hexadecimal bytes of a section.
+RUN: llvm-readobj -x .text %p/../../Object/Inputs/hello-world.elf-x86-64 | FileCheck %s
+
+CHECK: Hex dump of section '.text':
+CHECK-NEXT: {{^}}0x00400460
diff --git a/llvm/tools/llvm-readobj/ObjDumper.cpp b/llvm/tools/llvm-readobj/ObjDumper.cpp
index a725140c9d3..81c9a2b9c4e 100644
--- a/llvm/tools/llvm-readobj/ObjDumper.cpp
+++ b/llvm/tools/llvm-readobj/ObjDumper.cpp
@@ -117,7 +117,8 @@ void ObjDumper::printSectionAsHex(const object::ObjectFile *Obj,
uint8_t i;
uint8_t k;
- W.startLine() << format_hex(SecPtr - SecContent, 10);
+ W.startLine() << format_hex(Section.getAddress() + (SecPtr - SecContent),
+ 10);
W.startLine() << ' ';
for (i = 0; TmpSecPtr < SecEnd && i < 4; ++i) {
for (k = 0; TmpSecPtr < SecEnd && k < 4; k++, TmpSecPtr++) {