mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-19 02:52:53 +02:00
Move getBaseSymbol somewhere the COFF writer can use.
I will use it there in a second. llvm-svn: 207761
This commit is contained in:
parent
6bf9a37dfb
commit
6b3eacf852
@ -17,6 +17,7 @@ namespace llvm {
|
|||||||
class MCAssembler;
|
class MCAssembler;
|
||||||
class MCFragment;
|
class MCFragment;
|
||||||
class MCSectionData;
|
class MCSectionData;
|
||||||
|
class MCSymbol;
|
||||||
class MCSymbolData;
|
class MCSymbolData;
|
||||||
|
|
||||||
/// Encapsulates the layout of an assembly file at a particular point in time.
|
/// Encapsulates the layout of an assembly file at a particular point in time.
|
||||||
@ -108,6 +109,9 @@ public:
|
|||||||
/// \brief Variant that reports a fatal error if the offset is not computable.
|
/// \brief Variant that reports a fatal error if the offset is not computable.
|
||||||
uint64_t getSymbolOffset(const MCSymbolData *SD) const;
|
uint64_t getSymbolOffset(const MCSymbolData *SD) const;
|
||||||
|
|
||||||
|
/// \brief If this symbol is equivalent to A + Constant, return A.
|
||||||
|
const MCSymbol *getBaseSymbol(const MCSymbol &Symbol) const;
|
||||||
|
|
||||||
/// @}
|
/// @}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -576,29 +576,6 @@ static uint8_t mergeTypeForSet(uint8_t origType, uint8_t newType) {
|
|||||||
return Type;
|
return Type;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const MCSymbol *getBaseSymbol(const MCAsmLayout &Layout,
|
|
||||||
const MCSymbol &Symbol) {
|
|
||||||
if (!Symbol.isVariable())
|
|
||||||
return &Symbol;
|
|
||||||
|
|
||||||
const MCExpr *Expr = Symbol.getVariableValue();
|
|
||||||
MCValue Value;
|
|
||||||
if (!Expr->EvaluateAsValue(Value, &Layout))
|
|
||||||
llvm_unreachable("Invalid Expression");
|
|
||||||
|
|
||||||
const MCSymbolRefExpr *RefB = Value.getSymB();
|
|
||||||
if (RefB)
|
|
||||||
Layout.getAssembler().getContext().FatalError(
|
|
||||||
SMLoc(), Twine("symbol '") + RefB->getSymbol().getName() +
|
|
||||||
"' could not be evaluated in a subtraction expression");
|
|
||||||
|
|
||||||
const MCSymbolRefExpr *A = Value.getSymA();
|
|
||||||
if (!A)
|
|
||||||
return nullptr;
|
|
||||||
|
|
||||||
return &A->getSymbol();
|
|
||||||
}
|
|
||||||
|
|
||||||
void ELFObjectWriter::WriteSymbol(SymbolTableWriter &Writer, ELFSymbolData &MSD,
|
void ELFObjectWriter::WriteSymbol(SymbolTableWriter &Writer, ELFSymbolData &MSD,
|
||||||
const MCAsmLayout &Layout) {
|
const MCAsmLayout &Layout) {
|
||||||
MCSymbolData &OrigData = *MSD.SymbolData;
|
MCSymbolData &OrigData = *MSD.SymbolData;
|
||||||
@ -606,7 +583,7 @@ void ELFObjectWriter::WriteSymbol(SymbolTableWriter &Writer, ELFSymbolData &MSD,
|
|||||||
(&OrigData.getFragment()->getParent()->getSection() ==
|
(&OrigData.getFragment()->getParent()->getSection() ==
|
||||||
&OrigData.getSymbol().getSection())) &&
|
&OrigData.getSymbol().getSection())) &&
|
||||||
"The symbol's section doesn't match the fragment's symbol");
|
"The symbol's section doesn't match the fragment's symbol");
|
||||||
const MCSymbol *Base = getBaseSymbol(Layout, OrigData.getSymbol());
|
const MCSymbol *Base = Layout.getBaseSymbol(OrigData.getSymbol());
|
||||||
|
|
||||||
// This has to be in sync with when computeSymbolTable uses SHN_ABS or
|
// This has to be in sync with when computeSymbolTable uses SHN_ABS or
|
||||||
// SHN_COMMON.
|
// SHN_COMMON.
|
||||||
@ -935,7 +912,7 @@ bool ELFObjectWriter::isInSymtab(const MCAsmLayout &Layout,
|
|||||||
return true;
|
return true;
|
||||||
|
|
||||||
if (Symbol.isVariable()) {
|
if (Symbol.isVariable()) {
|
||||||
const MCSymbol *Base = getBaseSymbol(Layout, Symbol);
|
const MCSymbol *Base = Layout.getBaseSymbol(Symbol);
|
||||||
if (Base && Base->isUndefined())
|
if (Base && Base->isUndefined())
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -1022,7 +999,7 @@ ELFObjectWriter::computeSymbolTable(MCAssembler &Asm, const MCAsmLayout &Layout,
|
|||||||
|
|
||||||
ELFSymbolData MSD;
|
ELFSymbolData MSD;
|
||||||
MSD.SymbolData = &SD;
|
MSD.SymbolData = &SD;
|
||||||
const MCSymbol *BaseSymbol = getBaseSymbol(Layout, Symbol);
|
const MCSymbol *BaseSymbol = Layout.getBaseSymbol(Symbol);
|
||||||
|
|
||||||
// Undefined symbols are global, but this is the first place we
|
// Undefined symbols are global, but this is the first place we
|
||||||
// are able to set it.
|
// are able to set it.
|
||||||
|
@ -180,6 +180,28 @@ uint64_t MCAsmLayout::getSymbolOffset(const MCSymbolData *SD) const {
|
|||||||
return Val;
|
return Val;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const MCSymbol *MCAsmLayout::getBaseSymbol(const MCSymbol &Symbol) const {
|
||||||
|
if (!Symbol.isVariable())
|
||||||
|
return &Symbol;
|
||||||
|
|
||||||
|
const MCExpr *Expr = Symbol.getVariableValue();
|
||||||
|
MCValue Value;
|
||||||
|
if (!Expr->EvaluateAsValue(Value, this))
|
||||||
|
llvm_unreachable("Invalid Expression");
|
||||||
|
|
||||||
|
const MCSymbolRefExpr *RefB = Value.getSymB();
|
||||||
|
if (RefB)
|
||||||
|
Assembler.getContext().FatalError(
|
||||||
|
SMLoc(), Twine("symbol '") + RefB->getSymbol().getName() +
|
||||||
|
"' could not be evaluated in a subtraction expression");
|
||||||
|
|
||||||
|
const MCSymbolRefExpr *A = Value.getSymA();
|
||||||
|
if (!A)
|
||||||
|
return nullptr;
|
||||||
|
|
||||||
|
return &A->getSymbol();
|
||||||
|
}
|
||||||
|
|
||||||
uint64_t MCAsmLayout::getSectionAddressSize(const MCSectionData *SD) const {
|
uint64_t MCAsmLayout::getSectionAddressSize(const MCSectionData *SD) const {
|
||||||
// The size is the last fragment's end offset.
|
// The size is the last fragment's end offset.
|
||||||
const MCFragment &F = SD->getFragmentList().back();
|
const MCFragment &F = SD->getFragmentList().back();
|
||||||
|
Loading…
Reference in New Issue
Block a user