Eliminate the RegSDNode class, which 3 nodes (CopyFromReg/CopyToReg/ImplicitDef)
used to tack a register number onto the node.
Instead of doing this, make a new node, RegisterSDNode, which is a leaf
containing a register number. These three operations just become normal
DAG nodes now, instead of requiring special handling.
Note that with this change, it is no longer correct to make illegal
CopyFromReg/CopyToReg nodes. The legalizer will not touch them, and this
is bad, so don't do it. :)
llvm-svn: 22806
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index 7a790c8..dae19b9 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -250,6 +250,9 @@
case ISD::VALUETYPE:
ValueTypeNodes[cast<VTSDNode>(N)->getVT()] = 0;
break;
+ case ISD::Register:
+ RegNodes[cast<RegisterSDNode>(N)->getReg()] = 0;
+ break;
case ISD::SRCVALUE: {
SrcValueSDNode *SVN = cast<SrcValueSDNode>(N);
ValueNodes.erase(std::make_pair(SVN->getValue(), SVN->getOffset()));
@@ -398,6 +401,20 @@
return SDOperand(CondCodeNodes[Cond], 0);
}
+SDOperand SelectionDAG::getRegister(unsigned Reg, MVT::ValueType VT) {
+ if (Reg >= RegNodes.size())
+ RegNodes.resize(Reg+1);
+ RegisterSDNode *&Result = RegNodes[Reg];
+ if (Result) {
+ assert(Result->getValueType(0) == VT &&
+ "Inconsistent value types for machine registers");
+ } else {
+ Result = new RegisterSDNode(Reg, VT);
+ AllNodes.push_back(Result);
+ }
+ return SDOperand(Result, 0);
+}
+
SDOperand SelectionDAG::SimplifySetCC(MVT::ValueType VT, SDOperand N1,
SDOperand N2, ISD::CondCode Cond) {
// These setcc operations always fold.
@@ -1779,6 +1796,7 @@
case ISD::GlobalAddress: return "GlobalAddress";
case ISD::FrameIndex: return "FrameIndex";
case ISD::BasicBlock: return "BasicBlock";
+ case ISD::Register: return "Register";
case ISD::ExternalSymbol: return "ExternalSymbol";
case ISD::ConstantPool: return "ConstantPoolIndex";
case ISD::CopyToReg: return "CopyToReg";
@@ -1939,8 +1957,8 @@
if (LBB)
std::cerr << LBB->getName() << " ";
std::cerr << (const void*)BBDN->getBasicBlock() << ">";
- } else if (const RegSDNode *C2V = dyn_cast<RegSDNode>(this)) {
- std::cerr << "<reg #" << C2V->getReg() << ">";
+ } else if (const RegisterSDNode *C2V = dyn_cast<RegisterSDNode>(this)) {
+ std::cerr << " #" << C2V->getReg();
} else if (const ExternalSymbolSDNode *ES =
dyn_cast<ExternalSymbolSDNode>(this)) {
std::cerr << "'" << ES->getSymbol() << "'";