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

Factoring and potential bug fix. The elf "flags" cannot be used as masks.

Browse Source 
For example, setting STT_OBJECT (1) and STT_FUNC (2), should not produce
a STT_SECTION (3).

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@113759 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2010-09-13 17:39:45 +00:00
parent e84727729e
commit f713384be5
1 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
lib/MC/MCELFStreamer.cpp
View File

@@ -147,6 +147,31 @@ void MCELFStreamer::EmitAssignment(MCSymbol *Symbol, const MCExpr *Value) {
Symbol->setVariableValue(AddValueSymbols(Value)); Symbol->setVariableValue(AddValueSymbols(Value));
} }
static void SetBinding(MCSymbolData &SD, unsigned Binding) {
assert(Binding == ELF::STB_LOCAL || Binding == ELF::STB_GLOBAL ||
Binding == ELF::STB_WEAK);
uint32_t OtherFlags = SD.getFlags() & ~(0xf << ELF_STB_Shift);
SD.setFlags(OtherFlags | (Binding << ELF_STB_Shift));
}
static void SetType(MCSymbolData &SD, unsigned Type) {
assert(Type == ELF::STT_NOTYPE || Type == ELF::STT_OBJECT ||
Type == ELF::STT_FUNC || Type == ELF::STT_SECTION ||
Type == ELF::STT_FILE || Type == ELF::STT_COMMON ||
Type == ELF::STT_TLS);
uint32_t OtherFlags = SD.getFlags() & ~(0xf << ELF_STT_Shift);
SD.setFlags(OtherFlags | (Type << ELF_STT_Shift));
}
static void SetVisibility(MCSymbolData &SD, unsigned Visibility) {
assert(Visibility == ELF::STV_DEFAULT || Visibility == ELF::STV_INTERNAL ||
Visibility == ELF::STV_HIDDEN || Visibility == ELF::STV_PROTECTED);
uint32_t OtherFlags = SD.getFlags() & ~(0xf << ELF_STV_Shift);
SD.setFlags(OtherFlags | (Visibility << ELF_STV_Shift));
}
void MCELFStreamer::EmitSymbolAttribute(MCSymbol *Symbol, void MCELFStreamer::EmitSymbolAttribute(MCSymbol *Symbol,
MCSymbolAttr Attribute) { MCSymbolAttr Attribute) {
// Indirect symbols are handled differently, to match how 'as' handles // Indirect symbols are handled differently, to match how 'as' handles
@@ -186,51 +211,49 @@ void MCELFStreamer::EmitSymbolAttribute(MCSymbol *Symbol,
break; break;
case MCSA_Global: case MCSA_Global:
SD.setFlags(SD.getFlags() | ELF_STB_Global); SetBinding(SD, ELF::STB_GLOBAL);
SD.setExternal(true); SD.setExternal(true);
break; break;
case MCSA_WeakReference: case MCSA_WeakReference:
case MCSA_Weak: case MCSA_Weak:
SD.setFlags(SD.getFlags() | ELF_STB_Weak); SetBinding(SD, ELF::STB_WEAK);
break; break;
case MCSA_Local: case MCSA_Local:
// ELF_STB_Local is 0, so zero the ELF_STB area SetBinding(SD, ELF::STB_LOCAL);
// SD.getFlags() | ELF_STB_Local is a NOP
SD.setFlags(SD.getFlags() & ~(0xf << ELF_STB_Shift));
break; break;
case MCSA_ELF_TypeFunction: case MCSA_ELF_TypeFunction:
SD.setFlags(SD.getFlags() | ELF_STT_Func); SetType(SD, ELF::STT_FUNC);
break; break;
case MCSA_ELF_TypeObject: case MCSA_ELF_TypeObject:
SD.setFlags(SD.getFlags() | ELF_STT_Object); SetType(SD, ELF::STT_OBJECT);
break; break;
case MCSA_ELF_TypeTLS: case MCSA_ELF_TypeTLS:
SD.setFlags(SD.getFlags() | ELF_STT_Tls); SetType(SD, ELF::STT_TLS);
break; break;
case MCSA_ELF_TypeCommon: case MCSA_ELF_TypeCommon:
SD.setFlags(SD.getFlags() | ELF_STT_Common); SetType(SD, ELF::STT_COMMON);
break; break;
case MCSA_ELF_TypeNoType: case MCSA_ELF_TypeNoType:
SD.setFlags(SD.getFlags() | ELF_STT_Notype); SetType(SD, ELF::STT_NOTYPE);
break; break;
case MCSA_Protected: case MCSA_Protected:
SD.setFlags(SD.getFlags() | ELF_STV_Protected); SetVisibility(SD, ELF::STV_PROTECTED);
break; break;
case MCSA_Hidden: case MCSA_Hidden:
SD.setFlags(SD.getFlags() | ELF_STV_Hidden); SetVisibility(SD, ELF::STV_HIDDEN);
break; break;
case MCSA_Internal: case MCSA_Internal:
SD.setFlags(SD.getFlags() | ELF_STV_Internal); SetVisibility(SD, ELF::STV_INTERNAL);
break; break;
} }
} }
@@ -253,7 +276,7 @@ void MCELFStreamer::EmitCommonSymbol(MCSymbol *Symbol, uint64_t Size,
SD.setSize(MCConstantExpr::Create(Size, getContext())); SD.setSize(MCConstantExpr::Create(Size, getContext()));
} }
SD.setFlags(SD.getFlags() | ELF_STB_Global); SetBinding(SD, ELF::STB_GLOBAL);
SD.setExternal(true); SD.setExternal(true);
SD.setCommon(Size, ByteAlignment); SD.setCommon(Size, ByteAlignment);