[llvm-readobj] Include the PE magic value in printouts

[mstorsjo]

Summary

This is useful for a testcase in lld.

[ruiu]

tools/llvm-readobj/COFFDumper.cpp

681

I believe this is 0x8086 for x86, so you want to print it out in hex.

[mstorsjo]

tools/llvm-readobj/COFFDumper.cpp

681

No, it's not that (that's the COFF machine magic word); this is the PE type indicator, 0x10b for normal PE32 and 0x20b for PE32+ (for 64 bit object files). But you're right that it might make more sense to print it in hex.

[mstorsjo]

Printing the value as hex.

[ruiu]

Basically every change needs a test. Can you add?

[mstorsjo]

Added a check for this value in an existing test.

[ruiu]

Can you also add a check to llvm/test/tools/llvm-readobj/file-headers.test?

[mstorsjo]

Added a test for this in the only section of file-headers.test that included ImageOptionalHeader.

[ruiu]

LGTM

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

 PE32-NEXT:   SymbolCount: 0
 PE32-NEXT:   OptionalHeaderSize: 224
 PE32-NEXT:   Characteristics [ (0x102)
 PE32-NEXT:     IMAGE_FILE_32BIT_MACHINE (0x100)
 PE32-NEXT:     IMAGE_FILE_EXECUTABLE_IMAGE (0x2)
 PE32-NEXT:   ]
 PE32-NEXT: }
 PE32-NEXT: ImageOptionalHeader {
+PE32-NEXT:   Magic: 0x10B
 PE32-NEXT:   MajorLinkerVersion: 11
 PE32-NEXT:   MinorLinkerVersion: 0
 PE32-NEXT:   SizeOfCode: 512
 PE32-NEXT:   SizeOfInitializedData: 1024
 PE32-NEXT:   SizeOfUninitializedData: 0
 PE32-NEXT:   AddressOfEntryPoint: 0x1000
 PE32-NEXT:   BaseOfCode: 0x1000
 PE32-NEXT:   BaseOfData: 0x2000

test/tools/llvm-readobj/peplus.test

 CHECK:   SymbolCount: 0
 CHECK:   OptionalHeaderSize: 240
 CHECK:   Characteristics [ (0x22)
 CHECK:     IMAGE_FILE_EXECUTABLE_IMAGE (0x2)
 CHECK:     IMAGE_FILE_LARGE_ADDRESS_AWARE (0x20)
 CHECK:   ]
 CHECK: }
 CHECK: ImageOptionalHeader {
+CHECK:   Magic: 0x20B
 CHECK:   MajorLinkerVersion: 11
 CHECK:   MinorLinkerVersion: 0
 CHECK:   SizeOfCode: 512
 CHECK:   SizeOfInitializedData: 0
 CHECK:   SizeOfUninitializedData: 0
 CHECK:   AddressOfEntryPoint: 0x1000
 CHECK:   BaseOfCode: 0x1000
 CHECK:   ImageBase: 0x140000000

tools/llvm-readobj/COFFDumper.cpp

void COFFDumper::printDOSHeader(const dos_header *DH) {
   W.printNumber("OEMid", DH->OEMid);
   W.printNumber("OEMinfo", DH->OEMinfo);
   W.printNumber("AddressOfNewExeHeader", DH->AddressOfNewExeHeader);
 }
 
 template <class PEHeader>
 void COFFDumper::printPEHeader(const PEHeader *Hdr) {
   DictScope D(W, "ImageOptionalHeader");
+  W.printHex   ("Magic", Hdr->Magic);
   W.printNumber("MajorLinkerVersion", Hdr->MajorLinkerVersion);
   W.printNumber("MinorLinkerVersion", Hdr->MinorLinkerVersion);
   W.printNumber("SizeOfCode", Hdr->SizeOfCode);
   W.printNumber("SizeOfInitializedData", Hdr->SizeOfInitializedData);
   W.printNumber("SizeOfUninitializedData", Hdr->SizeOfUninitializedData);
   W.printHex   ("AddressOfEntryPoint", Hdr->AddressOfEntryPoint);
   W.printHex   ("BaseOfCode", Hdr->BaseOfCode);
   printBaseOfDataField(Hdr);