6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-06 06:33:24 +00:00
Code Issues Projects Releases Wiki Activity

MCELF: Align symtab, relocation sections and section headers properly. Patch by Krister Wombell.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@113155 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Benjamin Kramer 2010-09-06 16:11:52 +00:00
parent 9c7f075270
commit a9eadca2fd
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/MC/ELFObjectWriter.cpp
View File

@ -103,9 +103,6 @@ namespace {
raw_ostream &OS; raw_ostream &OS;
// This holds the current offset into the object file.
size_t FileOff;
unsigned Is64Bit : 1; unsigned Is64Bit : 1;
bool HasRelocationAddend; bool HasRelocationAddend;
@ -120,7 +117,7 @@ namespace {
public: public:
ELFObjectWriterImpl(ELFObjectWriter *_Writer, bool _Is64Bit, ELFObjectWriterImpl(ELFObjectWriter *_Writer, bool _Is64Bit,
bool _HasRelAddend) bool _HasRelAddend)
: Writer(_Writer), OS(Writer->getStream()), FileOff(0), : Writer(_Writer), OS(Writer->getStream()),
Is64Bit(_Is64Bit), HasRelocationAddend(_HasRelAddend) { Is64Bit(_Is64Bit), HasRelocationAddend(_HasRelAddend) {
} }
@ -702,7 +699,7 @@ void ELFObjectWriterImpl::WriteRelocation(MCAssembler &Asm, MCAsmLayout &Layout,
false, EntrySize); false, EntrySize);
MCSectionData &RelaSD = Asm.getOrCreateSectionData(*RelaSection); MCSectionData &RelaSD = Asm.getOrCreateSectionData(*RelaSection);
RelaSD.setAlignment(1); RelaSD.setAlignment(Is64Bit ? 8 : 4);
MCDataFragment *F = new MCDataFragment(&RelaSD); MCDataFragment *F = new MCDataFragment(&RelaSD);
@ -832,21 +829,28 @@ void ELFObjectWriterImpl::WriteObject(const MCAssembler &Asm,
// Add 1 for the null section. // Add 1 for the null section.
unsigned NumSections = Asm.size() + 1; unsigned NumSections = Asm.size() + 1;
uint64_t NaturalAlignment = Is64Bit ? 8 : 4;
uint64_t SectionDataSize = 0; uint64_t HeaderSize = Is64Bit ? sizeof(ELF::Elf64_Ehdr) : sizeof(ELF::Elf32_Ehdr);
uint64_t FileOff = HeaderSize;
for (MCAssembler::const_iterator it = Asm.begin(), for (MCAssembler::const_iterator it = Asm.begin(),
ie = Asm.end(); it != ie; ++it) { ie = Asm.end(); it != ie; ++it) {
const MCSectionData &SD = *it; const MCSectionData &SD = *it;
FileOff = RoundUpToAlignment(FileOff, SD.getAlignment());
// Get the size of the section in the output file (including padding). // Get the size of the section in the output file (including padding).
uint64_t Size = Layout.getSectionFileSize(&SD); uint64_t Size = Layout.getSectionFileSize(&SD);
SectionDataSize += Size;
FileOff += Size;
} }
FileOff = RoundUpToAlignment(FileOff, NaturalAlignment);
// Write out the ELF header ... // Write out the ELF header ...
WriteHeader(SectionDataSize, NumSections); WriteHeader(FileOff - HeaderSize, NumSections);
FileOff = Is64Bit ? sizeof(ELF::Elf64_Ehdr) : sizeof(ELF::Elf32_Ehdr);
FileOff = HeaderSize;
// ... then all of the sections ... // ... then all of the sections ...
DenseMap<const MCSection*, uint64_t> SectionOffsetMap; DenseMap<const MCSection*, uint64_t> SectionOffsetMap;
@ -856,17 +860,25 @@ void ELFObjectWriterImpl::WriteObject(const MCAssembler &Asm,
unsigned Index = 1; unsigned Index = 1;
for (MCAssembler::const_iterator it = Asm.begin(), for (MCAssembler::const_iterator it = Asm.begin(),
ie = Asm.end(); it != ie; ++it) { ie = Asm.end(); it != ie; ++it) {
const MCSectionData &SD = *it;
uint64_t Padding = OffsetToAlignment(FileOff, SD.getAlignment());
WriteZeros(Padding);
FileOff += Padding;
// Remember the offset into the file for this section. // Remember the offset into the file for this section.
SectionOffsetMap[&it->getSection()] = FileOff; SectionOffsetMap[&it->getSection()] = FileOff;
SectionIndexMap[&it->getSection()] = Index++; SectionIndexMap[&it->getSection()] = Index++;
const MCSectionData &SD = *it;
FileOff += Layout.getSectionFileSize(&SD); FileOff += Layout.getSectionFileSize(&SD);
Asm.WriteSectionData(it, Layout, Writer); Asm.WriteSectionData(it, Layout, Writer);
} }
uint64_t Padding = OffsetToAlignment(FileOff, NaturalAlignment);
WriteZeros(Padding);
FileOff += Padding;
// ... and then the section header table. // ... and then the section header table.
// Should we align the section header table? // Should we align the section header table?
// //