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

[Martin Storsjö via Phabricator via llvm-commits]

mstorsjo updated this revision to Diff 104740.
mstorsjo added a comment.

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


https://reviews.llvm.org/D34836

Files:
  test/tools/llvm-readobj/file-headers.test
  test/tools/llvm-readobj/peplus.test
  tools/llvm-readobj/COFFDumper.cpp


Index: tools/llvm-readobj/COFFDumper.cpp
===================================================================
--- tools/llvm-readobj/COFFDumper.cpp
+++ tools/llvm-readobj/COFFDumper.cpp
@@ -678,6 +678,7 @@
 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);
Index: test/tools/llvm-readobj/peplus.test
===================================================================
--- test/tools/llvm-readobj/peplus.test
+++ test/tools/llvm-readobj/peplus.test
@@ -16,6 +16,7 @@
 CHECK:   ]
 CHECK: }
 CHECK: ImageOptionalHeader {
+CHECK:   Magic: 0x20B
 CHECK:   MajorLinkerVersion: 11
 CHECK:   MinorLinkerVersion: 0
 CHECK:   SizeOfCode: 512
Index: test/tools/llvm-readobj/file-headers.test
===================================================================
--- test/tools/llvm-readobj/file-headers.test
+++ test/tools/llvm-readobj/file-headers.test
@@ -238,6 +238,7 @@
 PE32-NEXT:   ]
 PE32-NEXT: }
 PE32-NEXT: ImageOptionalHeader {
+PE32-NEXT:   Magic: 0x10B
 PE32-NEXT:   MajorLinkerVersion: 11
 PE32-NEXT:   MinorLinkerVersion: 0
 PE32-NEXT:   SizeOfCode: 512


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D34836.104740.patch
Type: text/x-patch
Size: 1345 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170629/29cdd664/attachment.bin>