[llvm-objdump] Fix --file-headers (-f) option

[mstojanovic]

Summary

Changed the format call to match the surrounding code. Previously it was printing an unsigned int while the return type being printed was long unsigned int or wider. This caused problems for big-endian systems which were discovered on mips64.
Also, the printed address had less characters than it should because the character count was directly obtained from the number of bytes in the address. The tests were adapted to fit this fix and now use longer addresses.

[jhenderson]

LGTM, with one nit.

tools/llvm-objdump/llvm-objdump.cpp

2225 ↗

(On Diff #170089)

Nit: address -> Address, or just do this inline, I don't mind which.

[mstojanovic]

Renamed address -> Address.

[jhenderson]

LGTM. Sorry, forgot to do this last time!

llvm/trunk/test/tools/llvm-objdump/file-headers-coff.test

 # RUN: yaml2obj %s > %t
 # RUN: llvm-objdump -f %t | FileCheck %s
 # RUN: llvm-objdump -file-headers %t | FileCheck %s
 
 !COFF
 header: !Header
   Machine: IMAGE_FILE_MACHINE_I386 # (0x14c)
   Characteristics: [ IMAGE_FILE_DEBUG_STRIPPED ]
 sections:
 symbols:
 
 # CHECK: architecture: i386
-# CHECK: start address: 0x0000
+# CHECK: start address: 0x00000000

llvm/trunk/test/tools/llvm-objdump/file-headers-elf.test

 # RUN: yaml2obj %s > %t
 # RUN: llvm-objdump -f %t | FileCheck %s
 # RUN: llvm-objdump -file-headers %t | FileCheck %s
 
 !ELF
 FileHeader:
   Class:           ELFCLASS64
   Data:            ELFDATA2LSB
   Type:            ET_REL
   Machine:         EM_X86_64
-  Entry:           0x123456
+  Entry:           0x123456789abcde
 
 # CHECK: architecture: x86_64
-# CHECK: start address: 0x00123456
+# CHECK: start address: 0x00123456789abcde

llvm/trunk/test/tools/llvm-objdump/file-headers-pe.test

 # RUN: yaml2obj %s > %t
 # RUN: llvm-objdump -f %t | FileCheck %s
 # RUN: llvm-objdump -file-headers %t | FileCheck %s
 
 !COFF
 header: !Header
   Machine: IMAGE_FILE_MACHINE_I386
   Characteristics: [ IMAGE_FILE_DEBUG_STRIPPED ]
 OptionalHeader:
-  AddressOfEntryPoint: 0x1234
+  AddressOfEntryPoint: 0x123456
 # Unfortunately, all these flags are mandatory to set AddressOfEntryPoint.
 # All the values are randomly picked. They can't interfere in what
 # we are testing here.
   SizeOfHeapCommit: 1024
   SizeOfHeapReserve: 1024
   SizeOfStackCommit: 1024
   SizeOfStackReserve: 1024
   DLLCharacteristics: [ IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE ]
   Subsystem: IMAGE_SUBSYSTEM_NATIVE
   MinorSubsystemVersion: 1
   MajorSubsystemVersion: 1
   MinorImageVersion: 1
   MajorImageVersion: 1
   MinorOperatingSystemVersion: 1
   MajorOperatingSystemVersion: 1
   FileAlignment: 8
   SectionAlignment: 8
   ImageBase: 0x12
 sections:
 symbols:
 
 # CHECK: architecture: i386
-# CHECK: start address: 0x1234
+# CHECK: start address: 0x00123456

llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp

static void printFileHeaders(const ObjectFile *o) {
   if (!o->isELF() && !o->isCOFF())
     report_error(o->getFileName(), "Invalid/Unsupported object file format");
 
   Triple::ArchType AT = o->getArch();
   outs() << "architecture: " << Triple::getArchTypeName(AT) << "\n";
   Expected<uint64_t> StartAddrOrErr = o->getStartAddress();
   if (!StartAddrOrErr)
     report_error(o->getFileName(), StartAddrOrErr.takeError());
+
+  StringRef Fmt = o->getBytesInAddress() > 4 ? "%016" PRIx64 : "%08" PRIx64;
+  uint64_t Address = StartAddrOrErr.get();
   outs() << "start address: "
-         << format("0x%0*x", o->getBytesInAddress(), StartAddrOrErr.get())
+         << "0x" << format(Fmt.data(), Address)
          << "\n";
 }
 
 static void printArchiveChild(StringRef Filename, const Archive::Child &C) {
   Expected<sys::fs::perms> ModeOrErr = C.getAccessMode();
   if (!ModeOrErr) {
     errs() << "ill-formed archive entry.\n";
     consumeError(ModeOrErr.takeError());