[llvm] b5abaea - [yaml2obj][XOFF] Update yaml2obj for XCOFF to create valid XCOFF files in more cases. (#77620)
via llvm-commits
llvm-commits at lists.llvm.org
Fri Feb 9 06:20:26 PST 2024
Author: stephenpeckham
Date: 2024-02-09T08:20:21-06:00
New Revision: b5abaea3c0de605c8145035b21a5ee492883ebd7
URL: https://github.com/llvm/llvm-project/commit/b5abaea3c0de605c8145035b21a5ee492883ebd7
DIFF: https://github.com/llvm/llvm-project/commit/b5abaea3c0de605c8145035b21a5ee492883ebd7.diff
LOG: [yaml2obj][XOFF] Update yaml2obj for XCOFF to create valid XCOFF files in more cases. (#77620)
yaml2obj creates invalid object files even when the input was created by
obj2yaml using a valid object file. On the other hand, yaml2obj is used
to intentionally create invalid object files for testing purposes.
This update balances using specified input values when provided and
computing file offsets and sizes if necessary.
Added:
llvm/test/tools/yaml2obj/XCOFF/offset-check.yaml
Modified:
llvm/lib/ObjectYAML/XCOFFEmitter.cpp
llvm/test/tools/llvm-objcopy/XCOFF/invalid-read.test
llvm/test/tools/llvm-objdump/XCOFF/disassemble-traceback-table.test
llvm/test/tools/llvm-objdump/XCOFF/section-headers.test
llvm/test/tools/llvm-readobj/XCOFF/file-header.test
llvm/test/tools/llvm-readobj/XCOFF/sections.test
llvm/test/tools/obj2yaml/XCOFF/aix.yaml
llvm/test/tools/obj2yaml/XCOFF/invalid-section.yaml
llvm/test/tools/yaml2obj/XCOFF/aux-hdr-defaults.yaml
llvm/test/tools/yaml2obj/XCOFF/basic-doc.yaml
Removed:
################################################################################
diff --git a/llvm/lib/ObjectYAML/XCOFFEmitter.cpp b/llvm/lib/ObjectYAML/XCOFFEmitter.cpp
index 5b244ffccd105..f68c571da9fa0 100644
--- a/llvm/lib/ObjectYAML/XCOFFEmitter.cpp
+++ b/llvm/lib/ObjectYAML/XCOFFEmitter.cpp
@@ -41,17 +41,19 @@ class XCOFFWriter {
bool writeXCOFF();
private:
+ void reportOverwrite(uint64_t currentOffset, uint64_t specifiedOffset,
+ const Twine &fieldName);
bool nameShouldBeInStringTable(StringRef SymbolName);
bool initFileHeader(uint64_t CurrentOffset);
void initAuxFileHeader();
- bool initSectionHeader(uint64_t &CurrentOffset);
+ bool initSectionHeaders(uint64_t &CurrentOffset);
bool initRelocations(uint64_t &CurrentOffset);
bool initStringTable();
bool assignAddressesAndIndices();
void writeFileHeader();
void writeAuxFileHeader();
- void writeSectionHeader();
+ void writeSectionHeaders();
bool writeSectionData();
bool writeRelocations();
bool writeSymbols();
@@ -91,6 +93,14 @@ static void writeName(StringRef StrName, support::endian::Writer W) {
W.write(NameRef);
}
+void XCOFFWriter::reportOverwrite(uint64_t CurrentOffset,
+ uint64_t specifiedOffset,
+ const Twine &fieldName) {
+ ErrHandler("current file offset (" + Twine(CurrentOffset) +
+ ") is bigger than the specified " + fieldName + " (" +
+ Twine(specifiedOffset) + ") ");
+}
+
bool XCOFFWriter::nameShouldBeInStringTable(StringRef SymbolName) {
// For XCOFF64: The symbol name is always in the string table.
return (SymbolName.size() > XCOFF::NameSize) || Is64Bit;
@@ -99,14 +109,31 @@ bool XCOFFWriter::nameShouldBeInStringTable(StringRef SymbolName) {
bool XCOFFWriter::initRelocations(uint64_t &CurrentOffset) {
for (XCOFFYAML::Section &InitSection : InitSections) {
if (!InitSection.Relocations.empty()) {
- InitSection.NumberOfRelocations = InitSection.Relocations.size();
- InitSection.FileOffsetToRelocations = CurrentOffset;
uint64_t RelSize = Is64Bit ? XCOFF::RelocationSerializationSize64
: XCOFF::RelocationSerializationSize32;
- CurrentOffset += InitSection.NumberOfRelocations * RelSize;
+ uint64_t UsedSize = RelSize * InitSection.Relocations.size();
+
+ // If NumberOfRelocations was specified, we use it, even if it's
+ // not consistent with the number of provided relocations.
+ if (!InitSection.NumberOfRelocations)
+ InitSection.NumberOfRelocations = InitSection.Relocations.size();
+
+ // If the YAML file specified an offset to relocations, we use it.
+ if (InitSection.FileOffsetToRelocations) {
+ if (CurrentOffset > InitSection.FileOffsetToRelocations) {
+ reportOverwrite(CurrentOffset, InitSection.FileOffsetToRelocations,
+ "FileOffsetToRelocations for the " +
+ InitSection.SectionName + " section");
+ return false;
+ }
+ CurrentOffset = InitSection.FileOffsetToRelocations;
+ } else
+ InitSection.FileOffsetToRelocations = CurrentOffset;
+ CurrentOffset += UsedSize;
if (CurrentOffset > MaxRawDataSize) {
- ErrHandler("maximum object size of" + Twine(MaxRawDataSize) +
- "exceeded when writing relocation data");
+ ErrHandler("maximum object size (" + Twine(MaxRawDataSize) +
+ ") exceeded when writing relocation data for section " +
+ Twine(InitSection.SectionName));
return false;
}
}
@@ -114,15 +141,10 @@ bool XCOFFWriter::initRelocations(uint64_t &CurrentOffset) {
return true;
}
-bool XCOFFWriter::initSectionHeader(uint64_t &CurrentOffset) {
- uint64_t CurrentSecAddr = 0;
+bool XCOFFWriter::initSectionHeaders(uint64_t &CurrentOffset) {
+ uint64_t CurrentEndDataAddr = 0;
+ uint64_t CurrentEndTDataAddr = 0;
for (uint16_t I = 0, E = InitSections.size(); I < E; ++I) {
- if (CurrentOffset > MaxRawDataSize) {
- ErrHandler("maximum object size of" + Twine(MaxRawDataSize) +
- "exceeded when writing section data");
- return false;
- }
-
// Assign indices for sections.
if (InitSections[I].SectionName.size() &&
!SectionIndexMap[InitSections[I].SectionName]) {
@@ -135,23 +157,58 @@ bool XCOFFWriter::initSectionHeader(uint64_t &CurrentOffset) {
}
}
- // Calculate the physical/virtual address. This field should contain 0 for
- // all sections except the text, data and bss sections.
- if (InitSections[I].Flags != XCOFF::STYP_TEXT &&
- InitSections[I].Flags != XCOFF::STYP_DATA &&
- InitSections[I].Flags != XCOFF::STYP_BSS)
- InitSections[I].Address = 0;
- else
- InitSections[I].Address = CurrentSecAddr;
+ if (!InitSections[I].Size)
+ InitSections[I].Size = InitSections[I].SectionData.binary_size();
+
+ // Section data addresses (physical/virtual) are related to symbol
+ // addresses and alignments. Furthermore, it is possible to specify the
+ // same starting addresses for the .text, .data, and .tdata sections.
+ // Without examining all the symbols and their addreses and alignments,
+ // it is not possible to compute valid section addresses. The only
+ // condition required by XCOFF is that the .bss section immediately
+ // follows the .data section, and the .tbss section immediately follows
+ // the .tdata section. Therefore, we only assign addresses to the .bss
+ // and .tbss sections if they do not already have non-zero addresses.
+ // (If the YAML file is being used to generate a valid object file, we
+ // expect all section addresses to be specified explicitly.)
+ switch (InitSections[I].Flags) {
+ case XCOFF::STYP_DATA:
+ CurrentEndDataAddr = InitSections[I].Address + InitSections[I].Size;
+ break;
+ case XCOFF::STYP_BSS:
+ if (!InitSections[I].Address)
+ InitSections[I].Address = CurrentEndDataAddr;
+ break;
+ case XCOFF::STYP_TDATA:
+ CurrentEndTDataAddr = InitSections[I].Address + InitSections[I].Size;
+ break;
+ case XCOFF::STYP_TBSS:
+ if (!InitSections[I].Address)
+ InitSections[I].Address = CurrentEndTDataAddr;
+ break;
+ }
- // Calculate the FileOffsetToData and data size for sections.
if (InitSections[I].SectionData.binary_size()) {
- InitSections[I].FileOffsetToData = CurrentOffset;
+ if (InitSections[I].FileOffsetToData) {
+ // Use the providedFileOffsetToData.
+ if (CurrentOffset > InitSections[I].FileOffsetToData) {
+ reportOverwrite(CurrentOffset, InitSections[I].FileOffsetToData,
+ "FileOffsetToData for the " +
+ InitSections[I].SectionName + " section");
+ return false;
+ }
+ CurrentOffset = InitSections[I].FileOffsetToData;
+ } else {
+ CurrentOffset = alignTo(CurrentOffset, DefaultSectionAlign);
+ InitSections[I].FileOffsetToData = CurrentOffset;
+ }
CurrentOffset += InitSections[I].SectionData.binary_size();
- // Ensure the offset is aligned to DefaultSectionAlign.
- CurrentOffset = alignTo(CurrentOffset, DefaultSectionAlign);
- InitSections[I].Size = CurrentOffset - InitSections[I].FileOffsetToData;
- CurrentSecAddr += InitSections[I].Size;
+ if (CurrentOffset > MaxRawDataSize) {
+ ErrHandler("maximum object size (" + Twine(MaxRawDataSize) +
+ ") exceeded when writing data for section " + Twine(I + 1) +
+ " (" + Twine(InitSections[I].SectionName) + ")");
+ return false;
+ }
}
}
return initRelocations(CurrentOffset);
@@ -255,12 +312,20 @@ bool XCOFFWriter::initFileHeader(uint64_t CurrentOffset) {
// Calculate SymbolTableOffset for the file header.
if (InitFileHdr.NumberOfSymTableEntries) {
+ if (Obj.Header.SymbolTableOffset) {
+ if (CurrentOffset > Obj.Header.SymbolTableOffset) {
+ reportOverwrite(CurrentOffset, Obj.Header.SymbolTableOffset,
+ "SymbolTableOffset");
+ return false;
+ }
+ CurrentOffset = Obj.Header.SymbolTableOffset;
+ }
InitFileHdr.SymbolTableOffset = CurrentOffset;
CurrentOffset +=
InitFileHdr.NumberOfSymTableEntries * XCOFF::SymbolTableEntrySize;
if (CurrentOffset > MaxRawDataSize) {
- ErrHandler("maximum object size of" + Twine(MaxRawDataSize) +
- "exceeded when writing symbols");
+ ErrHandler("maximum object size of " + Twine(MaxRawDataSize) +
+ " exceeded when writing symbols");
return false;
}
}
@@ -269,7 +334,8 @@ bool XCOFFWriter::initFileHeader(uint64_t CurrentOffset) {
}
void XCOFFWriter::initAuxFileHeader() {
- InitAuxFileHdr = *Obj.AuxHeader;
+ if (Obj.AuxHeader)
+ InitAuxFileHdr = *Obj.AuxHeader;
// In general, an object file might contain multiple sections of a given type,
// but in a loadable module, there must be exactly one .text, .data, .bss, and
// .loader section. A loadable object might also have one .tdata section and
@@ -323,28 +389,32 @@ void XCOFFWriter::initAuxFileHeader() {
bool XCOFFWriter::assignAddressesAndIndices() {
uint64_t FileHdrSize =
Is64Bit ? XCOFF::FileHeaderSize64 : XCOFF::FileHeaderSize32;
+
+ // If AuxHeaderSize is specified in the YAML file, we construct
+ // an auxiliary header.
uint64_t AuxFileHdrSize = 0;
- if (Obj.AuxHeader)
- AuxFileHdrSize = Obj.Header.AuxHeaderSize
- ? Obj.Header.AuxHeaderSize
- : (Is64Bit ? XCOFF::AuxFileHeaderSize64
- : XCOFF::AuxFileHeaderSize32);
+
+ if (Obj.Header.AuxHeaderSize)
+ AuxFileHdrSize = Obj.Header.AuxHeaderSize;
+ else if (Obj.AuxHeader)
+ AuxFileHdrSize =
+ (Is64Bit ? XCOFF::AuxFileHeaderSize64 : XCOFF::AuxFileHeaderSize32);
uint64_t SecHdrSize =
Is64Bit ? XCOFF::SectionHeaderSize64 : XCOFF::SectionHeaderSize32;
uint64_t CurrentOffset =
FileHdrSize + AuxFileHdrSize + InitSections.size() * SecHdrSize;
// Calculate section header info.
- if (!initSectionHeader(CurrentOffset))
+ if (!initSectionHeaders(CurrentOffset))
return false;
- InitFileHdr.AuxHeaderSize = AuxFileHdrSize;
// Calculate file header info.
if (!initFileHeader(CurrentOffset))
return false;
+ InitFileHdr.AuxHeaderSize = AuxFileHdrSize;
// Initialize the auxiliary file header.
- if (Obj.AuxHeader)
+ if (AuxFileHdrSize)
initAuxFileHeader();
// Initialize the string table.
@@ -357,18 +427,14 @@ void XCOFFWriter::writeFileHeader() {
: InitFileHdr.NumberOfSections);
W.write<int32_t>(Obj.Header.TimeStamp);
if (Is64Bit) {
- W.write<uint64_t>(Obj.Header.SymbolTableOffset
- ? Obj.Header.SymbolTableOffset
- : InitFileHdr.SymbolTableOffset);
+ W.write<uint64_t>(InitFileHdr.SymbolTableOffset);
W.write<uint16_t>(InitFileHdr.AuxHeaderSize);
W.write<uint16_t>(Obj.Header.Flags);
W.write<int32_t>(Obj.Header.NumberOfSymTableEntries
? Obj.Header.NumberOfSymTableEntries
: InitFileHdr.NumberOfSymTableEntries);
} else {
- W.write<uint32_t>(Obj.Header.SymbolTableOffset
- ? Obj.Header.SymbolTableOffset
- : InitFileHdr.SymbolTableOffset);
+ W.write<uint32_t>(InitFileHdr.SymbolTableOffset);
W.write<int32_t>(Obj.Header.NumberOfSymTableEntries
? Obj.Header.NumberOfSymTableEntries
: InitFileHdr.NumberOfSymTableEntries);
@@ -392,6 +458,9 @@ void XCOFFWriter::writeAuxFileHeader() {
W.write<uint32_t>(InitAuxFileHdr.EntryPointAddr.value_or(yaml::Hex64(0)));
W.write<uint32_t>(InitAuxFileHdr.TextStartAddr.value_or(yaml::Hex64(0)));
W.write<uint32_t>(InitAuxFileHdr.DataStartAddr.value_or(yaml::Hex64(0)));
+ // A short 32-bit auxiliary header ends here.
+ if (InitFileHdr.AuxHeaderSize == XCOFF::AuxFileHeaderSizeShort)
+ return;
W.write<uint32_t>(InitAuxFileHdr.TOCAnchorAddr.value_or(yaml::Hex64(0)));
}
W.write<uint16_t>(InitAuxFileHdr.SecNumOfEntryPoint.value_or(0));
@@ -434,50 +503,39 @@ void XCOFFWriter::writeAuxFileHeader() {
InitAuxFileHdr.Flag.value_or(yaml::Hex16(XCOFF::SHR_SYMTAB)));
if (InitFileHdr.AuxHeaderSize > XCOFF::AuxFileHeaderSize64)
W.OS.write_zeros(InitFileHdr.AuxHeaderSize - XCOFF::AuxFileHeaderSize64);
- } else if (InitFileHdr.AuxHeaderSize > XCOFF::AuxFileHeaderSize32) {
- W.OS.write_zeros(InitFileHdr.AuxHeaderSize - XCOFF::AuxFileHeaderSize32);
+ } else {
+ if (InitFileHdr.AuxHeaderSize > XCOFF::AuxFileHeaderSize32)
+ W.OS.write_zeros(InitFileHdr.AuxHeaderSize - XCOFF::AuxFileHeaderSize32);
}
}
-void XCOFFWriter::writeSectionHeader() {
+void XCOFFWriter::writeSectionHeaders() {
for (uint16_t I = 0, E = Obj.Sections.size(); I < E; ++I) {
- XCOFFYAML::Section YamlSec = Obj.Sections[I];
XCOFFYAML::Section DerivedSec = InitSections[I];
- writeName(YamlSec.SectionName, W);
- // Virtual address is the same as physical address.
- uint64_t SectionAddress =
- YamlSec.Address ? YamlSec.Address : DerivedSec.Address;
+ writeName(DerivedSec.SectionName, W);
if (Is64Bit) {
- W.write<uint64_t>(SectionAddress); // Physical address
- W.write<uint64_t>(SectionAddress); // Virtual address
- W.write<uint64_t>(YamlSec.Size ? YamlSec.Size : DerivedSec.Size);
- W.write<uint64_t>(YamlSec.FileOffsetToData ? YamlSec.FileOffsetToData
- : DerivedSec.FileOffsetToData);
- W.write<uint64_t>(YamlSec.FileOffsetToRelocations
- ? YamlSec.FileOffsetToRelocations
- : DerivedSec.FileOffsetToRelocations);
- W.write<uint64_t>(YamlSec.FileOffsetToLineNumbers);
- W.write<uint32_t>(YamlSec.NumberOfRelocations
- ? YamlSec.NumberOfRelocations
- : DerivedSec.NumberOfRelocations);
- W.write<uint32_t>(YamlSec.NumberOfLineNumbers);
- W.write<int32_t>(YamlSec.Flags);
+ // Virtual address is the same as physical address.
+ W.write<uint64_t>(DerivedSec.Address); // Physical address
+ W.write<uint64_t>(DerivedSec.Address); // Virtual address
+ W.write<uint64_t>(DerivedSec.Size);
+ W.write<uint64_t>(DerivedSec.FileOffsetToData);
+ W.write<uint64_t>(DerivedSec.FileOffsetToRelocations);
+ W.write<uint64_t>(DerivedSec.FileOffsetToLineNumbers);
+ W.write<uint32_t>(DerivedSec.NumberOfRelocations);
+ W.write<uint32_t>(DerivedSec.NumberOfLineNumbers);
+ W.write<int32_t>(DerivedSec.Flags);
W.OS.write_zeros(4);
} else {
- W.write<uint32_t>(SectionAddress); // Physical address
- W.write<uint32_t>(SectionAddress); // Virtual address
- W.write<uint32_t>(YamlSec.Size ? YamlSec.Size : DerivedSec.Size);
- W.write<uint32_t>(YamlSec.FileOffsetToData ? YamlSec.FileOffsetToData
- : DerivedSec.FileOffsetToData);
- W.write<uint32_t>(YamlSec.FileOffsetToRelocations
- ? YamlSec.FileOffsetToRelocations
- : DerivedSec.FileOffsetToRelocations);
- W.write<uint32_t>(YamlSec.FileOffsetToLineNumbers);
- W.write<uint16_t>(YamlSec.NumberOfRelocations
- ? YamlSec.NumberOfRelocations
- : DerivedSec.NumberOfRelocations);
- W.write<uint16_t>(YamlSec.NumberOfLineNumbers);
- W.write<int32_t>(YamlSec.Flags);
+ // Virtual address is the same as physical address.
+ W.write<uint32_t>(DerivedSec.Address); // Physical address
+ W.write<uint32_t>(DerivedSec.Address); // Virtual address
+ W.write<uint32_t>(DerivedSec.Size);
+ W.write<uint32_t>(DerivedSec.FileOffsetToData);
+ W.write<uint32_t>(DerivedSec.FileOffsetToRelocations);
+ W.write<uint32_t>(DerivedSec.FileOffsetToLineNumbers);
+ W.write<uint16_t>(DerivedSec.NumberOfRelocations);
+ W.write<uint16_t>(DerivedSec.NumberOfLineNumbers);
+ W.write<int32_t>(DerivedSec.Flags);
}
}
}
@@ -487,8 +545,8 @@ bool XCOFFWriter::writeSectionData() {
XCOFFYAML::Section YamlSec = Obj.Sections[I];
if (YamlSec.SectionData.binary_size()) {
// Fill the padding size with zeros.
- int64_t PaddingSize =
- InitSections[I].FileOffsetToData - (W.OS.tell() - StartOffset);
+ int64_t PaddingSize = (uint64_t)InitSections[I].FileOffsetToData -
+ (W.OS.tell() - StartOffset);
if (PaddingSize < 0) {
ErrHandler("redundant data was written before section data");
return false;
@@ -685,7 +743,7 @@ bool XCOFFWriter::writeAuxSymbol(
bool XCOFFWriter::writeSymbols() {
int64_t PaddingSize =
- (uint64_t)InitFileHdr.SymbolTableOffset - (W.OS.tell() - StartOffset);
+ InitFileHdr.SymbolTableOffset - (W.OS.tell() - StartOffset);
if (PaddingSize < 0) {
ErrHandler("redundant data was written before symbols");
return false;
@@ -797,10 +855,10 @@ bool XCOFFWriter::writeXCOFF() {
return false;
StartOffset = W.OS.tell();
writeFileHeader();
- if (Obj.AuxHeader)
+ if (InitFileHdr.AuxHeaderSize)
writeAuxFileHeader();
if (!Obj.Sections.empty()) {
- writeSectionHeader();
+ writeSectionHeaders();
if (!writeSectionData())
return false;
if (!writeRelocations())
diff --git a/llvm/test/tools/llvm-objcopy/XCOFF/invalid-read.test b/llvm/test/tools/llvm-objcopy/XCOFF/invalid-read.test
index 1df63406a4136..96dcd72b672c2 100644
--- a/llvm/test/tools/llvm-objcopy/XCOFF/invalid-read.test
+++ b/llvm/test/tools/llvm-objcopy/XCOFF/invalid-read.test
@@ -5,7 +5,7 @@
# RUN: yaml2obj %s --docnum=1 -o %t1
# RUN: not llvm-objcopy %t1 %t1.out 2>&1 | FileCheck %s -DFILE=%t1 --check-prefix=ERROR1
-# ERROR1: error: '[[FILE]]': The end of the file was unexpectedly encountered: section data with offset 0x70 and size 0x4 goes past the end of the file
+# ERROR1: error: '[[FILE]]': The end of the file was unexpectedly encountered: section data with offset 0x70 and size 0x20 goes past the end of the file
--- !XCOFF
FileHeader:
@@ -13,6 +13,7 @@ FileHeader:
Sections:
- SectionData: '00007400'
FileOffsetToData: 0x70
+ Size: 0x20
## Failed to read relocations.
# RUN: yaml2obj %s --docnum=2 -o %t2
@@ -35,12 +36,13 @@ Sections:
# RUN: yaml2obj %s --docnum=3 -o %t3
# RUN: not llvm-objcopy %t3 %t3.out 2>&1 | FileCheck %s -DFILE=%t3 --check-prefix=ERROR3
-# ERROR3: error: '[[FILE]]': The end of the file was unexpectedly encountered: symbol table with offset 0x15 and size 0x24 goes past the end of the file
+# ERROR3: error: '[[FILE]]': The end of the file was unexpectedly encountered: symbol table with offset 0x15 and size 0x36 goes past the end of the file
--- !XCOFF
FileHeader:
MagicNumber: 0x01DF
OffsetToSymbolTable: 0x15
+ EntriesInSymbolTable: 3
Symbols:
- Name: foo
AuxEntries:
diff --git a/llvm/test/tools/llvm-objdump/XCOFF/disassemble-traceback-table.test b/llvm/test/tools/llvm-objdump/XCOFF/disassemble-traceback-table.test
index 91354f5a951e0..96cac6b849fd5 100644
--- a/llvm/test/tools/llvm-objdump/XCOFF/disassemble-traceback-table.test
+++ b/llvm/test/tools/llvm-objdump/XCOFF/disassemble-traceback-table.test
@@ -112,4 +112,4 @@ Symbols:
# CHECK-NEXT: 70: 00 00 00 00
# CHECK-NEXT: ...
# CHECK-NEXT: 7c: 00 12 34 00
-# CHECK-NEXT: 80: 00 00 00 00
+# CHECK-NEXT: 80: 00 00 00
diff --git a/llvm/test/tools/llvm-objdump/XCOFF/section-headers.test b/llvm/test/tools/llvm-objdump/XCOFF/section-headers.test
index e80d5f6a711b1..1a110fb9642b8 100644
--- a/llvm/test/tools/llvm-objdump/XCOFF/section-headers.test
+++ b/llvm/test/tools/llvm-objdump/XCOFF/section-headers.test
@@ -10,7 +10,7 @@
# CHECK-NEXT: 1 .data 00000004 00000000 DATA
# CHECK-NEXT: 2 .bss 00000000 00000010 BSS
# CHECK-NEXT: 3 .tdata 00000004 00000000 DATA
-# CHECK-NEXT: 4 .tbss 00000000 00000000 BSS
+# CHECK-NEXT: 4 .tbss 00000000 00000004 BSS
# CHECK-NEXT: 5 .dwline 00000046 00000000 DEBUG
# CHECK-NEXT: 6 .debug 00000046 00000000 DEBUG
diff --git a/llvm/test/tools/llvm-readobj/XCOFF/file-header.test b/llvm/test/tools/llvm-readobj/XCOFF/file-header.test
index 8cbd84749fd48..2407aef726484 100644
--- a/llvm/test/tools/llvm-readobj/XCOFF/file-header.test
+++ b/llvm/test/tools/llvm-readobj/XCOFF/file-header.test
@@ -23,7 +23,6 @@ FileHeader:
CreationTime: [[CREATTIME=1]]
EntriesInSymbolTable: [[SYMBOLCOUNT=1]]
NumberOfSections: 1
- OffsetToSymbolTable: 0x3C
AuxiliaryHeaderSize: 0
Flags: 0x12
Sections:
@@ -42,7 +41,7 @@ Symbols:
# FILEHEADER64-NEXT: Magic: 0x1F7
# FILEHEADER64-NEXT: NumberOfSections: 1
# FILEHEADER64-NEXT: TimeStamp: None (0x0)
-# FILEHEADER64-NEXT: SymbolTableOffset: 0x3C
+# FILEHEADER64-NEXT: SymbolTableOffset: 0x60
# FILEHEADER64-NEXT: SymbolTableEntries: 1
# FILEHEADER64-NEXT: OptionalHeaderSize: 0x0
# FILEHEADER64-NEXT: Flags: 0x12
diff --git a/llvm/test/tools/llvm-readobj/XCOFF/sections.test b/llvm/test/tools/llvm-readobj/XCOFF/sections.test
index be098939ce775..36e85d6033652 100644
--- a/llvm/test/tools/llvm-readobj/XCOFF/sections.test
+++ b/llvm/test/tools/llvm-readobj/XCOFF/sections.test
@@ -13,7 +13,7 @@
# SEC32-NEXT: Name: .text
# SEC32-NEXT: PhysicalAddress: 0x0
# SEC32-NEXT: VirtualAddress: 0x0
-# SEC32-NEXT: Size: 0x4
+# SEC32-NEXT: Size: 0x2
# SEC32-NEXT: RawDataOffset: 0x64
# SEC32-NEXT: RelocationPointer: 0x0
# SEC32-NEXT: LineNumberPointer: 0x0
@@ -24,11 +24,11 @@
# SEC32-NEXT: Section {
# SEC32-NEXT: Index: 2
# SEC32-NEXT: Name: .data
-# SEC32-NEXT: PhysicalAddress: 0x4
-# SEC32-NEXT: VirtualAddress: 0x4
-# SEC32-NEXT: Size: 0x4
+# SEC32-NEXT: PhysicalAddress: 0x0
+# SEC32-NEXT: VirtualAddress: 0x0
+# SEC32-NEXT: Size: 0x2
# SEC32-NEXT: RawDataOffset: 0x68
-# SEC32-NEXT: RelocationPointer: 0x6C
+# SEC32-NEXT: RelocationPointer: 0x6A
# SEC32-NEXT: LineNumberPointer: 0x0
# SEC32-NEXT: NumberOfRelocations: 1
# SEC32-NEXT: NumberOfLineNumbers: 0
@@ -65,7 +65,7 @@ Sections:
# SEC64-NEXT: Name: .text
# SEC64-NEXT: PhysicalAddress: 0x0
# SEC64-NEXT: VirtualAddress: 0x0
-# SEC64-NEXT: Size: 0x4
+# SEC64-NEXT: Size: 0x2
# SEC64-NEXT: RawDataOffset: 0xA8
# SEC64-NEXT: RelocationPointer: 0x0
# SEC64-NEXT: LineNumberPointer: 0x0
@@ -76,11 +76,11 @@ Sections:
# SEC64-NEXT: Section {
# SEC64-NEXT: Index: 2
# SEC64-NEXT: Name: .data
-# SEC64-NEXT: PhysicalAddress: 0x4
-# SEC64-NEXT: VirtualAddress: 0x4
-# SEC64-NEXT: Size: 0x4
+# SEC64-NEXT: PhysicalAddress: 0x0
+# SEC64-NEXT: VirtualAddress: 0x0
+# SEC64-NEXT: Size: 0x2
# SEC64-NEXT: RawDataOffset: 0xAC
-# SEC64-NEXT: RelocationPointer: 0xB0
+# SEC64-NEXT: RelocationPointer: 0xAE
# SEC64-NEXT: LineNumberPointer: 0x0
# SEC64-NEXT: NumberOfRelocations: 1
# SEC64-NEXT: NumberOfLineNumbers: 0
diff --git a/llvm/test/tools/obj2yaml/XCOFF/aix.yaml b/llvm/test/tools/obj2yaml/XCOFF/aix.yaml
index 9f2f68b646b6f..12f44d04f720f 100644
--- a/llvm/test/tools/obj2yaml/XCOFF/aix.yaml
+++ b/llvm/test/tools/obj2yaml/XCOFF/aix.yaml
@@ -31,7 +31,7 @@
# CHECK32-NEXT: Info: 0xF
# CHECK32-NEXT: Type: 0x3
# CHECK32-NEXT: - Name: .data
-# CHECK32-NEXT: Address: 0x4
+# CHECK32-NEXT: Address: 0x0
# CHECK32-NEXT: Size: 0x4
# CHECK32-NEXT: FileOffsetToData: 0x68
# CHECK32-NEXT: FileOffsetToRelocations: 0x76
@@ -105,7 +105,7 @@
# CHECK64-NEXT: Info: 0xF
# CHECK64-NEXT: Type: 0x3
# CHECK64-NEXT: - Name: .data
-# CHECK64-NEXT: Address: 0x4
+# CHECK64-NEXT: Address: 0x0
# CHECK64-NEXT: Size: 0x4
# CHECK64-NEXT: FileOffsetToData: 0xAC
# CHECK64-NEXT: FileOffsetToRelocations: 0xBE
diff --git a/llvm/test/tools/obj2yaml/XCOFF/invalid-section.yaml b/llvm/test/tools/obj2yaml/XCOFF/invalid-section.yaml
index 1e16c5f66baa3..0e16a47ae6a97 100644
--- a/llvm/test/tools/obj2yaml/XCOFF/invalid-section.yaml
+++ b/llvm/test/tools/obj2yaml/XCOFF/invalid-section.yaml
@@ -5,7 +5,7 @@
# RUN: yaml2obj %s --docnum=1 -o %t1
# RUN: not obj2yaml %t1 2>&1 | FileCheck %s -DFILE=%t1 --check-prefix=ERROR1
-# ERROR1: The end of the file was unexpectedly encountered: section data with offset 0x70 and size 0x4 goes past the end of the file
+# ERROR1: The end of the file was unexpectedly encountered: section data with offset 0x70 and size 0x20 goes past the end of the file
--- !XCOFF
FileHeader:
@@ -13,6 +13,7 @@ FileHeader:
Sections:
- SectionData: '00007400'
FileOffsetToData: 0x70
+ Size: 0x20
## Error2: failed to get relocations.
# RUN: yaml2obj %s --docnum=2 -o %t2
diff --git a/llvm/test/tools/yaml2obj/XCOFF/aux-hdr-defaults.yaml b/llvm/test/tools/yaml2obj/XCOFF/aux-hdr-defaults.yaml
index f6d6193755ef2..a93123b231bad 100644
--- a/llvm/test/tools/yaml2obj/XCOFF/aux-hdr-defaults.yaml
+++ b/llvm/test/tools/yaml2obj/XCOFF/aux-hdr-defaults.yaml
@@ -10,12 +10,12 @@
# CASE1: AuxiliaryHeader {
# CASE1-NEXT: Magic: 0x10B
# CASE1-NEXT: Version: 0x1
-# CASE1-NEXT: Size of .text section: 0x8
-# CASE1-NEXT: Size of .data section: 0x8
-# CASE1-NEXT: Size of .bss section: 0x8
+# CASE1-NEXT: Size of .text section: 0x5
+# CASE1-NEXT: Size of .data section: 0x5
+# CASE1-NEXT: Size of .bss section: 0x5
# CASE1-NEXT: Entry point address: 0x0
-# CASE1-NEXT: .text section start address: 0x4
-# CASE1-NEXT: .data section start address: 0x10
+# CASE1-NEXT: .text section start address: 0x0
+# CASE1-NEXT: .data section start address: 0x0
# CASE1-NEXT: TOC anchor address: 0x0
# CASE1-NEXT: Section number of entryPoint: 0
# CASE1-NEXT: Section number of .text: 2
@@ -79,16 +79,12 @@ Sections:
# RUN: yaml2obj %s --docnum=1 -DMAGIC=0x1F7 -o %t2
# RUN: llvm-readobj --auxiliary-header %t2 | FileCheck %s --check-prefix=CASE2
-## Case2: same as case1, except it is 64-bit.
-# RUN: yaml2obj %s --docnum=1 -DMAGIC=0x1F7 -o %t2
-# RUN: llvm-readobj --auxiliary-header %t2 | FileCheck %s --check-prefix=CASE2
-
# CASE2: AuxiliaryHeader {
# CASE2-NEXT: Magic: 0x10B
# CASE2-NEXT: Version: 0x1
# CASE2-NEXT: Reserved for debugger: 0x0
-# CASE2-NEXT: .text section start address: 0x2
-# CASE2-NEXT: .data section start address: 0xE
+# CASE2-NEXT: .text section start address: 0x0
+# CASE2-NEXT: .data section start address: 0x0
# CASE2-NEXT: TOC anchor address: 0x0
# CASE2-NEXT: Section number of entryPoint: 0
# CASE2-NEXT: Section number of .text: 2
@@ -106,9 +102,9 @@ Sections:
# CASE2-NEXT: Stack page size: 0x0
# CASE2-NEXT: Flag: 0x80
# CASE2-NEXT: Alignment of thread-local storage: 0x0
-# CASE2-NEXT: Size of .text section: 0x8
-# CASE2-NEXT: Size of .data section: 0x8
-# CASE2-NEXT: Size of .bss section: 0x8
+# CASE2-NEXT: Size of .text section: 0x5
+# CASE2-NEXT: Size of .data section: 0x5
+# CASE2-NEXT: Size of .bss section: 0x5
# CASE2-NEXT: Entry point address: 0x0
# CASE2-NEXT: Maximum stack size: 0x0
# CASE2-NEXT: Maximum data size: 0x0
diff --git a/llvm/test/tools/yaml2obj/XCOFF/basic-doc.yaml b/llvm/test/tools/yaml2obj/XCOFF/basic-doc.yaml
index ed85bc639d0ad..8c3d77d842b02 100644
--- a/llvm/test/tools/yaml2obj/XCOFF/basic-doc.yaml
+++ b/llvm/test/tools/yaml2obj/XCOFF/basic-doc.yaml
@@ -65,8 +65,8 @@ Symbols:
# CHECK-NEXT: Section {
# CHECK-NEXT: Index: 2
# CHECK-NEXT: Name: .data
-# CHECK-NEXT: PhysicalAddress: 0x8
-# CHECK-NEXT: VirtualAddress: 0x8
+# CHECK-NEXT: PhysicalAddress: 0x0
+# CHECK-NEXT: VirtualAddress: 0x0
# CHECK-NEXT: Size: 0x8
# CHECK-NEXT: RawDataOffset: 0xE4
# CHECK-NEXT: RelocationPointer: 0xF0
diff --git a/llvm/test/tools/yaml2obj/XCOFF/offset-check.yaml b/llvm/test/tools/yaml2obj/XCOFF/offset-check.yaml
new file mode 100644
index 0000000000000..ee23a16d8c162
--- /dev/null
+++ b/llvm/test/tools/yaml2obj/XCOFF/offset-check.yaml
@@ -0,0 +1,91 @@
+## Report errors when specified file offsets are invalid.
+
+# RUN: not yaml2obj %s -DTEXTRAWDATAOFFSET=0xFFFFFFF0 -o %t 2>&1 | \
+# RUN: FileCheck %s --check-prefix=ERROR1
+# ERROR1: current file offset (4294967288) is bigger than the specified FileOffsetToData for the .data section (108)
+
+# RUN: not yaml2obj %s -DDATARAWDATAOFFSET=0xFFFFFFF0 -o %t 2>&1 | \
+# RUN: FileCheck %s --check-prefix=ERROR2
+# ERROR2: current file offset (4294967284) is bigger than the specified FileOffsetToRelocations for the .text section (112)
+
+# RUN: not yaml2obj %s -DRELOCOFFSET=0xFFFFFFF0 -o %t 2>&1 | \
+# RUN: FileCheck %s --check-prefix=ERROR3
+# ERROR3: current file offset (4294967290) is bigger than the specified SymbolTableOffset (122)
+
+# RUN: not yaml2obj %s -DSYMTABOFFSET=0x100000000 -o %t 2>&1 | \
+# RUN: FileCheck %s --check-prefix=ERROR4
+# ERROR4: maximum object size of 4294967295 exceeded when writing symbols
+
+# RUN: not yaml2obj %s -DRELOCOFFSET=0x100000000 -o %t 2>&1 | \
+# RUN: FileCheck %s --check-prefix=ERROR5
+# ERROR5: maximum object size (4294967295) exceeded when writing relocation data for section .text
+
+# RUN: not yaml2obj %s -DDATARAWDATAOFFSET=0x100000000 -o %t 2>&1 | \
+# RUN: FileCheck %s --check-prefix=ERROR6
+# ERROR6: maximum object size (4294967295) exceeded when writing data for section 2 (.data)
+
+--- !XCOFF
+FileHeader:
+ MagicNumber: 0x1DF
+ NumberOfSections: 2
+ OffsetToSymbolTable: [[SYMTABOFFSET=0x7A]]
+ EntriesInSymbolTable: 6
+ AuxiliaryHeaderSize: 0
+ Flags: 0x0
+Sections:
+ - Name: .text
+ Address: 0x0
+ Size: 0x8
+ FileOffsetToData: [[TEXTRAWDATAOFFSET=0x64]]
+ FileOffsetToRelocations: [[RELOCOFFSET=0x70]]
+ NumberOfRelocations: 0x1
+ Flags: [ STYP_TEXT ]
+ SectionData: 386000004BFFFFFC
+ Relocations:
+ - Address: 0x4
+ Symbol: 0x2
+ Info: 0x99
+ Type: 0x1A
+ - Name: .data
+ Address: 0x0
+ Size: 0x4
+ FileOffsetToData: [[DATARAWDATAOFFSET=0x6C]]
+ FileOffsetToRelocations: 0
+ Flags: [ STYP_DATA ]
+ SectionData: 3210ABCD
+Symbols:
+ - Name: .bar
+ Value: 0x0
+ Section: N_UNDEF
+ Type: 0x0
+ StorageClass: C_EXT
+ NumberOfAuxEntries: 1
+ AuxEntries:
+ - Type: AUX_CSECT
+ SymbolAlignmentAndType: 0
+ StorageMappingClass: XMC_PR
+ SectionOrLength: 0
+ - Name: ''
+ Value: 0x0
+ Section: .text
+ Type: 0x0
+ StorageClass: C_HIDEXT
+ NumberOfAuxEntries: 1
+ AuxEntries:
+ - Type: AUX_CSECT
+ SymbolAlignmentAndType: 17
+ StorageMappingClass: XMC_PR
+ SectionOrLength: 8
+ - Name: .foo
+ Value: 0x0
+ Section: .text
+ Type: 0x0
+ StorageClass: C_EXT
+ NumberOfAuxEntries: 1
+ AuxEntries:
+ - Type: AUX_CSECT
+ SymbolAlignmentAndType: 2
+ StorageMappingClass: XMC_PR
+ SectionOrLength: 2
+StringTable: {}
+...
More information about the llvm-commits
mailing list