X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FMC%2FMCSymbol.h;h=137251b63564b9da66ef4e54c61d2a006c0aa34e;hb=f7e0685b9ae2114fae77d0acc0d6fac92c8d9ee4;hp=325afec9feeaed1b537147d37fb2d019fd8a0f78;hpb=63e7baf8f66e94e57c1b8add29edeed9ff63bf38;p=oota-llvm.git diff --git a/include/llvm/MC/MCSymbol.h b/include/llvm/MC/MCSymbol.h index 325afec9fee..137251b6356 100644 --- a/include/llvm/MC/MCSymbol.h +++ b/include/llvm/MC/MCSymbol.h @@ -14,8 +14,8 @@ #ifndef LLVM_MC_MCSYMBOL_H #define LLVM_MC_MCSYMBOL_H -#include "llvm/ADT/PointerIntPair.h" #include "llvm/ADT/StringMap.h" +#include "llvm/MC/MCAssembler.h" #include "llvm/MC/MCExpr.h" #include "llvm/Support/Compiler.h" @@ -44,10 +44,20 @@ class MCSymbol { /// held by the StringMap that lives in MCContext. const StringMapEntry *Name; - /// The section the symbol is defined in. This is null for undefined symbols, - /// and the special AbsolutePseudoSection value for absolute symbols. If this - /// is a variable symbol, this caches the variable value's section. - mutable MCSection *Section; + /// If a symbol has a Fragment, the section is implied, so we only need + /// one pointer. + /// FIXME: We might be able to simplify this by having the asm streamer create + /// dummy fragments. + union { + /// The section the symbol is defined in. This is null for undefined + /// symbols, and the special AbsolutePseudoSection value for absolute + /// symbols. If this is a variable symbol, this caches the variable value's + /// section. + mutable MCSection *Section; + + /// The fragment this symbol's value is relative to, if any. + mutable MCFragment *Fragment; + }; /// Value - If non-null, the value for a variable symbol. const MCExpr *Value; @@ -63,19 +73,20 @@ class MCSymbol { /// IsUsed - True if this symbol has been used. mutable unsigned IsUsed : 1; - mutable bool HasData : 1; + mutable bool IsRegistered : 1; - /// Index field, for use by the object file implementation. - mutable uint64_t Index : 60; + /// This symbol is visible outside this translation unit. + mutable unsigned IsExternal : 1; - /// An expression describing how to calculate the size of a symbol. If a - /// symbol has no size this field will be NULL. - const MCExpr *SymbolSize = nullptr; + /// This symbol is private extern. + mutable unsigned IsPrivateExtern : 1; - /// The alignment of the symbol, if it is 'common', or -1. - // - // FIXME: Pack this in with other fields? - unsigned CommonAlign = -1U; + mutable unsigned HasFragment : 1; + + unsigned IsELF : 1; + + /// Index field, for use by the object file implementation. + mutable uint32_t Index = 0; union { /// The offset to apply to the fragment address to form this symbol's value. @@ -85,46 +96,44 @@ class MCSymbol { uint64_t CommonSize; }; + /// The alignment of the symbol, if it is 'common', or -1. + // + // FIXME: Pack this in with other fields? + unsigned CommonAlign = -1U; + /// The Flags field is used by object file implementations to store /// additional per symbol information which is not easily classified. mutable uint32_t Flags = 0; - /// The fragment this symbol's value is relative to, if any. Also stores if - /// this symbol is visible outside this translation unit (bit 0) or if it is - /// private extern (bit 1). - mutable PointerIntPair Fragment; - -private: // MCContext creates and uniques these. +protected: // MCContext creates and uniques these. friend class MCExpr; friend class MCContext; - MCSymbol(const StringMapEntry *Name, bool isTemporary) + MCSymbol(bool IsELF, const StringMapEntry *Name, bool isTemporary) : Name(Name), Section(nullptr), Value(nullptr), IsTemporary(isTemporary), - IsRedefinable(false), IsUsed(false), HasData(false), Index(0) { + IsRedefinable(false), IsUsed(false), IsRegistered(false), + IsExternal(false), IsPrivateExtern(false), HasFragment(false), + IsELF(IsELF) { Offset = 0; } +private: MCSymbol(const MCSymbol &) = delete; void operator=(const MCSymbol &) = delete; MCSection *getSectionPtr() const { + if (MCFragment *F = getFragment()) + return F->getParent(); + assert(!HasFragment); if (Section || !Value) return Section; - return Section = Value->FindAssociatedSection(); + return Section = Value->findAssociatedSection(); } public: /// getName - Get the symbol name. StringRef getName() const { return Name ? Name->first() : ""; } - bool hasData() const { return HasData; } - - MCSymbol &getData() const { return *const_cast(this); } - - /// Initialize symbol data. - /// - /// Nothing really to do here, but this is enables an assertion that \a - /// MCAssembler::getOrCreateSymbolData() has actually been called before - /// anyone calls \a getData(). - void initializeData() const { HasData = true; } + bool isRegistered() const { return IsRegistered; } + void setIsRegistered(bool Value) const { IsRegistered = Value; } /// \name Accessors /// @{ @@ -145,6 +154,7 @@ public: if (IsRedefinable) { Value = nullptr; Section = nullptr; + HasFragment = false; IsRedefinable = false; } } @@ -177,11 +187,17 @@ public: /// Mark the symbol as defined in the section \p S. void setSection(MCSection &S) { assert(!isVariable() && "Cannot set section of variable"); + assert(!HasFragment); Section = &S; } - /// setUndefined - Mark the symbol as undefined. - void setUndefined() { Section = nullptr; } + /// Mark the symbol as undefined. + void setUndefined() { + HasFragment = false; + Section = nullptr; + } + + bool isELF() const { return IsELF; } /// @} /// \name Variable Symbols @@ -202,22 +218,15 @@ public: /// @} /// Get the (implementation defined) index. - uint64_t getIndex() const { - assert(HasData && "Uninitialized symbol data"); + uint32_t getIndex() const { return Index; } /// Set the (implementation defined) index. - void setIndex(uint64_t Value) const { - assert(HasData && "Uninitialized symbol data"); - assert(!(Value >> 60) && "Not enough bits for value"); + void setIndex(uint32_t Value) const { Index = Value; } - void setSize(const MCExpr *SS) { SymbolSize = SS; } - - const MCExpr *getSize() const { return SymbolSize; } - uint64_t getOffset() const { assert(!isCommon()); return Offset; @@ -263,19 +272,22 @@ public: Flags = (Flags & ~Mask) | Value; } - MCFragment *getFragment() const { return Fragment.getPointer(); } - void setFragment(MCFragment *Value) const { Fragment.setPointer(Value); } - - bool isExternal() const { return Fragment.getInt() & 1; } - void setExternal(bool Value) const { - Fragment.setInt((Fragment.getInt() & ~1) | unsigned(Value)); + MCFragment *getFragment() const { + if (!HasFragment) + return nullptr; + return Fragment; } - - bool isPrivateExtern() const { return Fragment.getInt() & 2; } - void setPrivateExtern(bool Value) { - Fragment.setInt((Fragment.getInt() & ~2) | (unsigned(Value) << 1)); + void setFragment(MCFragment *Value) const { + HasFragment = true; + Fragment = Value; } + bool isExternal() const { return IsExternal; } + void setExternal(bool Value) const { IsExternal = Value; } + + bool isPrivateExtern() const { return IsPrivateExtern; } + void setPrivateExtern(bool Value) { IsPrivateExtern = Value; } + /// print - Print the value to the stream \p OS. void print(raw_ostream &OS) const; @@ -283,8 +295,6 @@ public: void dump() const; }; -typedef MCSymbol MCSymbolData; - inline raw_ostream &operator<<(raw_ostream &OS, const MCSymbol &Sym) { Sym.print(OS); return OS;