[llvm-readobj] Improve printouts for COFF ARM64 binaries

[mstorsjo]

Summary

[mstorsjo]

Whoops, included the wrong diff previously.

Updated with tests and another printout correction.

lib/Object/COFFObjectFile.cpp

base_reloc_iterator COFFObjectFile::base_reloc_begin() const {
   return base_reloc_iterator(BaseRelocRef(BaseRelocHeader, this));
 }
 
 base_reloc_iterator COFFObjectFile::base_reloc_end() const {
   return base_reloc_iterator(BaseRelocRef(BaseRelocEnd, this));
 }
 
 uint8_t COFFObjectFile::getBytesInAddress() const {
-  return getArch() == Triple::x86_64 ? 8 : 4;
+  return getArch() == Triple::x86_64 || getArch() == Triple::aarch64 ? 8 : 4;
 }
 
 StringRef COFFObjectFile::getFileFormatName() const {
   switch(getMachine()) {
   case COFF::IMAGE_FILE_MACHINE_I386:
     return "COFF-i386";
   case COFF::IMAGE_FILE_MACHINE_AMD64:
     return "COFF-x86-64";

test/tools/llvm-readobj/file-headers.test

 RUN: llvm-readobj -h %p/Inputs/trivial.obj.coff-arm \
 RUN:   | FileCheck %s -check-prefix COFF-ARM
+RUN: llvm-readobj -h %p/Inputs/trivial.obj.coff-arm64 \
+RUN:   | FileCheck %s -check-prefix COFF-ARM64
 RUN: llvm-readobj -h %p/Inputs/trivial.obj.coff-i386 \
 RUN:   | FileCheck %s -check-prefix COFF32
 RUN: llvm-readobj -h %p/Inputs/trivial.obj.coff-x86-64 \
 RUN:   | FileCheck %s -check-prefix COFF64
 RUN: llvm-readobj -h %p/Inputs/trivial.exe.coff-i386 \
 RUN:   | FileCheck %s -check-prefix PE32
 RUN: llvm-readobj -h %p/Inputs/trivial.obj.elf-i386 \
 RUN:   | FileCheck %s -check-prefix ELF32

 COFF-ARM-NEXT:   TimeDateStamp: 2014-03-13 02:48:34 (0x53211C82)
 COFF-ARM-NEXT:   PointerToSymbolTable: 0xFF
 COFF-ARM-NEXT:   SymbolCount: 6
 COFF-ARM-NEXT:   OptionalHeaderSize: 0
 COFF-ARM-NEXT:   Characteristics [ (0x0)
 COFF-ARM-NEXT:   ]
 COFF-ARM-NEXT: }
 
+COFF-ARM64:      File: {{(.*[/\\])?}}trivial.obj.coff-arm64
+COFF-ARM64-NEXT: Format: COFF-ARM64
+COFF-ARM64-NEXT: Arch: aarch64
+COFF-ARM64-NEXT: AddressSize: 64bit
+COFF-ARM64-NEXT: ImageFileHeader {
+COFF-ARM64-NEXT:   Machine: IMAGE_FILE_MACHINE_ARM64 (0xAA64)
+COFF-ARM64-NEXT:   SectionCount: 1
+COFF-ARM64-NEXT:   TimeDateStamp: 1970-01-01 00:00:00 (0x0)
+COFF-ARM64-NEXT:   PointerToSymbolTable: 0x44
+COFF-ARM64-NEXT:   SymbolCount: 3
+COFF-ARM64-NEXT:   OptionalHeaderSize: 0
+COFF-ARM64-NEXT:   Characteristics [ (0x0)
+COFF-ARM64-NEXT:   ]
+COFF-ARM64-NEXT: }
+
 COFF32:      File: {{(.*[/\\])?}}trivial.obj.coff-i386
 COFF32-NEXT: Format: COFF-i386
 COFF32-NEXT: Arch: i386
 COFF32-NEXT: AddressSize: 32bit
 COFF32-NEXT: ImageFileHeader {
 COFF32-NEXT:   Machine: IMAGE_FILE_MACHINE_I386 (0x14C)
 COFF32-NEXT:   SectionCount: 2
 COFF32-NEXT:   TimeDateStamp: 2013-03-20 17:56:46 (0x5149F85E)

tools/llvm-readobj/COFFDumper.cpp

void COFFDumper::printBinaryBlockWithRelocs(StringRef Label,
   }
 }
 
 static const EnumEntry<COFF::MachineTypes> ImageFileMachineType[] = {
   LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_UNKNOWN  ),
   LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_AM33     ),
   LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_AMD64    ),
   LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_ARM      ),
+  LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_ARM64    ),
   LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_ARMNT    ),
   LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_EBC      ),
   LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_I386     ),
   LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_IA64     ),
   LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_M32R     ),
   LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_MIPS16   ),
   LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_MIPSFPU  ),
   LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_MIPSFPU16),