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

Refactor code a bit and avoid creating unnecessary entries in the string

Browse Source 
map.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@116579 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2010-10-15 15:39:06 +00:00
parent 1dd5a2f4e1
commit 5df0b65e8f
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/MC/ELFObjectWriter.cpp
View File

@@ -789,28 +789,18 @@ void ELFObjectWriterImpl::ComputeSymbolTable(MCAssembler &Asm) {
if (!isInSymtab(Asm, *it, UsedInReloc.count(&Symbol))) if (!isInSymtab(Asm, *it, UsedInReloc.count(&Symbol)))
continue; continue;
uint64_t &Entry = StringIndexMap[Symbol.getName()];
if (!Entry) {
Entry = StringTable.size();
StringTable += Symbol.getName();
StringTable += '\x00';
}
ELFSymbolData MSD; ELFSymbolData MSD;
MSD.SymbolData = it; MSD.SymbolData = it;
MSD.StringIndex = Entry;
bool Local = isLocal(*it); bool Local = isLocal(*it);
bool Add = false;
if (it->isCommon()) { if (it->isCommon()) {
assert(!Local); assert(!Local);
MSD.SectionIndex = ELF::SHN_COMMON; MSD.SectionIndex = ELF::SHN_COMMON;
ExternalSymbolData.push_back(MSD); Add = true;
} else if (Symbol.isAbsolute()) { } else if (Symbol.isAbsolute()) {
MSD.SectionIndex = ELF::SHN_ABS; MSD.SectionIndex = ELF::SHN_ABS;
if (Local) Add = true;
LocalSymbolData.push_back(MSD);
else
ExternalSymbolData.push_back(MSD);
} else if (Symbol.isVariable()) { } else if (Symbol.isVariable()) {
const MCExpr *Value = Symbol.getVariableValue(); const MCExpr *Value = Symbol.getVariableValue();
assert (Value->getKind() == MCExpr::SymbolRef && "Unimplemented"); assert (Value->getKind() == MCExpr::SymbolRef && "Unimplemented");
@@ -819,10 +809,7 @@ void ELFObjectWriterImpl::ComputeSymbolTable(MCAssembler &Asm) {
if (RefSymbol.isDefined()) { if (RefSymbol.isDefined()) {
MSD.SectionIndex = SectionIndexMap.lookup(&RefSymbol.getSection()); MSD.SectionIndex = SectionIndexMap.lookup(&RefSymbol.getSection());
assert(MSD.SectionIndex && "Invalid section index!"); assert(MSD.SectionIndex && "Invalid section index!");
if (Local) Add = true;
LocalSymbolData.push_back(MSD);
else
ExternalSymbolData.push_back(MSD);
} }
} else if (Symbol.isUndefined()) { } else if (Symbol.isUndefined()) {
assert(!Local); assert(!Local);
@@ -831,11 +818,24 @@ void ELFObjectWriterImpl::ComputeSymbolTable(MCAssembler &Asm) {
// are able to set it. // are able to set it.
if (GetBinding(*it) == ELF::STB_LOCAL) if (GetBinding(*it) == ELF::STB_LOCAL)
SetBinding(*it, ELF::STB_GLOBAL); SetBinding(*it, ELF::STB_GLOBAL);
UndefinedSymbolData.push_back(MSD); Add = true;
} else { } else {
MSD.SectionIndex = SectionIndexMap.lookup(&Symbol.getSection()); MSD.SectionIndex = SectionIndexMap.lookup(&Symbol.getSection());
assert(MSD.SectionIndex && "Invalid section index!"); assert(MSD.SectionIndex && "Invalid section index!");
if (Local) Add = true;
}
if (Add) {
uint64_t &Entry = StringIndexMap[Symbol.getName()];
if (!Entry) {
Entry = StringTable.size();
StringTable += Symbol.getName();
StringTable += '\x00';
}
MSD.StringIndex = Entry;
if (MSD.SectionIndex == ELF::SHN_UNDEF)
UndefinedSymbolData.push_back(MSD);
else if (Local)
LocalSymbolData.push_back(MSD); LocalSymbolData.push_back(MSD);
else else
ExternalSymbolData.push_back(MSD); ExternalSymbolData.push_back(MSD);

10
test/MC/ELF/alias.s
View File

@@ -25,7 +25,7 @@ bar4 = foo4
// CHECK-NEXT: ('st_size', 0) // CHECK-NEXT: ('st_size', 0)
// CHECK-NEXT: ), // CHECK-NEXT: ),
// CHECK-NEXT: # Symbol 2 // CHECK-NEXT: # Symbol 2
// CHECK-NEXT: (('st_name', 34) # 'bar4' // CHECK-NEXT: (('st_name', 29) # 'bar4'
// CHECK-NEXT: ('st_bind', 0) // CHECK-NEXT: ('st_bind', 0)
// CHECK-NEXT: ('st_type', 2) // CHECK-NEXT: ('st_type', 2)
// CHECK-NEXT: ('st_other', 0) // CHECK-NEXT: ('st_other', 0)
@@ -43,7 +43,7 @@ bar4 = foo4
// CHECK-NEXT: ('st_size', 0) // CHECK-NEXT: ('st_size', 0)
// CHECK-NEXT: ), // CHECK-NEXT: ),
// CHECK-NEXT: # Symbol 4 // CHECK-NEXT: # Symbol 4
// CHECK-NEXT: (('st_name', 19) # 'foo3' // CHECK-NEXT: (('st_name', 14) # 'foo3'
// CHECK-NEXT: ('st_bind', 0) // CHECK-NEXT: ('st_bind', 0)
// CHECK-NEXT: ('st_type', 0) // CHECK-NEXT: ('st_type', 0)
// CHECK-NEXT: ('st_other', 0) // CHECK-NEXT: ('st_other', 0)
@@ -52,7 +52,7 @@ bar4 = foo4
// CHECK-NEXT: ('st_size', 0) // CHECK-NEXT: ('st_size', 0)
// CHECK-NEXT: ), // CHECK-NEXT: ),
// CHECK-NEXT: # Symbol 5 // CHECK-NEXT: # Symbol 5
// CHECK-NEXT: (('st_name', 29) # 'foo4' // CHECK-NEXT: (('st_name', 24) # 'foo4'
// CHECK-NEXT: ('st_bind', 0) // CHECK-NEXT: ('st_bind', 0)
// CHECK-NEXT: ('st_type', 2) // CHECK-NEXT: ('st_type', 2)
// CHECK-NEXT: ('st_other', 0) // CHECK-NEXT: ('st_other', 0)
@@ -67,7 +67,7 @@ bar4 = foo4
// CHECK: # Symbol 8 // CHECK: # Symbol 8
// CHECK-NEXT: (('st_name', 0) # '' // CHECK-NEXT: (('st_name', 0) # ''
// CHECK: # Symbol 9 // CHECK: # Symbol 9
// CHECK-NEXT: (('st_name', 24) # 'bar3' // CHECK-NEXT: (('st_name', 19) # 'bar3'
// CHECK-NEXT: ('st_bind', 1) // CHECK-NEXT: ('st_bind', 1)
// CHECK-NEXT: ('st_type', 0) // CHECK-NEXT: ('st_type', 0)
// CHECK-NEXT: ('st_other', 0) // CHECK-NEXT: ('st_other', 0)
@@ -75,7 +75,7 @@ bar4 = foo4
// CHECK-NEXT: ('st_value', 0) // CHECK-NEXT: ('st_value', 0)
// CHECK-NEXT: ('st_size', 0) // CHECK-NEXT: ('st_size', 0)
// CHECK: # Symbol 10 // CHECK: # Symbol 10
// CHECK-NEXT: (('st_name', 14) # 'bar2' // CHECK-NEXT: (('st_name', 9) # 'bar2'
// CHECK-NEXT: ('st_bind', 1) // CHECK-NEXT: ('st_bind', 1)
// CHECK-NEXT: ('st_type', 0) // CHECK-NEXT: ('st_type', 0)
// CHECK-NEXT: ('st_other', 0) // CHECK-NEXT: ('st_other', 0)