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

Implement a simple alias case and refactor the code a bit so that the

Browse Source 
isInSymtab and isLocal logic in the two loops don't get easily out of sync.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@115643 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2010-10-05 18:01:23 +00:00
parent a25c0a4283
commit 737cd213e3
2 changed files with 57 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
lib/MC/ELFObjectWriter.cpp
View File

@ -692,6 +692,29 @@ ELFObjectWriterImpl::getSymbolIndexInSymbolTable(const MCAssembler &Asm,
return SD.getIndex() + NumRegularSections + /* empty symbol */ 1; return SD.getIndex() + NumRegularSections + /* empty symbol */ 1;
} }
static bool isInSymtab(const MCAssembler &Asm, const MCSymbolData &Data,
bool Used) {
const MCSymbol &Symbol = Data.getSymbol();
if (!Asm.isSymbolLinkerVisible(Symbol) && !Symbol.isUndefined())
return false;
if (!Used && Symbol.isTemporary())
return false;
return true;
}
static bool isLocal(const MCSymbolData &Data) {
if (Data.isExternal())
return false;
const MCSymbol &Symbol = Data.getSymbol();
if (Symbol.isUndefined() && !Symbol.isVariable())
return false;
return true;
}
void ELFObjectWriterImpl::ComputeSymbolTable(MCAssembler &Asm) { void ELFObjectWriterImpl::ComputeSymbolTable(MCAssembler &Asm) {
// FIXME: Is this the correct place to do this? // FIXME: Is this the correct place to do this?
if (NeedsGOT) { if (NeedsGOT) {
@ -718,14 +741,10 @@ void ELFObjectWriterImpl::ComputeSymbolTable(MCAssembler &Asm) {
ie = Asm.symbol_end(); it != ie; ++it) { ie = Asm.symbol_end(); it != ie; ++it) {
const MCSymbol &Symbol = it->getSymbol(); const MCSymbol &Symbol = it->getSymbol();
// Ignore non-linker visible symbols. if (!isInSymtab(Asm, *it, UsedInReloc.count(&Symbol)))
if (!Asm.isSymbolLinkerVisible(Symbol))
continue; continue;
if (it->isExternal() || Symbol.isUndefined()) if (!isLocal(*it))
continue;
if (Symbol.isTemporary() && !UsedInReloc.count(&Symbol))
continue; continue;
uint64_t &Entry = StringIndexMap[Symbol.getName()]; uint64_t &Entry = StringIndexMap[Symbol.getName()];
@ -743,7 +762,14 @@ void ELFObjectWriterImpl::ComputeSymbolTable(MCAssembler &Asm) {
MSD.SectionIndex = ELF::SHN_ABS; MSD.SectionIndex = ELF::SHN_ABS;
LocalSymbolData.push_back(MSD); LocalSymbolData.push_back(MSD);
} else { } else {
MSD.SectionIndex = SectionIndexMap.lookup(&Symbol.getSection()); 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!"); assert(MSD.SectionIndex && "Invalid section index!");
LocalSymbolData.push_back(MSD); LocalSymbolData.push_back(MSD);
} }
@ -754,18 +780,10 @@ void ELFObjectWriterImpl::ComputeSymbolTable(MCAssembler &Asm) {
ie = Asm.symbol_end(); it != ie; ++it) { ie = Asm.symbol_end(); it != ie; ++it) {
const MCSymbol &Symbol = it->getSymbol(); const MCSymbol &Symbol = it->getSymbol();
// Ignore non-linker visible symbols. if (!isInSymtab(Asm, *it, UsedInReloc.count(&Symbol)))
if (!Asm.isSymbolLinkerVisible(Symbol) && !Symbol.isUndefined())
continue; continue;
if (!it->isExternal() && !Symbol.isUndefined()) if (isLocal(*it))
continue;
if (Symbol.isVariable())
continue;
if (Symbol.isUndefined() && !UsedInReloc.count(&Symbol)
&& Symbol.isTemporary())
continue; continue;
uint64_t &Entry = StringIndexMap[Symbol.getName()]; uint64_t &Entry = StringIndexMap[Symbol.getName()];

22
test/MC/ELF/alias.s Normal file
View File

@ -0,0 +1,22 @@
// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | elf-dump | FileCheck %s
foo:
bar = foo
// CHECK: # Symbol 1
// CHECK-NEXT: (('st_name', 5) # 'bar'
// CHECK-NEXT: ('st_bind', 0)
// CHECK-NEXT: ('st_type', 0)
// CHECK-NEXT: ('st_other', 0)
// CHECK-NEXT: ('st_shndx', 1)
// CHECK-NEXT: ('st_value', 0)
// CHECK-NEXT: ('st_size', 0)
// CHECK-NEXT: ),
// CHECK-NEXT: # Symbol 2
// CHECK-NEXT: (('st_name', 1) # 'foo'
// CHECK-NEXT: ('st_bind', 0)
// CHECK-NEXT: ('st_type', 0)
// CHECK-NEXT: ('st_other', 0)
// CHECK-NEXT: ('st_shndx', 1)
// CHECK-NEXT: ('st_value', 0)
// CHECK-NEXT: ('st_size', 0)