mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-02-14 17:34:41 +00:00
Change interface to MachineInstr::substituteValue to specify more precisely
which args can be substituted: defsOnly, defsAndUses or usesOnly. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@7154 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
51bda6fccb
commit
627eb31cd7
@ -646,7 +646,8 @@ public:
|
|||||||
|
|
||||||
|
|
||||||
unsigned substituteValue(const Value* oldVal, Value* newVal,
|
unsigned substituteValue(const Value* oldVal, Value* newVal,
|
||||||
bool defsOnly = true);
|
bool defsOnly, bool notDefsAndUses,
|
||||||
|
bool& someArgsWereIgnored);
|
||||||
|
|
||||||
void setOperandHi32(unsigned i) { operands[i].markHi32(); }
|
void setOperandHi32(unsigned i) { operands[i].markHi32(); }
|
||||||
void setOperandLo32(unsigned i) { operands[i].markLo32(); }
|
void setOperandLo32(unsigned i) { operands[i].markLo32(); }
|
||||||
|
@ -153,29 +153,43 @@ MachineInstr::SetRegForImplicitRef(unsigned i, int regNum)
|
|||||||
|
|
||||||
|
|
||||||
// Subsitute all occurrences of Value* oldVal with newVal in all operands
|
// Subsitute all occurrences of Value* oldVal with newVal in all operands
|
||||||
// and all implicit refs. If defsOnly == true, substitute defs only.
|
// and all implicit refs.
|
||||||
|
// If defsOnly == true, substitute defs only.
|
||||||
unsigned
|
unsigned
|
||||||
MachineInstr::substituteValue(const Value* oldVal, Value* newVal, bool defsOnly)
|
MachineInstr::substituteValue(const Value* oldVal, Value* newVal,
|
||||||
|
bool defsOnly, bool notDefsAndUses,
|
||||||
|
bool& someArgsWereIgnored)
|
||||||
{
|
{
|
||||||
|
assert((defsOnly || !notDefsAndUses) &&
|
||||||
|
"notDefsAndUses is irrelevant if defsOnly == false.");
|
||||||
|
|
||||||
unsigned numSubst = 0;
|
unsigned numSubst = 0;
|
||||||
|
|
||||||
// Subsitute operands
|
// Subsitute operands
|
||||||
for (MachineInstr::val_op_iterator O = begin(), E = end(); O != E; ++O)
|
for (MachineInstr::val_op_iterator O = begin(), E = end(); O != E; ++O)
|
||||||
if (*O == oldVal)
|
if (*O == oldVal)
|
||||||
if (!defsOnly || !O.isUseOnly())
|
if (!defsOnly ||
|
||||||
|
notDefsAndUses && O.isDefOnly() ||
|
||||||
|
!notDefsAndUses && !O.isUseOnly())
|
||||||
{
|
{
|
||||||
O.getMachineOperand().value = newVal;
|
O.getMachineOperand().value = newVal;
|
||||||
++numSubst;
|
++numSubst;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
someArgsWereIgnored = true;
|
||||||
|
|
||||||
// Subsitute implicit refs
|
// Subsitute implicit refs
|
||||||
for (unsigned i=0, N=getNumImplicitRefs(); i < N; ++i)
|
for (unsigned i=0, N=getNumImplicitRefs(); i < N; ++i)
|
||||||
if (getImplicitRef(i) == oldVal)
|
if (getImplicitRef(i) == oldVal)
|
||||||
if (!defsOnly || !getImplicitOp(i).opIsUse())
|
if (!defsOnly ||
|
||||||
|
notDefsAndUses && getImplicitOp(i).opIsDefOnly() ||
|
||||||
|
!notDefsAndUses && !getImplicitOp(i).opIsUse())
|
||||||
{
|
{
|
||||||
getImplicitOp(i).value = newVal;
|
getImplicitOp(i).value = newVal;
|
||||||
++numSubst;
|
++numSubst;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
someArgsWereIgnored = true;
|
||||||
|
|
||||||
return numSubst;
|
return numSubst;
|
||||||
}
|
}
|
||||||
@ -191,10 +205,10 @@ static inline std::ostream&
|
|||||||
OutputValue(std::ostream &os, const Value* val)
|
OutputValue(std::ostream &os, const Value* val)
|
||||||
{
|
{
|
||||||
os << "(val ";
|
os << "(val ";
|
||||||
|
os << (void*) val; // print address always
|
||||||
if (val && val->hasName())
|
if (val && val->hasName())
|
||||||
return os << val->getName() << ")";
|
os << " " << val->getName() << ")"; // print name also, if available
|
||||||
else
|
return os;
|
||||||
return os << (void*) val << ")"; // print address only
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void OutputReg(std::ostream &os, unsigned RegNo,
|
static inline void OutputReg(std::ostream &os, unsigned RegNo,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user