6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2026-04-21 23:17:16 +00:00
Code Issues Projects Releases Wiki Activity

Remove some code duplication.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@116484 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2010-10-14 16:34:44 +00:00
parent 7bd698153d
commit a0949b50dc
3 changed files with 26 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/MC/ELFObjectWriter.cpp
+18 -49
View File
@@ -781,7 +781,7 @@ void ELFObjectWriterImpl::ComputeSymbolTable(MCAssembler &Asm) {
StringMap<uint64_t> StringIndexMap;
StringTable += '\x00';
// Add the data for local symbols.
// Add the data for the symbols.
for (MCAssembler::symbol_iterator it = Asm.symbol_begin(),
ie = Asm.symbol_end(); it != ie; ++it) {
const MCSymbol &Symbol = it->getSymbol();
@@ -789,9 +789,6 @@ void ELFObjectWriterImpl::ComputeSymbolTable(MCAssembler &Asm) {
if (!isInSymtab(Asm, *it, UsedInReloc.count(&Symbol)))
continue;
if (!isLocal(*it))
continue;
uint64_t &Entry = StringIndexMap[Symbol.getName()];
if (!Entry) {
Entry = StringTable.size();
@@ -802,50 +799,18 @@ void ELFObjectWriterImpl::ComputeSymbolTable(MCAssembler &Asm) {
ELFSymbolData MSD;
MSD.SymbolData = it;
MSD.StringIndex = Entry;
bool Local = isLocal(*it);
if (Symbol.isAbsolute()) {
MSD.SectionIndex = ELF::SHN_ABS;
LocalSymbolData.push_back(MSD);
} else {
const MCSymbol *SymbolP = &Symbol;
if (Symbol.isVariable()) {
const MCExpr *Value = Symbol.getVariableValue();
assert (Value->getKind() == MCExpr::SymbolRef && "Unimplemented");
const MCSymbolRefExpr *Ref = static_cast<const MCSymbolRefExpr*>(Value);
SymbolP = &Ref->getSymbol();
}
MSD.SectionIndex = SectionIndexMap.lookup(&SymbolP->getSection());
assert(MSD.SectionIndex && "Invalid section index!");
LocalSymbolData.push_back(MSD);
}
}
// Now add non-local symbols.
for (MCAssembler::symbol_iterator it = Asm.symbol_begin(),
ie = Asm.symbol_end(); it != ie; ++it) {
const MCSymbol &Symbol = it->getSymbol();
if (!isInSymtab(Asm, *it, UsedInReloc.count(&Symbol)))
continue;
if (isLocal(*it))
continue;
uint64_t &Entry = StringIndexMap[Symbol.getName()];
if (!Entry) {
Entry = StringTable.size();
StringTable += Symbol.getName();
StringTable += '\x00';
}
ELFSymbolData MSD;
MSD.SymbolData = it;
MSD.StringIndex = Entry;
// FIXME: There is duplicated code with the local case.
if (it->isCommon()) {
assert(!Local);
MSD.SectionIndex = ELF::SHN_COMMON;
ExternalSymbolData.push_back(MSD);
} else if (Symbol.isAbsolute()) {
MSD.SectionIndex = ELF::SHN_ABS;
if (Local)
LocalSymbolData.push_back(MSD);
else
ExternalSymbolData.push_back(MSD);
} else if (Symbol.isVariable()) {
const MCExpr *Value = Symbol.getVariableValue();
assert (Value->getKind() == MCExpr::SymbolRef && "Unimplemented");
@@ -854,22 +819,26 @@ void ELFObjectWriterImpl::ComputeSymbolTable(MCAssembler &Asm) {
if (RefSymbol.isDefined()) {
MSD.SectionIndex = SectionIndexMap.lookup(&RefSymbol.getSection());
assert(MSD.SectionIndex && "Invalid section index!");
ExternalSymbolData.push_back(MSD);
if (Local)
LocalSymbolData.push_back(MSD);
else
ExternalSymbolData.push_back(MSD);
}
} else if (Symbol.isUndefined()) {
assert(!Local);
MSD.SectionIndex = ELF::SHN_UNDEF;
// FIXME: Undefined symbols are global, but this is the first place we
// are able to set it.
if (GetBinding(*it) == ELF::STB_LOCAL)
SetBinding(*it, ELF::STB_GLOBAL);
UndefinedSymbolData.push_back(MSD);
} else if (Symbol.isAbsolute()) {
MSD.SectionIndex = ELF::SHN_ABS;
ExternalSymbolData.push_back(MSD);
} else {
MSD.SectionIndex = SectionIndexMap.lookup(&Symbol.getSection());
assert(MSD.SectionIndex && "Invalid section index!");
ExternalSymbolData.push_back(MSD);
if (Local)
LocalSymbolData.push_back(MSD);
else
ExternalSymbolData.push_back(MSD);
}
}