RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

MC: Remove another dead MCAssembler argument, and update clients.

Browse Source 
llvm-svn: 122013
This commit is contained in:
Daniel Dunbar 2010-12-17 01:07:35 +00:00
parent 9f83b4d605
commit 565c90b316
3 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/llvm/MC/MCExpr.h
View File

@ -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).

22
lib/MC/MCExpr.cpp
View File

@ -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;

8
lib/MC/MCObjectStreamer.cpp
View File

@ -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;
}