Include section start address when dumping hexadecimal output of a section, -x option.q

[sidneym]

Summary

llvm-readobj discards the starting address of a section, starting at zero instead:
Hex dump of section '.text':
0x00000000 31ed4989 d15e4889 e24883e4 f0505449 1.I..^H..H...PTI

To match gnu it should start at the section address (0x00400460), like this:
Hex dump of section '.text':
0x00400460 31ed4989 d15e4889 e24883e4 f0505449 1.I..^H..H...PTI

[sidneym]

Include full context

[jhenderson]

LGTM, with a couple of minor nits in the test. I assume Section.getAddress() returns 0 for sections in an ET_REL file?

I wonder if there could be some use-case for the old behaviour, i.e. to know the offset of data within a section?

test/tools/llvm-readobj/hexdump.test

1

Nit: full stop.

5

Start this with {{^}}, to avoid it matching anything else on the line by accident.

6

Nit: unnecessary trailing blank line.

[sidneym]

Yes, Section.getAddress() returns zero for object files.

[sidneym]

I made an error in the commit message, referring to: https://reviews.llvm.org/D56369 instead of this URL: https://reviews.llvm.org/D56726

test/tools/llvm-readobj/hexdump.test

+// 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
+

tools/llvm-readobj/ObjDumper.cpp

void ObjDumper::printSectionAsHex(const object::ObjectFile *Obj,
   const uint8_t *SecContent = SectionContent.bytes_begin();
   const uint8_t *SecEnd = SecContent + SectionContent.size();
 
   for (const uint8_t *SecPtr = SecContent; SecPtr < SecEnd; SecPtr += 16) {
     const uint8_t *TmpSecPtr = SecPtr;
     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++) {
         uint8_t Val = *(reinterpret_cast<const uint8_t *>(TmpSecPtr));
         W.startLine() << format_hex_no_prefix(Val, 2);
       }
       W.startLine() << ' ';
     }