[llvm] r200038 - Support/COFF: Fix PEHeader struct, and define PE32Header as its alias.

Rui Ueyama ruiu at google.com
Fri Jan 24 12:54:10 PST 2014


Author: ruiu
Date: Fri Jan 24 14:54:10 2014
New Revision: 200038

URL: http://llvm.org/viewvc/llvm-project?rev=200038&view=rev
Log:
Support/COFF: Fix PEHeader struct, and define PE32Header as its alias.

This change does not affect anything because everybody seems to be using
Object/COFF.h instead. But the definition is not for PE32 but for PE32+,
so fix it anyway.

Modified:
    llvm/trunk/include/llvm/Support/COFF.h

Modified: llvm/trunk/include/llvm/Support/COFF.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/COFF.h?rev=200038&r1=200037&r2=200038&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/COFF.h (original)
+++ llvm/trunk/include/llvm/Support/COFF.h Fri Jan 24 14:54:10 2014
@@ -450,7 +450,7 @@ namespace COFF {
     uint32_t AddressOfNewExeHeader;
   };
 
-  struct PEHeader {
+  struct PE32Header {
     enum {
       PE32 = 0x10b,
       PE32_PLUS = 0x20b
@@ -465,7 +465,7 @@ namespace COFF {
     uint32_t AddressOfEntryPoint; // RVA
     uint32_t BaseOfCode; // RVA
     uint32_t BaseOfData; // RVA
-    uint64_t ImageBase;
+    uint32_t ImageBase;
     uint32_t SectionAlignment;
     uint32_t FileAlignment;
     uint16_t MajorOperatingSystemVersion;
@@ -480,14 +480,16 @@ namespace COFF {
     uint32_t CheckSum;
     uint16_t Subsystem;
     uint16_t DLLCharacteristics;
-    uint64_t SizeOfStackReserve;
-    uint64_t SizeOfStackCommit;
-    uint64_t SizeOfHeapReserve;
-    uint64_t SizeOfHeapCommit;
+    uint32_t SizeOfStackReserve;
+    uint32_t SizeOfStackCommit;
+    uint32_t SizeOfHeapReserve;
+    uint32_t SizeOfHeapCommit;
     uint32_t LoaderFlags;
     uint32_t NumberOfRvaAndSize;
   };
 
+  typedef PE32Header PEHeader;
+
   struct DataDirectory {
     uint32_t RelativeVirtualAddress;
     uint32_t Size;





More information about the llvm-commits mailing list