diff options
| -rw-r--r-- | include/llvm/MC/MCExpr.h | 16 | ||||
| -rw-r--r-- | lib/MC/MCExpr.cpp | 22 | ||||
| -rw-r--r-- | lib/MC/MCObjectStreamer.cpp | 8 |
3 files changed, 15 insertions, 31 deletions
diff --git a/include/llvm/MC/MCExpr.h b/include/llvm/MC/MCExpr.h index 5a1ca10dd9..6fa5e17f9a 100644 --- a/include/llvm/MC/MCExpr.h +++ b/include/llvm/MC/MCExpr.h @@ -44,8 +44,7 @@ private: MCExpr(const MCExpr&); // DO NOT IMPLEMENT void operator=(const MCExpr&); // DO NOT IMPLEMENT - bool EvaluateAsAbsolute(int64_t &Res, const MCAssembler *Asm, - const MCAsmLayout *Layout, + bool EvaluateAsAbsolute(int64_t &Res, const MCAsmLayout *Layout, const SectionAddrMap *Addrs) const; protected: explicit MCExpr(ExprKind _Kind) : Kind(_Kind) {} @@ -77,11 +76,16 @@ public: /// values. If not given, then only non-symbolic expressions will be /// evaluated. /// @result - True on success. - bool EvaluateAsAbsolute(int64_t &Res) const; - bool EvaluateAsAbsolute(int64_t &Res, const MCAssembler &Asm) const; - bool EvaluateAsAbsolute(int64_t &Res, const MCAsmLayout &Layout) const; + bool EvaluateAsAbsolute(int64_t &Res) const { + return EvaluateAsAbsolute(Res, 0, 0); + } + bool EvaluateAsAbsolute(int64_t &Res, const MCAsmLayout &Layout) const{ + return EvaluateAsAbsolute(Res, &Layout, 0); + } bool EvaluateAsAbsolute(int64_t &Res, const MCAsmLayout &Layout, - const SectionAddrMap &Addrs) const; + const SectionAddrMap &Addrs) const { + return EvaluateAsAbsolute(Res, &Layout, &Addrs); + } /// EvaluateAsRelocatable - Try to evaluate the expression to a relocatable /// value, i.e. an expression of the fixed form (a - b + constant). diff --git a/lib/MC/MCExpr.cpp b/lib/MC/MCExpr.cpp index eb556937b6..b667369172 100644 --- a/lib/MC/MCExpr.cpp +++ b/lib/MC/MCExpr.cpp @@ -237,27 +237,7 @@ void MCTargetExpr::Anchor() {} /* *** */ -bool MCExpr::EvaluateAsAbsolute(int64_t &Res) const { - return EvaluateAsAbsolute(Res, 0, 0, 0); -} - -bool MCExpr::EvaluateAsAbsolute(int64_t &Res, - const MCAsmLayout &Layout) const { - return EvaluateAsAbsolute(Res, &Layout.getAssembler(), &Layout, 0); -} - -bool MCExpr::EvaluateAsAbsolute(int64_t &Res, - const MCAsmLayout &Layout, - const SectionAddrMap &Addrs) const { - return EvaluateAsAbsolute(Res, &Layout.getAssembler(), &Layout, &Addrs); -} - -bool MCExpr::EvaluateAsAbsolute(int64_t &Res, const MCAssembler &Asm) const { - return EvaluateAsAbsolute(Res, &Asm, 0, 0); -} - -bool MCExpr::EvaluateAsAbsolute(int64_t &Res, const MCAssembler *Asm, - const MCAsmLayout *Layout, +bool MCExpr::EvaluateAsAbsolute(int64_t &Res, const MCAsmLayout *Layout, const SectionAddrMap *Addrs) const { MCValue Value; diff --git a/lib/MC/MCObjectStreamer.cpp b/lib/MC/MCObjectStreamer.cpp index 7d3006a712..571343b0f7 100644 --- a/lib/MC/MCObjectStreamer.cpp +++ b/lib/MC/MCObjectStreamer.cpp @@ -83,7 +83,7 @@ void MCObjectStreamer::EmitValueImpl(const MCExpr *Value, unsigned Size, // Avoid fixups when possible. int64_t AbsValue; - if (AddValueSymbols(Value)->EvaluateAsAbsolute(AbsValue, getAssembler())) { + if (AddValueSymbols(Value)->EvaluateAsAbsolute(AbsValue)) { EmitIntValue(AbsValue, Size, AddrSpace); return; } @@ -114,7 +114,7 @@ void MCObjectStreamer::EmitLabel(MCSymbol *Symbol) { void MCObjectStreamer::EmitULEB128Value(const MCExpr *Value, unsigned AddrSpace) { int64_t IntValue; - if (Value->EvaluateAsAbsolute(IntValue, getAssembler())) { + if (Value->EvaluateAsAbsolute(IntValue)) { EmitULEB128IntValue(IntValue, AddrSpace); return; } @@ -124,7 +124,7 @@ void MCObjectStreamer::EmitULEB128Value(const MCExpr *Value, void MCObjectStreamer::EmitSLEB128Value(const MCExpr *Value, unsigned AddrSpace) { int64_t IntValue; - if (Value->EvaluateAsAbsolute(IntValue, getAssembler())) { + if (Value->EvaluateAsAbsolute(IntValue)) { EmitSLEB128IntValue(IntValue, AddrSpace); return; } @@ -204,7 +204,7 @@ void MCObjectStreamer::EmitDwarfAdvanceLineAddr(int64_t LineDelta, MCBinaryExpr::Create(MCBinaryExpr::Sub, LabelRef, LastLabelRef, getContext()); int64_t Res; - if (AddrDelta->EvaluateAsAbsolute(Res, getAssembler())) { + if (AddrDelta->EvaluateAsAbsolute(Res)) { MCDwarfLineAddr::Emit(this, LineDelta, Res); return; } |