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

Factor some code into ComputeIndexMap.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@118722 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2010-11-10 21:51:05 +00:00
parent 733c54da1e
commit bab2a80525
1 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lib/MC/ELFObjectWriter.cpp
View File

@@ -289,6 +289,7 @@ namespace {
ELFSymbolData &MSD, ELFSymbolData &MSD,
const MCAsmLayout &Layout); const MCAsmLayout &Layout);
typedef DenseMap<const MCSectionELF*, uint32_t> SectionIndexMapTy;
void WriteSymbolTable(MCDataFragment *SymtabF, MCDataFragment *ShndxF, void WriteSymbolTable(MCDataFragment *SymtabF, MCDataFragment *ShndxF,
const MCAssembler &Asm, const MCAssembler &Asm,
const MCAsmLayout &Layout, const MCAsmLayout &Layout,
@@ -306,7 +307,11 @@ namespace {
/// \param StringTable [out] - The string table data. /// \param StringTable [out] - The string table data.
/// \param StringIndexMap [out] - Map from symbol names to offsets in the /// \param StringIndexMap [out] - Map from symbol names to offsets in the
/// string table. /// string table.
void ComputeSymbolTable(MCAssembler &Asm); void ComputeSymbolTable(MCAssembler &Asm,
const SectionIndexMapTy &SectionIndexMap);
void ComputeIndexMap(MCAssembler &Asm,
SectionIndexMapTy &SectionIndexMap);
void WriteRelocation(MCAssembler &Asm, MCAsmLayout &Layout, void WriteRelocation(MCAssembler &Asm, MCAsmLayout &Layout,
const MCSectionData &SD); const MCSectionData &SD);
@@ -919,7 +924,19 @@ static bool isLocal(const MCSymbolData &Data) {
return true; return true;
} }
void ELFObjectWriterImpl::ComputeSymbolTable(MCAssembler &Asm) { void ELFObjectWriterImpl::ComputeIndexMap(MCAssembler &Asm,
SectionIndexMapTy &SectionIndexMap) {
unsigned Index = 1;
for (MCAssembler::iterator it = Asm.begin(),
ie = Asm.end(); it != ie; ++it) {
const MCSectionELF &Section =
static_cast<const MCSectionELF &>(it->getSection());
SectionIndexMap[&Section] = Index++;
}
}
void ELFObjectWriterImpl::ComputeSymbolTable(MCAssembler &Asm,
const SectionIndexMapTy &SectionIndexMap) {
// FIXME: Is this the correct place to do this? // FIXME: Is this the correct place to do this?
if (NeedsGOT) { if (NeedsGOT) {
llvm::StringRef Name = "_GLOBAL_OFFSET_TABLE_"; llvm::StringRef Name = "_GLOBAL_OFFSET_TABLE_";
@@ -931,11 +948,6 @@ void ELFObjectWriterImpl::ComputeSymbolTable(MCAssembler &Asm) {
// Build section lookup table. // Build section lookup table.
NumRegularSections = Asm.size(); NumRegularSections = Asm.size();
DenseMap<const MCSection*, uint32_t> SectionIndexMap;
unsigned Index = 1;
for (MCAssembler::iterator it = Asm.begin(),
ie = Asm.end(); it != ie; ++it, ++Index)
SectionIndexMap[&it->getSection()] = Index;
// Index 0 is always the empty string. // Index 0 is always the empty string.
StringMap<uint64_t> StringIndexMap; StringMap<uint64_t> StringIndexMap;
@@ -968,7 +980,9 @@ void ELFObjectWriterImpl::ComputeSymbolTable(MCAssembler &Asm) {
} else if (RefSymbol.isUndefined()) { } else if (RefSymbol.isUndefined()) {
MSD.SectionIndex = ELF::SHN_UNDEF; MSD.SectionIndex = ELF::SHN_UNDEF;
} else { } else {
MSD.SectionIndex = SectionIndexMap.lookup(&RefSymbol.getSection()); const MCSectionELF &Section =
static_cast<const MCSectionELF&>(RefSymbol.getSection());
MSD.SectionIndex = SectionIndexMap.lookup(&Section);
if (MSD.SectionIndex >= ELF::SHN_LORESERVE) if (MSD.SectionIndex >= ELF::SHN_LORESERVE)
NeedsSymtabShndx = true; NeedsSymtabShndx = true;
assert(MSD.SectionIndex && "Invalid section index!"); assert(MSD.SectionIndex && "Invalid section index!");
@@ -1010,7 +1024,7 @@ void ELFObjectWriterImpl::ComputeSymbolTable(MCAssembler &Asm) {
// Set the symbol indices. Local symbols must come before all other // Set the symbol indices. Local symbols must come before all other
// symbols with non-local bindings. // symbols with non-local bindings.
Index = 0; unsigned Index = 0;
for (unsigned i = 0, e = LocalSymbolData.size(); i != e; ++i) for (unsigned i = 0, e = LocalSymbolData.size(); i != e; ++i)
LocalSymbolData[i].SymbolData->setIndex(Index++); LocalSymbolData[i].SymbolData->setIndex(Index++);
for (unsigned i = 0, e = ExternalSymbolData.size(); i != e; ++i) for (unsigned i = 0, e = ExternalSymbolData.size(); i != e; ++i)
@@ -1228,8 +1242,12 @@ bool ELFObjectWriterImpl::IsFixupFullyResolved(const MCAssembler &Asm,
void ELFObjectWriterImpl::WriteObject(MCAssembler &Asm, void ELFObjectWriterImpl::WriteObject(MCAssembler &Asm,
const MCAsmLayout &Layout) { const MCAsmLayout &Layout) {
SectionIndexMapTy SectionIndexMap;
ComputeIndexMap(Asm, SectionIndexMap);
// Compute symbol table information. // Compute symbol table information.
ComputeSymbolTable(Asm); ComputeSymbolTable(Asm, SectionIndexMap);
CreateMetadataSections(const_cast<MCAssembler&>(Asm), CreateMetadataSections(const_cast<MCAssembler&>(Asm),
const_cast<MCAsmLayout&>(Layout)); const_cast<MCAsmLayout&>(Layout));
@@ -1262,9 +1280,6 @@ void ELFObjectWriterImpl::WriteObject(MCAssembler &Asm,
// ... then all of the sections ... // ... then all of the sections ...
DenseMap<const MCSection*, uint64_t> SectionOffsetMap; DenseMap<const MCSection*, uint64_t> SectionOffsetMap;
DenseMap<const MCSection*, uint32_t> SectionIndexMap;
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; const MCSectionData &SD = *it;
@@ -1275,7 +1290,6 @@ void ELFObjectWriterImpl::WriteObject(MCAssembler &Asm,
// 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++;
FileOff += Layout.getSectionFileSize(&SD); FileOff += Layout.getSectionFileSize(&SD);