[PATCH] D103901: [NFC][XCOFF] Replace structs FileHeader32/SectionHeader32 with constants.

[EsmeYi via Phabricator via llvm-commits]

This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rGec43c1213a16: [NFC][XCOFF] Replace structs FileHeader32/SectionHeader32 with constants. (authored by Esme).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D103901/new/

https://reviews.llvm.org/D103901

Files:
  llvm/include/llvm/BinaryFormat/XCOFF.h
  llvm/lib/MC/XCOFFObjectWriter.cpp
  llvm/lib/ObjectYAML/XCOFFEmitter.cpp


Index: llvm/lib/ObjectYAML/XCOFFEmitter.cpp
===================================================================
--- llvm/lib/ObjectYAML/XCOFFEmitter.cpp
+++ llvm/lib/ObjectYAML/XCOFFEmitter.cpp
@@ -158,8 +158,8 @@
 
 bool XCOFFWriter::assignAddressesAndIndices() {
   uint64_t CurrentOffset =
-      sizeof(XCOFF::FileHeader32) /* TODO: + auxiliaryHeaderSize() */ +
-      InitSections.size() * sizeof(XCOFF::SectionHeader32);
+      XCOFF::FileHeaderSize32 /* TODO: + auxiliaryHeaderSize() */ +
+      InitSections.size() * XCOFF::SectionHeaderSize32;
 
   // Calculate section header info.
   if (!initSectionHeader(CurrentOffset))
Index: llvm/lib/MC/XCOFFObjectWriter.cpp
===================================================================
--- llvm/lib/MC/XCOFFObjectWriter.cpp
+++ llvm/lib/MC/XCOFFObjectWriter.cpp
@@ -922,8 +922,8 @@
   SymbolTableEntryCount = SymbolTableIndex;
 
   // Calculate the RawPointer value for each section.
-  uint64_t RawPointer = sizeof(XCOFF::FileHeader32) + auxiliaryHeaderSize() +
-                        SectionCount * sizeof(XCOFF::SectionHeader32);
+  uint64_t RawPointer = XCOFF::FileHeaderSize32 + auxiliaryHeaderSize() +
+                        SectionCount * XCOFF::SectionHeaderSize32;
   for (auto *Sec : Sections) {
     if (Sec->Index == Section::UninitializedIndex || Sec->IsVirtual)
       continue;
Index: llvm/include/llvm/BinaryFormat/XCOFF.h
===================================================================
--- llvm/include/llvm/BinaryFormat/XCOFF.h
+++ llvm/include/llvm/BinaryFormat/XCOFF.h
@@ -26,6 +26,8 @@
 
 constexpr size_t FileNamePadSize = 6;
 constexpr size_t NameSize = 8;
+constexpr size_t FileHeaderSize32 = 20;
+constexpr size_t SectionHeaderSize32 = 40;
 constexpr size_t SymbolTableEntrySize = 18;
 constexpr size_t RelocationSerializationSize32 = 10;
 constexpr uint16_t RelocOverflow = 65535;
@@ -255,29 +257,6 @@
                 ///< large code model TOC-relative relocation.
 };
 
-struct FileHeader32 {
-  uint16_t Magic;
-  uint16_t NumberOfSections;
-  int32_t TimeStamp;
-  uint32_t SymbolTableFileOffset;
-  int32_t NumberOfSymbolTableEntries;
-  uint16_t AuxiliaryHeaderSize;
-  uint16_t Flags;
-};
-
-struct SectionHeader32 {
-  char Name[XCOFF::NameSize];
-  uint32_t PhysicalAddress;
-  uint32_t VirtualAddress;
-  uint32_t Size;
-  uint32_t FileOffsetToData;
-  uint32_t FileOffsetToRelocations;
-  uint32_t FileOffsetToLineNumbers;
-  uint16_t NumberOfRelocations;
-  uint16_t NumberOfLineNumbers;
-  int32_t Flags;
-};
-
 enum CFileStringType : uint8_t {
   XFT_FN = 0,  ///< Specifies the source-file name.
   XFT_CT = 1,  ///< Specifies the compiler time stamp.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D103901.351126.patch
Type: text/x-patch
Size: 2658 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210610/2a9ffeda/attachment.bin>