6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-10-10 16:24:04 +00:00
Code Issues Projects Releases Wiki Activity

erect abstraction boundaries for accessing SDValue members, rename Val -> Node to reflect semantics

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@55504 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Gabor Greif 2008-08-28 21:40:38 +00:00
parent 205d92589b
commit ba36cb5242
39 changed files with 1194 additions and 1181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/llvm/CodeGen/DAGISelHeader.h
View File

@ -37,7 +37,7 @@ static bool IsChainCompatible(SDNode *Chain, SDNode *Op) {
else if (Chain->getNumOperands() > 0) { else if (Chain->getNumOperands() > 0) {
SDValue C0 = Chain->getOperand(0); SDValue C0 = Chain->getOperand(0);
if (C0.getValueType() == MVT::Other) if (C0.getValueType() == MVT::Other)
return C0.Val != Op && IsChainCompatible(C0.Val, Op); return C0.getNode() != Op && IsChainCompatible(C0.getNode(), Op);
} }
return true; return true;
} }
@ -76,9 +76,9 @@ inline bool isSelected(int Id) {
/// AddToISelQueue - adds a node to the instruction /// AddToISelQueue - adds a node to the instruction
/// selection queue. /// selection queue.
void AddToISelQueue(SDValue N) DISABLE_INLINE { void AddToISelQueue(SDValue N) DISABLE_INLINE {
int Id = N.Val->getNodeId(); int Id = N.getNode()->getNodeId();
if (Id != -1 && !isQueued(Id)) { if (Id != -1 && !isQueued(Id)) {
ISelQueue.push_back(N.Val); ISelQueue.push_back(N.getNode());
std::push_heap(ISelQueue.begin(), ISelQueue.end(), isel_sort()); std::push_heap(ISelQueue.begin(), ISelQueue.end(), isel_sort());
setQueued(Id); setQueued(Id);
} }
@ -120,7 +120,7 @@ inline void UpdateQueue(const ISelQueueUpdater &ISQU) {
void ReplaceUses(SDValue F, SDValue T) DISABLE_INLINE { void ReplaceUses(SDValue F, SDValue T) DISABLE_INLINE {
ISelQueueUpdater ISQU(ISelQueue); ISelQueueUpdater ISQU(ISelQueue);
CurDAG->ReplaceAllUsesOfValueWith(F, T, &ISQU); CurDAG->ReplaceAllUsesOfValueWith(F, T, &ISQU);
setSelected(F.Val->getNodeId()); setSelected(F.getNode()->getNodeId());
UpdateQueue(ISQU); UpdateQueue(ISQU);
} }
@ -131,7 +131,7 @@ void ReplaceUses(const SDValue *F, const SDValue *T,
ISelQueueUpdater ISQU(ISelQueue); ISelQueueUpdater ISQU(ISelQueue);
CurDAG->ReplaceAllUsesOfValuesWith(F, T, Num, &ISQU); CurDAG->ReplaceAllUsesOfValuesWith(F, T, Num, &ISQU);
for (unsigned i = 0; i != Num; ++i) for (unsigned i = 0; i != Num; ++i)
setSelected(F[i].Val->getNodeId()); setSelected(F[i].getNode()->getNodeId());
UpdateQueue(ISQU); UpdateQueue(ISQU);
} }
@ -165,7 +165,7 @@ void SelectRoot() {
// a reference to the root node, preventing it from being deleted, // a reference to the root node, preventing it from being deleted,
// and tracking any changes of the root. // and tracking any changes of the root.
HandleSDNode Dummy(CurDAG->getRoot()); HandleSDNode Dummy(CurDAG->getRoot());
ISelQueue.push_back(CurDAG->getRoot().Val); ISelQueue.push_back(CurDAG->getRoot().getNode());
// Select pending nodes from the instruction selection queue // Select pending nodes from the instruction selection queue
// until no more nodes are left for selection. // until no more nodes are left for selection.

10
include/llvm/CodeGen/SelectionDAG.h
View File

@ -170,7 +170,7 @@ public:
/// setRoot - Set the current root tag of the SelectionDAG. /// setRoot - Set the current root tag of the SelectionDAG.
/// ///
const SDValue &setRoot(SDValue N) { const SDValue &setRoot(SDValue N) {
assert((!N.Val || N.getValueType() == MVT::Other) && assert((!N.getNode() || N.getValueType() == MVT::Other) &&
"DAG root value is not a chain!"); "DAG root value is not a chain!");
return Root = N; return Root = N;
} }
@ -295,7 +295,7 @@ public:
SDValue Flag) { SDValue Flag) {
const MVT *VTs = getNodeValueTypes(MVT::Other, MVT::Flag); const MVT *VTs = getNodeValueTypes(MVT::Other, MVT::Flag);
SDValue Ops[] = { Chain, getRegister(Reg, N.getValueType()), N, Flag }; SDValue Ops[] = { Chain, getRegister(Reg, N.getValueType()), N, Flag };
return getNode(ISD::CopyToReg, VTs, 2, Ops, Flag.Val ? 4 : 3); return getNode(ISD::CopyToReg, VTs, 2, Ops, Flag.getNode() ? 4 : 3);
} }
// Similar to last getCopyToReg() except parameter Reg is a SDValue // Similar to last getCopyToReg() except parameter Reg is a SDValue
@ -303,7 +303,7 @@ public:
SDValue Flag) { SDValue Flag) {
const MVT *VTs = getNodeValueTypes(MVT::Other, MVT::Flag); const MVT *VTs = getNodeValueTypes(MVT::Other, MVT::Flag);
SDValue Ops[] = { Chain, Reg, N, Flag }; SDValue Ops[] = { Chain, Reg, N, Flag };
return getNode(ISD::CopyToReg, VTs, 2, Ops, Flag.Val ? 4 : 3); return getNode(ISD::CopyToReg, VTs, 2, Ops, Flag.getNode() ? 4 : 3);
} }
SDValue getCopyFromReg(SDValue Chain, unsigned Reg, MVT VT) { SDValue getCopyFromReg(SDValue Chain, unsigned Reg, MVT VT) {
@ -319,7 +319,7 @@ public:
SDValue Flag) { SDValue Flag) {
const MVT *VTs = getNodeValueTypes(VT, MVT::Other, MVT::Flag); const MVT *VTs = getNodeValueTypes(VT, MVT::Other, MVT::Flag);
SDValue Ops[] = { Chain, getRegister(Reg, VT), Flag }; SDValue Ops[] = { Chain, getRegister(Reg, VT), Flag };
return getNode(ISD::CopyFromReg, VTs, 3, Ops, Flag.Val ? 3 : 2); return getNode(ISD::CopyFromReg, VTs, 3, Ops, Flag.getNode() ? 3 : 2);
} }
SDValue getCondCode(ISD::CondCode Cond); SDValue getCondCode(ISD::CondCode Cond);
@ -347,7 +347,7 @@ public:
Ops.push_back(Op2); Ops.push_back(Op2);
Ops.push_back(InFlag); Ops.push_back(InFlag);
return getNode(ISD::CALLSEQ_END, NodeTys, &Ops[0], return getNode(ISD::CALLSEQ_END, NodeTys, &Ops[0],
(unsigned)Ops.size() - (InFlag.Val == 0 ? 1 : 0)); (unsigned)Ops.size() - (InFlag.getNode() == 0 ? 1 : 0));
} }
/// getNode - Gets or creates the specified node. /// getNode - Gets or creates the specified node.

61
include/llvm/CodeGen/SelectionDAGNodes.h
View File

@ -837,29 +837,33 @@ namespace ISD {
/// of information is represented with the SDValue value type. /// of information is represented with the SDValue value type.
/// ///
class SDValue { class SDValue {
public: SDNode *Node; // The node defining the value we are using.
SDNode *Val; // The node defining the value we are using.
private:
unsigned ResNo; // Which return value of the node we are using. unsigned ResNo; // Which return value of the node we are using.
public: public:
SDValue() : Val(0), ResNo(0) {} SDValue() : Node(0), ResNo(0) {}
SDValue(SDNode *val, unsigned resno) : Val(val), ResNo(resno) {} SDValue(SDNode *node, unsigned resno) : Node(node), ResNo(resno) {}
/// get the index which selects a specific result in the SDNode /// get the index which selects a specific result in the SDNode
unsigned getResNo() const { return ResNo; } unsigned getResNo() const { return ResNo; }
/// get the SDNode which holds the desired result
SDNode *getNode() const { return Node; }
/// set the SDNode
void setNode(SDNode *N) { Node = N; }
bool operator==(const SDValue &O) const { bool operator==(const SDValue &O) const {
return Val == O.Val && ResNo == O.ResNo; return Node == O.Node && ResNo == O.ResNo;
} }
bool operator!=(const SDValue &O) const { bool operator!=(const SDValue &O) const {
return !operator==(O); return !operator==(O);
} }
bool operator<(const SDValue &O) const { bool operator<(const SDValue &O) const {
return Val < O.Val || (Val == O.Val && ResNo < O.ResNo); return Node < O.Node || (Node == O.Node && ResNo < O.ResNo);
} }
SDValue getValue(unsigned R) const { SDValue getValue(unsigned R) const {
return SDValue(Val, R); return SDValue(Node, R);
} }
// isOperandOf - Return true if this node is an operand of N. // isOperandOf - Return true if this node is an operand of N.
@ -894,12 +898,12 @@ public:
unsigned Depth = 2) const; unsigned Depth = 2) const;
/// use_empty - Return true if there are no nodes using value ResNo /// use_empty - Return true if there are no nodes using value ResNo
/// of node Val. /// of Node.
/// ///
inline bool use_empty() const; inline bool use_empty() const;
/// hasOneUse - Return true if there is exactly one node using value /// hasOneUse - Return true if there is exactly one node using value
/// ResNo of node Val. /// ResNo of Node.
/// ///
inline bool hasOneUse() const; inline bool hasOneUse() const;
}; };
@ -913,8 +917,8 @@ template<> struct DenseMapInfo<SDValue> {
return SDValue((SDNode*)-1, 0); return SDValue((SDNode*)-1, 0);
} }
static unsigned getHashValue(const SDValue &Val) { static unsigned getHashValue(const SDValue &Val) {
return ((unsigned)((uintptr_t)Val.Val >> 4) ^ return ((unsigned)((uintptr_t)Val.getNode() >> 4) ^
(unsigned)((uintptr_t)Val.Val >> 9)) + Val.getResNo(); (unsigned)((uintptr_t)Val.getNode() >> 9)) + Val.getResNo();
} }
static bool isEqual(const SDValue &LHS, const SDValue &RHS) { static bool isEqual(const SDValue &LHS, const SDValue &RHS) {
return LHS == RHS; return LHS == RHS;
@ -927,13 +931,13 @@ template<> struct DenseMapInfo<SDValue> {
template<> struct simplify_type<SDValue> { template<> struct simplify_type<SDValue> {
typedef SDNode* SimpleType; typedef SDNode* SimpleType;
static SimpleType getSimplifiedValue(const SDValue &Val) { static SimpleType getSimplifiedValue(const SDValue &Val) {
return static_cast<SimpleType>(Val.Val); return static_cast<SimpleType>(Val.getNode());
} }
}; };
template<> struct simplify_type<const SDValue> { template<> struct simplify_type<const SDValue> {
typedef SDNode* SimpleType; typedef SDNode* SimpleType;
static SimpleType getSimplifiedValue(const SDValue &Val) { static SimpleType getSimplifiedValue(const SDValue &Val) {
return static_cast<SimpleType>(Val.Val); return static_cast<SimpleType>(Val.getNode());
} }
}; };
@ -977,8 +981,9 @@ public:
const SDValue& getSDValue() const { return Operand; } const SDValue& getSDValue() const { return Operand; }
SDNode *&getVal() { return Operand.Val; } SDValue &getSDValue() { return Operand; }
SDNode *const &getVal() const { return Operand.Val; } SDNode *getVal() { return Operand.getNode(); }
SDNode *getVal() const { return Operand.getNode(); } // FIXME: const correct?
bool operator==(const SDValue &O) const { bool operator==(const SDValue &O) const {
return Operand == O; return Operand == O;
@ -1323,7 +1328,7 @@ protected:
for (unsigned i = 0; i != NumOps; ++i) { for (unsigned i = 0; i != NumOps; ++i) {
OperandList[i] = Ops[i]; OperandList[i] = Ops[i];
OperandList[i].setUser(this); OperandList[i].setUser(this);
Ops[i].Val->addUse(OperandList[i]); Ops[i].getNode()->addUse(OperandList[i]);
} }
ValueList = VTs.VTs; ValueList = VTs.VTs;
@ -1393,34 +1398,34 @@ protected:
// Define inline functions from the SDValue class. // Define inline functions from the SDValue class.
inline unsigned SDValue::getOpcode() const { inline unsigned SDValue::getOpcode() const {
return Val->getOpcode(); return Node->getOpcode();
} }
inline MVT SDValue::getValueType() const { inline MVT SDValue::getValueType() const {
return Val->getValueType(ResNo); return Node->getValueType(ResNo);
} }
inline unsigned SDValue::getNumOperands() const { inline unsigned SDValue::getNumOperands() const {
return Val->getNumOperands(); return Node->getNumOperands();
} }
inline const SDValue &SDValue::getOperand(unsigned i) const { inline const SDValue &SDValue::getOperand(unsigned i) const {
return Val->getOperand(i); return Node->getOperand(i);
} }
inline uint64_t SDValue::getConstantOperandVal(unsigned i) const { inline uint64_t SDValue::getConstantOperandVal(unsigned i) const {
return Val->getConstantOperandVal(i); return Node->getConstantOperandVal(i);
} }
inline bool SDValue::isTargetOpcode() const { inline bool SDValue::isTargetOpcode() const {
return Val->isTargetOpcode(); return Node->isTargetOpcode();
} }
inline bool SDValue::isMachineOpcode() const { inline bool SDValue::isMachineOpcode() const {
return Val->isMachineOpcode(); return Node->isMachineOpcode();
} }
inline unsigned SDValue::getMachineOpcode() const { inline unsigned SDValue::getMachineOpcode() const {
return Val->getMachineOpcode(); return Node->getMachineOpcode();
} }
inline bool SDValue::use_empty() const { inline bool SDValue::use_empty() const {
return !Val->hasAnyUseOfValue(ResNo); return !Node->hasAnyUseOfValue(ResNo);
} }
inline bool SDValue::hasOneUse() const { inline bool SDValue::hasOneUse() const {
return Val->hasNUsesOfValue(1, ResNo); return Node->hasNUsesOfValue(1, ResNo);
} }
/// UnarySDNode - This class is used for single-operand SDNodes. This is solely /// UnarySDNode - This class is used for single-operand SDNodes. This is solely
@ -2321,7 +2326,7 @@ public:
} }
pointer operator*() const { pointer operator*() const {
return Node->getOperand(Operand).Val; return Node->getOperand(Operand).getNode();
} }
pointer operator->() const { return operator*(); } pointer operator->() const { return operator*(); }

8
include/llvm/Target/TargetLowering.h
View File

@ -1086,11 +1086,11 @@ public:
static bool CheckTailCallReturnConstraints(SDValue Call, SDValue Ret) { static bool CheckTailCallReturnConstraints(SDValue Call, SDValue Ret) {
unsigned NumOps = Ret.getNumOperands(); unsigned NumOps = Ret.getNumOperands();
if ((NumOps == 1 && if ((NumOps == 1 &&
(Ret.getOperand(0) == SDValue(Call.Val,1) || (Ret.getOperand(0) == SDValue(Call.getNode(),1) ||
Ret.getOperand(0) == SDValue(Call.Val,0))) || Ret.getOperand(0) == SDValue(Call.getNode(),0))) ||
(NumOps > 1 && (NumOps > 1 &&
Ret.getOperand(0) == SDValue(Call.Val,Call.Val->getNumValues()-1) && Ret.getOperand(0) == SDValue(Call.getNode(),Call.getNode()->getNumValues()-1) &&
Ret.getOperand(1) == SDValue(Call.Val,0))) Ret.getOperand(1) == SDValue(Call.getNode(),0)))
return true; return true;
return false; return false;
} }

598
lib/CodeGen/SelectionDAG/DAGCombiner.cpp
View File

File diff suppressed because it is too large Load Diff

262
lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
View File

@ -260,7 +260,7 @@ SDNode *SelectionDAGLegalize::isShuffleLegal(MVT VT, SDValue Mask) const {
break; break;
} }
} }
return TLI.isShuffleMaskLegal(Mask, VT) ? Mask.Val : 0; return TLI.isShuffleMaskLegal(Mask, VT) ? Mask.getNode() : 0;
} }
SelectionDAGLegalize::SelectionDAGLegalize(SelectionDAG &dag) SelectionDAGLegalize::SelectionDAGLegalize(SelectionDAG &dag)
@ -350,7 +350,7 @@ static SDNode *FindCallStartFromCallEnd(SDNode *Node) {
assert(Node->getOperand(0).getValueType() == MVT::Other && assert(Node->getOperand(0).getValueType() == MVT::Other &&
"Node doesn't have a token chain argument!"); "Node doesn't have a token chain argument!");
return FindCallStartFromCallEnd(Node->getOperand(0).Val); return FindCallStartFromCallEnd(Node->getOperand(0).getNode());
} }
/// LegalizeAllNodesNotLeadingTo - Recursively walk the uses of N, looking to /// LegalizeAllNodesNotLeadingTo - Recursively walk the uses of N, looking to
@ -387,7 +387,7 @@ bool SelectionDAGLegalize::LegalizeAllNodesNotLeadingTo(SDNode *N, SDNode *Dest,
bool OperandsLeadToDest = false; bool OperandsLeadToDest = false;
for (unsigned i = 0, e = N->getNumOperands(); i != e; ++i) for (unsigned i = 0, e = N->getNumOperands(); i != e; ++i)
OperandsLeadToDest |= // If an operand leads to Dest, so do we. OperandsLeadToDest |= // If an operand leads to Dest, so do we.
LegalizeAllNodesNotLeadingTo(N->getOperand(i).Val, Dest, NodesLeadingTo); LegalizeAllNodesNotLeadingTo(N->getOperand(i).getNode(), Dest, NodesLeadingTo);
if (OperandsLeadToDest) { if (OperandsLeadToDest) {
NodesLeadingTo.insert(N); NodesLeadingTo.insert(N);
@ -667,7 +667,7 @@ SDValue SelectionDAGLegalize::UnrollVectorOp(SDValue Op) {
MVT VT = Op.getValueType(); MVT VT = Op.getValueType();
assert(isTypeLegal(VT) && assert(isTypeLegal(VT) &&
"Caller should expand or promote operands that are not legal!"); "Caller should expand or promote operands that are not legal!");
assert(Op.Val->getNumValues() == 1 && assert(Op.getNode()->getNumValues() == 1 &&
"Can't unroll a vector with multiple results!"); "Can't unroll a vector with multiple results!");
unsigned NE = VT.getVectorNumElements(); unsigned NE = VT.getVectorNumElements();
MVT EltVT = VT.getVectorElementType(); MVT EltVT = VT.getVectorElementType();
@ -733,7 +733,7 @@ PerformInsertVectorEltInMemory(SDValue Vec, SDValue Val, SDValue Idx) {
MVT PtrVT = TLI.getPointerTy(); MVT PtrVT = TLI.getPointerTy();
SDValue StackPtr = DAG.CreateStackTemporary(VT); SDValue StackPtr = DAG.CreateStackTemporary(VT);
int SPFI = cast<FrameIndexSDNode>(StackPtr.Val)->getIndex(); int SPFI = cast<FrameIndexSDNode>(StackPtr.getNode())->getIndex();
// Store the vector. // Store the vector.
SDValue Ch = DAG.getStore(DAG.getEntryNode(), Tmp1, StackPtr, SDValue Ch = DAG.getStore(DAG.getEntryNode(), Tmp1, StackPtr,
@ -764,7 +764,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
assert(isTypeLegal(Op.getValueType()) && assert(isTypeLegal(Op.getValueType()) &&
"Caller should expand or promote operands that are not legal!"); "Caller should expand or promote operands that are not legal!");
SDNode *Node = Op.Val; SDNode *Node = Op.getNode();
// If this operation defines any values that cannot be represented in a // If this operation defines any values that cannot be represented in a
// register on this target, make sure to expand or promote them. // register on this target, make sure to expand or promote them.
@ -839,7 +839,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
default: assert(0 && "This action is not supported yet!"); default: assert(0 && "This action is not supported yet!");
case TargetLowering::Custom: case TargetLowering::Custom:
Tmp1 = TLI.LowerOperation(Op, DAG); Tmp1 = TLI.LowerOperation(Op, DAG);
if (Tmp1.Val) Result = Tmp1; if (Tmp1.getNode()) Result = Tmp1;
// FALLTHROUGH if the target doesn't want to lower this op after all. // FALLTHROUGH if the target doesn't want to lower this op after all.
case TargetLowering::Legal: case TargetLowering::Legal:
break; break;
@ -850,7 +850,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
// The only option for these nodes is to custom lower them. If the target // The only option for these nodes is to custom lower them. If the target
// does not custom lower them, then return zero. // does not custom lower them, then return zero.
Tmp1 = TLI.LowerOperation(Op, DAG); Tmp1 = TLI.LowerOperation(Op, DAG);
if (Tmp1.Val) if (Tmp1.getNode())
Result = Tmp1; Result = Tmp1;
else else
Result = DAG.getConstant(0, TLI.getPointerTy()); Result = DAG.getConstant(0, TLI.getPointerTy());
@ -861,7 +861,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
default: assert(0 && "This action is not supported yet!"); default: assert(0 && "This action is not supported yet!");
case TargetLowering::Custom: case TargetLowering::Custom:
Result = TLI.LowerOperation(Op, DAG); Result = TLI.LowerOperation(Op, DAG);
if (Result.Val) break; if (Result.getNode()) break;
// Fall Thru // Fall Thru
case TargetLowering::Legal: case TargetLowering::Legal:
Result = DAG.getConstant(0, VT); Result = DAG.getConstant(0, VT);
@ -881,7 +881,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
break; break;
case TargetLowering::Custom: case TargetLowering::Custom:
Result = TLI.LowerOperation(Op, DAG); Result = TLI.LowerOperation(Op, DAG);
if (Result.Val) break; if (Result.getNode()) break;
// Fall Thru // Fall Thru
case TargetLowering::Legal: { case TargetLowering::Legal: {
SDValue Ops[] = { DAG.getConstant(0, VT), Tmp1 }; SDValue Ops[] = { DAG.getConstant(0, VT), Tmp1 };
@ -890,9 +890,9 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
} }
} }
} }
if (Result.Val->getNumValues() == 1) break; if (Result.getNode()->getNumValues() == 1) break;
assert(Result.Val->getNumValues() == 2 && assert(Result.getNode()->getNumValues() == 2 &&
"Cannot return more than two values!"); "Cannot return more than two values!");
// Since we produced two values, make sure to remember that we // Since we produced two values, make sure to remember that we
@ -915,7 +915,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
break; break;
case TargetLowering::Custom: case TargetLowering::Custom:
Result = TLI.LowerOperation(Op, DAG); Result = TLI.LowerOperation(Op, DAG);
if (Result.Val) break; if (Result.getNode()) break;
// Fall Thru // Fall Thru
case TargetLowering::Legal: { case TargetLowering::Legal: {
SDValue Ops[] = { DAG.getConstant(0, VT), Tmp2 }; SDValue Ops[] = { DAG.getConstant(0, VT), Tmp2 };
@ -924,9 +924,9 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
} }
} }
} }
if (Result.Val->getNumValues() == 1) break; if (Result.getNode()->getNumValues() == 1) break;
assert(Result.Val->getNumValues() == 2 && assert(Result.getNode()->getNumValues() == 2 &&
"Cannot return more than two values!"); "Cannot return more than two values!");
// Since we produced two values, make sure to remember that we // Since we produced two values, make sure to remember that we
@ -943,7 +943,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
default: assert(0 && "This action is not supported at all!"); default: assert(0 && "This action is not supported at all!");
case TargetLowering::Custom: case TargetLowering::Custom:
Result = TLI.LowerOperation(Op, DAG); Result = TLI.LowerOperation(Op, DAG);
if (Result.Val) break; if (Result.getNode()) break;
// Fall Thru // Fall Thru
case TargetLowering::Legal: case TargetLowering::Legal:
// Target does not know, how to lower this, lower to noop // Target does not know, how to lower this, lower to noop
@ -1012,13 +1012,13 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
if (TLI.getOperationAction(Node->getOpcode(), MVT::Other) == if (TLI.getOperationAction(Node->getOpcode(), MVT::Other) ==
TargetLowering::Custom) { TargetLowering::Custom) {
Tmp3 = TLI.LowerOperation(Result, DAG); Tmp3 = TLI.LowerOperation(Result, DAG);
if (Tmp3.Val) Result = Tmp3; if (Tmp3.getNode()) Result = Tmp3;
} }
if (Result.Val->getNumValues() == 1) break; if (Result.getNode()->getNumValues() == 1) break;
// Must have return value and chain result. // Must have return value and chain result.
assert(Result.Val->getNumValues() == 2 && assert(Result.getNode()->getNumValues() == 2 &&
"Cannot return more than two values!"); "Cannot return more than two values!");
// Since loads produce two values, make sure to remember that we // Since loads produce two values, make sure to remember that we
@ -1261,7 +1261,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
Result = TLI.LowerOperation(Result, DAG); Result = TLI.LowerOperation(Result, DAG);
break; break;
case TargetLowering::Expand: case TargetLowering::Expand:
Result = SDValue(TLI.ReplaceNodeResults(Op.Val, DAG),0); Result = SDValue(TLI.ReplaceNodeResults(Op.getNode(), DAG),0);
break; break;
case TargetLowering::Legal: case TargetLowering::Legal:
break; break;
@ -1280,7 +1280,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
if (opAction == TargetLowering::Custom) { if (opAction == TargetLowering::Custom) {
Tmp1 = TLI.LowerOperation(Result, DAG); Tmp1 = TLI.LowerOperation(Result, DAG);
if (Tmp1.Val) if (Tmp1.getNode())
Result = Tmp1; Result = Tmp1;
} }
break; break;
@ -1298,7 +1298,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
break; break;
case TargetLowering::Custom: case TargetLowering::Custom:
Tmp3 = TLI.LowerOperation(Result, DAG); Tmp3 = TLI.LowerOperation(Result, DAG);
if (Tmp3.Val) { if (Tmp3.getNode()) {
Result = Tmp3; Result = Tmp3;
break; break;
} }
@ -1344,27 +1344,27 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
case ISD::CALL: case ISD::CALL:
// The only option for this is to custom lower it. // The only option for this is to custom lower it.
Tmp3 = TLI.LowerOperation(Result.getValue(0), DAG); Tmp3 = TLI.LowerOperation(Result.getValue(0), DAG);
assert(Tmp3.Val && "Target didn't custom lower this node!"); assert(Tmp3.getNode() && "Target didn't custom lower this node!");
// A call within a calling sequence must be legalized to something // A call within a calling sequence must be legalized to something
// other than the normal CALLSEQ_END. Violating this gets Legalize // other than the normal CALLSEQ_END. Violating this gets Legalize
// into an infinite loop. // into an infinite loop.
assert ((!IsLegalizingCall || assert ((!IsLegalizingCall ||
Node->getOpcode() != ISD::CALL || Node->getOpcode() != ISD::CALL ||
Tmp3.Val->getOpcode() != ISD::CALLSEQ_END) && Tmp3.getNode()->getOpcode() != ISD::CALLSEQ_END) &&
"Nested CALLSEQ_START..CALLSEQ_END not supported."); "Nested CALLSEQ_START..CALLSEQ_END not supported.");
// The number of incoming and outgoing values should match; unless the final // The number of incoming and outgoing values should match; unless the final
// outgoing value is a flag. // outgoing value is a flag.
assert((Tmp3.Val->getNumValues() == Result.Val->getNumValues() || assert((Tmp3.getNode()->getNumValues() == Result.getNode()->getNumValues() ||
(Tmp3.Val->getNumValues() == Result.Val->getNumValues() + 1 && (Tmp3.getNode()->getNumValues() == Result.getNode()->getNumValues() + 1 &&
Tmp3.Val->getValueType(Tmp3.Val->getNumValues() - 1) == Tmp3.getNode()->getValueType(Tmp3.getNode()->getNumValues() - 1) ==
MVT::Flag)) && MVT::Flag)) &&
"Lowering call/formal_arguments produced unexpected # results!"); "Lowering call/formal_arguments produced unexpected # results!");
// Since CALL/FORMAL_ARGUMENTS nodes produce multiple values, make sure to // Since CALL/FORMAL_ARGUMENTS nodes produce multiple values, make sure to
// remember that we legalized all of them, so it doesn't get relegalized. // remember that we legalized all of them, so it doesn't get relegalized.
for (unsigned i = 0, e = Tmp3.Val->getNumValues(); i != e; ++i) { for (unsigned i = 0, e = Tmp3.getNode()->getNumValues(); i != e; ++i) {
if (Tmp3.Val->getValueType(i) == MVT::Flag) if (Tmp3.getNode()->getValueType(i) == MVT::Flag)
continue; continue;
Tmp1 = LegalizeOp(Tmp3.getValue(i)); Tmp1 = LegalizeOp(Tmp3.getValue(i));
if (Op.getResNo() == i) if (Op.getResNo() == i)
@ -1394,13 +1394,13 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
default: assert(0 && "This action is not supported yet!"); default: assert(0 && "This action is not supported yet!");
case TargetLowering::Custom: case TargetLowering::Custom:
Tmp3 = TLI.LowerOperation(Result, DAG); Tmp3 = TLI.LowerOperation(Result, DAG);
if (Tmp3.Val) { if (Tmp3.getNode()) {
Result = Tmp3; Result = Tmp3;
break; break;
} }
// FALLTHROUGH // FALLTHROUGH
case TargetLowering::Expand: case TargetLowering::Expand:
Result = ExpandBUILD_VECTOR(Result.Val); Result = ExpandBUILD_VECTOR(Result.getNode());
break; break;
} }
break; break;
@ -1425,7 +1425,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
break; break;
case TargetLowering::Custom: case TargetLowering::Custom:
Tmp4 = TLI.LowerOperation(Result, DAG); Tmp4 = TLI.LowerOperation(Result, DAG);
if (Tmp4.Val) { if (Tmp4.getNode()) {
Result = Tmp4; Result = Tmp4;
break; break;
} }
@ -1485,7 +1485,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
break; break;
case TargetLowering::Custom: case TargetLowering::Custom:
Tmp3 = TLI.LowerOperation(Result, DAG); Tmp3 = TLI.LowerOperation(Result, DAG);
if (Tmp3.Val) { if (Tmp3.getNode()) {
Result = Tmp3; Result = Tmp3;
break; break;
} }
@ -1509,7 +1509,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
break; break;
case TargetLowering::Custom: case TargetLowering::Custom:
Tmp3 = TLI.LowerOperation(Result, DAG); Tmp3 = TLI.LowerOperation(Result, DAG);
if (Tmp3.Val) { if (Tmp3.getNode()) {
Result = Tmp3; Result = Tmp3;
break; break;
} }
@ -1550,7 +1550,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
// Convert the shuffle mask to the right # elements. // Convert the shuffle mask to the right # elements.
Tmp3 = SDValue(isShuffleLegal(OVT, Node->getOperand(2)), 0); Tmp3 = SDValue(isShuffleLegal(OVT, Node->getOperand(2)), 0);
assert(Tmp3.Val && "Shuffle not legal?"); assert(Tmp3.getNode() && "Shuffle not legal?");
Result = DAG.getNode(ISD::VECTOR_SHUFFLE, NVT, Tmp1, Tmp2, Tmp3); Result = DAG.getNode(ISD::VECTOR_SHUFFLE, NVT, Tmp1, Tmp2, Tmp3);
Result = DAG.getNode(ISD::BIT_CONVERT, OVT, Result); Result = DAG.getNode(ISD::BIT_CONVERT, OVT, Result);
break; break;
@ -1580,7 +1580,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
// are inserted *before* the CALLSEQ_START. // are inserted *before* the CALLSEQ_START.
{SmallPtrSet<SDNode*, 32> NodesLeadingTo; {SmallPtrSet<SDNode*, 32> NodesLeadingTo;
for (unsigned i = 0, e = CallEnd->getNumOperands(); i != e; ++i) for (unsigned i = 0, e = CallEnd->getNumOperands(); i != e; ++i)
LegalizeAllNodesNotLeadingTo(CallEnd->getOperand(i).Val, Node, LegalizeAllNodesNotLeadingTo(CallEnd->getOperand(i).getNode(), Node,
NodesLeadingTo); NodesLeadingTo);
} }
@ -1624,7 +1624,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
case ISD::CALLSEQ_END: case ISD::CALLSEQ_END:
// If the CALLSEQ_START node hasn't been legalized first, legalize it. This // If the CALLSEQ_START node hasn't been legalized first, legalize it. This
// will cause this node to be legalized as well as handling libcalls right. // will cause this node to be legalized as well as handling libcalls right.
if (LastCALLSEQ_END.Val != Node) { if (LastCALLSEQ_END.getNode() != Node) {
LegalizeOp(SDValue(FindCallStartFromCallEnd(Node), 0)); LegalizeOp(SDValue(FindCallStartFromCallEnd(Node), 0));
DenseMap<SDValue, SDValue>::iterator I = LegalizedNodes.find(Op); DenseMap<SDValue, SDValue>::iterator I = LegalizedNodes.find(Op);
assert(I != LegalizedNodes.end() && assert(I != LegalizedNodes.end() &&
@ -1708,7 +1708,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
} }
case TargetLowering::Custom: case TargetLowering::Custom:
Tmp3 = TLI.LowerOperation(Tmp1, DAG); Tmp3 = TLI.LowerOperation(Tmp1, DAG);
if (Tmp3.Val) { if (Tmp3.getNode()) {
Tmp1 = LegalizeOp(Tmp3); Tmp1 = LegalizeOp(Tmp3);
Tmp2 = LegalizeOp(Tmp3.getValue(1)); Tmp2 = LegalizeOp(Tmp3.getValue(1));
} }
@ -1797,7 +1797,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
case TargetLowering::Legal: break; case TargetLowering::Legal: break;
case TargetLowering::Custom: case TargetLowering::Custom:
Tmp1 = TLI.LowerOperation(Result, DAG); Tmp1 = TLI.LowerOperation(Result, DAG);
if (Tmp1.Val) Result = Tmp1; if (Tmp1.getNode()) Result = Tmp1;
break; break;
case TargetLowering::Expand: { case TargetLowering::Expand: {
SDValue Chain = Result.getOperand(0); SDValue Chain = Result.getOperand(0);
@ -1866,7 +1866,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
case TargetLowering::Legal: break; case TargetLowering::Legal: break;
case TargetLowering::Custom: case TargetLowering::Custom:
Tmp1 = TLI.LowerOperation(Result, DAG); Tmp1 = TLI.LowerOperation(Result, DAG);
if (Tmp1.Val) Result = Tmp1; if (Tmp1.getNode()) Result = Tmp1;
break; break;
case TargetLowering::Expand: case TargetLowering::Expand:
// Expand brcond's setcc into its constituent parts and create a BR_CC // Expand brcond's setcc into its constituent parts and create a BR_CC
@ -1899,7 +1899,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
// If we didn't get both a LHS and RHS back from LegalizeSetCCOperands, // If we didn't get both a LHS and RHS back from LegalizeSetCCOperands,
// the LHS is a legal SETCC itself. In this case, we need to compare // the LHS is a legal SETCC itself. In this case, we need to compare
// the result against zero to select between true and false values. // the result against zero to select between true and false values.
if (Tmp3.Val == 0) { if (Tmp3.getNode() == 0) {
Tmp3 = DAG.getConstant(0, Tmp2.getValueType()); Tmp3 = DAG.getConstant(0, Tmp2.getValueType());
Tmp4 = DAG.getCondCode(ISD::SETNE); Tmp4 = DAG.getCondCode(ISD::SETNE);
} }
@ -1912,7 +1912,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
case TargetLowering::Legal: break; case TargetLowering::Legal: break;
case TargetLowering::Custom: case TargetLowering::Custom:
Tmp4 = TLI.LowerOperation(Result, DAG); Tmp4 = TLI.LowerOperation(Result, DAG);
if (Tmp4.Val) Result = Tmp4; if (Tmp4.getNode()) Result = Tmp4;
break; break;
} }
break; break;
@ -1937,7 +1937,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
unsigned ABIAlignment = TLI.getTargetData()-> unsigned ABIAlignment = TLI.getTargetData()->
getABITypeAlignment(LD->getMemoryVT().getTypeForMVT()); getABITypeAlignment(LD->getMemoryVT().getTypeForMVT());
if (LD->getAlignment() < ABIAlignment){ if (LD->getAlignment() < ABIAlignment){
Result = ExpandUnalignedLoad(cast<LoadSDNode>(Result.Val), DAG, Result = ExpandUnalignedLoad(cast<LoadSDNode>(Result.getNode()), DAG,
TLI); TLI);
Tmp3 = Result.getOperand(0); Tmp3 = Result.getOperand(0);
Tmp4 = Result.getOperand(1); Tmp4 = Result.getOperand(1);
@ -1948,7 +1948,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
break; break;
case TargetLowering::Custom: case TargetLowering::Custom:
Tmp1 = TLI.LowerOperation(Tmp3, DAG); Tmp1 = TLI.LowerOperation(Tmp3, DAG);
if (Tmp1.Val) { if (Tmp1.getNode()) {
Tmp3 = LegalizeOp(Tmp1); Tmp3 = LegalizeOp(Tmp1);
Tmp4 = LegalizeOp(Tmp1.getValue(1)); Tmp4 = LegalizeOp(Tmp1.getValue(1));
} }
@ -2105,7 +2105,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
if (isCustom) { if (isCustom) {
Tmp3 = TLI.LowerOperation(Result, DAG); Tmp3 = TLI.LowerOperation(Result, DAG);
if (Tmp3.Val) { if (Tmp3.getNode()) {
Tmp1 = LegalizeOp(Tmp3); Tmp1 = LegalizeOp(Tmp3);
Tmp2 = LegalizeOp(Tmp3.getValue(1)); Tmp2 = LegalizeOp(Tmp3.getValue(1));
} }
@ -2116,7 +2116,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
unsigned ABIAlignment = TLI.getTargetData()-> unsigned ABIAlignment = TLI.getTargetData()->
getABITypeAlignment(LD->getMemoryVT().getTypeForMVT()); getABITypeAlignment(LD->getMemoryVT().getTypeForMVT());
if (LD->getAlignment() < ABIAlignment){ if (LD->getAlignment() < ABIAlignment){
Result = ExpandUnalignedLoad(cast<LoadSDNode>(Result.Val), DAG, Result = ExpandUnalignedLoad(cast<LoadSDNode>(Result.getNode()), DAG,
TLI); TLI);
Tmp1 = Result.getOperand(0); Tmp1 = Result.getOperand(0);
Tmp2 = Result.getOperand(1); Tmp2 = Result.getOperand(1);
@ -2244,13 +2244,13 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
if (TLI.isBigEndian()) if (TLI.isBigEndian())
std::swap(Lo, Hi); std::swap(Lo, Hi);
if (Hi.Val) if (Hi.getNode())
Result = DAG.getNode(ISD::RET, MVT::Other, Tmp1, Lo, Tmp3, Hi,Tmp3); Result = DAG.getNode(ISD::RET, MVT::Other, Tmp1, Lo, Tmp3, Hi,Tmp3);
else else
Result = DAG.getNode(ISD::RET, MVT::Other, Tmp1, Lo, Tmp3); Result = DAG.getNode(ISD::RET, MVT::Other, Tmp1, Lo, Tmp3);
Result = LegalizeOp(Result); Result = LegalizeOp(Result);
} else { } else {
SDNode *InVal = Tmp2.Val; SDNode *InVal = Tmp2.getNode();
int InIx = Tmp2.getResNo(); int InIx = Tmp2.getResNo();
unsigned NumElems = InVal->getValueType(InIx).getVectorNumElements(); unsigned NumElems = InVal->getValueType(InIx).getVectorNumElements();
MVT EVT = InVal->getValueType(InIx).getVectorElementType(); MVT EVT = InVal->getValueType(InIx).getVectorElementType();
@ -2310,7 +2310,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
ExpandOp(Node->getOperand(i), Lo, Hi); ExpandOp(Node->getOperand(i), Lo, Hi);
NewValues.push_back(Lo); NewValues.push_back(Lo);
NewValues.push_back(Node->getOperand(i+1)); NewValues.push_back(Node->getOperand(i+1));
if (Hi.Val) { if (Hi.getNode()) {
NewValues.push_back(Hi); NewValues.push_back(Hi);
NewValues.push_back(Node->getOperand(i+1)); NewValues.push_back(Node->getOperand(i+1));
} }
@ -2335,7 +2335,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
case TargetLowering::Legal: break; case TargetLowering::Legal: break;
case TargetLowering::Custom: case TargetLowering::Custom:
Tmp1 = TLI.LowerOperation(Result, DAG); Tmp1 = TLI.LowerOperation(Result, DAG);
if (Tmp1.Val) Result = Tmp1; if (Tmp1.getNode()) Result = Tmp1;
break; break;
} }
} }
@ -2411,13 +2411,13 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
unsigned ABIAlignment = TLI.getTargetData()-> unsigned ABIAlignment = TLI.getTargetData()->
getABITypeAlignment(ST->getMemoryVT().getTypeForMVT()); getABITypeAlignment(ST->getMemoryVT().getTypeForMVT());
if (ST->getAlignment() < ABIAlignment) if (ST->getAlignment() < ABIAlignment)
Result = ExpandUnalignedStore(cast<StoreSDNode>(Result.Val), DAG, Result = ExpandUnalignedStore(cast<StoreSDNode>(Result.getNode()), DAG,
TLI); TLI);
} }
break; break;
case TargetLowering::Custom: case TargetLowering::Custom:
Tmp1 = TLI.LowerOperation(Result, DAG); Tmp1 = TLI.LowerOperation(Result, DAG);
if (Tmp1.Val) Result = Tmp1; if (Tmp1.getNode()) Result = Tmp1;
break; break;
case TargetLowering::Promote: case TargetLowering::Promote:
assert(VT.isVector() && "Unknown legal promote case!"); assert(VT.isVector() && "Unknown legal promote case!");
@ -2446,7 +2446,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
// the product of the element size in bytes, and the number of elements // the product of the element size in bytes, and the number of elements
// in the high half of the vector. // in the high half of the vector.
if (ST->getValue().getValueType().isVector()) { if (ST->getValue().getValueType().isVector()) {
SDNode *InVal = ST->getValue().Val; SDNode *InVal = ST->getValue().getNode();
int InIx = ST->getValue().getResNo(); int InIx = ST->getValue().getResNo();
MVT InVT = InVal->getValueType(InIx); MVT InVT = InVal->getValueType(InIx);
unsigned NumElems = InVT.getVectorNumElements(); unsigned NumElems = InVT.getVectorNumElements();
@ -2473,12 +2473,12 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
break; break;
} else { } else {
SplitVectorOp(ST->getValue(), Lo, Hi); SplitVectorOp(ST->getValue(), Lo, Hi);
IncrementSize = Lo.Val->getValueType(0).getVectorNumElements() * IncrementSize = Lo.getNode()->getValueType(0).getVectorNumElements() *
EVT.getSizeInBits()/8; EVT.getSizeInBits()/8;
} }
} else { } else {
ExpandOp(ST->getValue(), Lo, Hi); ExpandOp(ST->getValue(), Lo, Hi);
IncrementSize = Hi.Val ? Hi.getValueType().getSizeInBits()/8 : 0; IncrementSize = Hi.getNode() ? Hi.getValueType().getSizeInBits()/8 : 0;
if (TLI.isBigEndian()) if (TLI.isBigEndian())
std::swap(Lo, Hi); std::swap(Lo, Hi);
@ -2487,7 +2487,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
Lo = DAG.getStore(Tmp1, Lo, Tmp2, ST->getSrcValue(), Lo = DAG.getStore(Tmp1, Lo, Tmp2, ST->getSrcValue(),
SVOffset, isVolatile, Alignment); SVOffset, isVolatile, Alignment);
if (Hi.Val == NULL) { if (Hi.getNode() == NULL) {
// Must be int <-> float one-to-one expansion. // Must be int <-> float one-to-one expansion.
Result = Lo; Result = Lo;
break; break;
@ -2598,7 +2598,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
unsigned ABIAlignment = TLI.getTargetData()-> unsigned ABIAlignment = TLI.getTargetData()->
getABITypeAlignment(ST->getMemoryVT().getTypeForMVT()); getABITypeAlignment(ST->getMemoryVT().getTypeForMVT());
if (ST->getAlignment() < ABIAlignment) if (ST->getAlignment() < ABIAlignment)
Result = ExpandUnalignedStore(cast<StoreSDNode>(Result.Val), DAG, Result = ExpandUnalignedStore(cast<StoreSDNode>(Result.getNode()), DAG,
TLI); TLI);
} }
break; break;
@ -2632,7 +2632,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
case TargetLowering::Legal: break; case TargetLowering::Legal: break;
case TargetLowering::Custom: case TargetLowering::Custom:
Tmp3 = TLI.LowerOperation(Result, DAG); Tmp3 = TLI.LowerOperation(Result, DAG);
if (Tmp3.Val) { if (Tmp3.getNode()) {
Tmp1 = LegalizeOp(Tmp3); Tmp1 = LegalizeOp(Tmp3);
Tmp2 = LegalizeOp(Tmp3.getValue(1)); Tmp2 = LegalizeOp(Tmp3.getValue(1));
} }
@ -2667,7 +2667,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
case TargetLowering::Legal: break; case TargetLowering::Legal: break;
case TargetLowering::Custom: case TargetLowering::Custom:
Tmp1 = TLI.LowerOperation(Result, DAG); Tmp1 = TLI.LowerOperation(Result, DAG);
if (Tmp1.Val) Result = Tmp1; if (Tmp1.getNode()) Result = Tmp1;
break; break;
case TargetLowering::Expand: case TargetLowering::Expand:
// Expand to CopyToReg if the target set // Expand to CopyToReg if the target set
@ -2730,7 +2730,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
case TargetLowering::Legal: break; case TargetLowering::Legal: break;
case TargetLowering::Custom: { case TargetLowering::Custom: {
Tmp1 = TLI.LowerOperation(Result, DAG); Tmp1 = TLI.LowerOperation(Result, DAG);
if (Tmp1.Val) Result = Tmp1; if (Tmp1.getNode()) Result = Tmp1;
break; break;
} }
case TargetLowering::Expand: case TargetLowering::Expand:
@ -2784,7 +2784,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
// If we didn't get both a LHS and RHS back from LegalizeSetCCOperands, // If we didn't get both a LHS and RHS back from LegalizeSetCCOperands,
// the LHS is a legal SETCC itself. In this case, we need to compare // the LHS is a legal SETCC itself. In this case, we need to compare
// the result against zero to select between true and false values. // the result against zero to select between true and false values.
if (Tmp2.Val == 0) { if (Tmp2.getNode() == 0) {
Tmp2 = DAG.getConstant(0, Tmp1.getValueType()); Tmp2 = DAG.getConstant(0, Tmp1.getValueType());
CC = DAG.getCondCode(ISD::SETNE); CC = DAG.getCondCode(ISD::SETNE);
} }
@ -2796,7 +2796,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
case TargetLowering::Legal: break; case TargetLowering::Legal: break;
case TargetLowering::Custom: case TargetLowering::Custom:
Tmp1 = TLI.LowerOperation(Result, DAG); Tmp1 = TLI.LowerOperation(Result, DAG);
if (Tmp1.Val) Result = Tmp1; if (Tmp1.getNode()) Result = Tmp1;
break; break;
} }
break; break;
@ -2810,7 +2810,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
// If we had to Expand the SetCC operands into a SELECT node, then it may // If we had to Expand the SetCC operands into a SELECT node, then it may
// not always be possible to return a true LHS & RHS. In this case, just // not always be possible to return a true LHS & RHS. In this case, just
// return the value we legalized, returned in the LHS // return the value we legalized, returned in the LHS
if (Tmp2.Val == 0) { if (Tmp2.getNode() == 0) {
Result = Tmp1; Result = Tmp1;
break; break;
} }
@ -2824,7 +2824,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
Result = DAG.UpdateNodeOperands(Result, Tmp1, Tmp2, Tmp3); Result = DAG.UpdateNodeOperands(Result, Tmp1, Tmp2, Tmp3);
if (isCustom) { if (isCustom) {
Tmp4 = TLI.LowerOperation(Result, DAG); Tmp4 = TLI.LowerOperation(Result, DAG);
if (Tmp4.Val) Result = Tmp4; if (Tmp4.getNode()) Result = Tmp4;
} }
break; break;
case TargetLowering::Promote: { case TargetLowering::Promote: {
@ -2882,7 +2882,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
case TargetLowering::Legal: break; case TargetLowering::Legal: break;
case TargetLowering::Custom: case TargetLowering::Custom:
Tmp1 = TLI.LowerOperation(Result, DAG); Tmp1 = TLI.LowerOperation(Result, DAG);
if (Tmp1.Val) Result = Tmp1; if (Tmp1.getNode()) Result = Tmp1;
break; break;
} }
break; break;
@ -2906,7 +2906,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
case TargetLowering::Legal: break; case TargetLowering::Legal: break;
case TargetLowering::Custom: case TargetLowering::Custom:
Tmp1 = TLI.LowerOperation(Result, DAG); Tmp1 = TLI.LowerOperation(Result, DAG);
if (Tmp1.Val) { if (Tmp1.getNode()) {
SDValue Tmp2, RetVal(0, 0); SDValue Tmp2, RetVal(0, 0);
for (unsigned i = 0, e = Node->getNumValues(); i != e; ++i) { for (unsigned i = 0, e = Node->getNumValues(); i != e; ++i) {
Tmp2 = LegalizeOp(Tmp1.getValue(i)); Tmp2 = LegalizeOp(Tmp1.getValue(i));
@ -2914,7 +2914,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
if (i == Op.getResNo()) if (i == Op.getResNo())
RetVal = Tmp2; RetVal = Tmp2;
} }
assert(RetVal.Val && "Illegal result number"); assert(RetVal.getNode() && "Illegal result number");
return RetVal; return RetVal;
} }
break; break;
@ -2974,7 +2974,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
case TargetLowering::Legal: break; case TargetLowering::Legal: break;
case TargetLowering::Custom: case TargetLowering::Custom:
Tmp1 = TLI.LowerOperation(Result, DAG); Tmp1 = TLI.LowerOperation(Result, DAG);
if (Tmp1.Val) { if (Tmp1.getNode()) {
Result = Tmp1; Result = Tmp1;
break; break;
} }
@ -3004,28 +3004,28 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
OpToUse = ISD::UMUL_LOHI; OpToUse = ISD::UMUL_LOHI;
} }
if (OpToUse) { if (OpToUse) {
Result = SDValue(DAG.getNode(OpToUse, VTs, Tmp1, Tmp2).Val, 0); Result = SDValue(DAG.getNode(OpToUse, VTs, Tmp1, Tmp2).getNode(), 0);
break; break;
} }
} }
if (Node->getOpcode() == ISD::MULHS && if (Node->getOpcode() == ISD::MULHS &&
TLI.isOperationLegal(ISD::SMUL_LOHI, VT)) { TLI.isOperationLegal(ISD::SMUL_LOHI, VT)) {
Result = SDValue(DAG.getNode(ISD::SMUL_LOHI, VTs, Tmp1, Tmp2).Val, 1); Result = SDValue(DAG.getNode(ISD::SMUL_LOHI, VTs, Tmp1, Tmp2).getNode(), 1);
break; break;
} }
if (Node->getOpcode() == ISD::MULHU && if (Node->getOpcode() == ISD::MULHU &&
TLI.isOperationLegal(ISD::UMUL_LOHI, VT)) { TLI.isOperationLegal(ISD::UMUL_LOHI, VT)) {
Result = SDValue(DAG.getNode(ISD::UMUL_LOHI, VTs, Tmp1, Tmp2).Val, 1); Result = SDValue(DAG.getNode(ISD::UMUL_LOHI, VTs, Tmp1, Tmp2).getNode(), 1);
break; break;
} }
if (Node->getOpcode() == ISD::SDIV && if (Node->getOpcode() == ISD::SDIV &&
TLI.isOperationLegal(ISD::SDIVREM, VT)) { TLI.isOperationLegal(ISD::SDIVREM, VT)) {
Result = SDValue(DAG.getNode(ISD::SDIVREM, VTs, Tmp1, Tmp2).Val, 0); Result = SDValue(DAG.getNode(ISD::SDIVREM, VTs, Tmp1, Tmp2).getNode(), 0);
break; break;
} }
if (Node->getOpcode() == ISD::UDIV && if (Node->getOpcode() == ISD::UDIV &&
TLI.isOperationLegal(ISD::UDIVREM, VT)) { TLI.isOperationLegal(ISD::UDIVREM, VT)) {
Result = SDValue(DAG.getNode(ISD::UDIVREM, VTs, Tmp1, Tmp2).Val, 0); Result = SDValue(DAG.getNode(ISD::UDIVREM, VTs, Tmp1, Tmp2).getNode(), 0);
break; break;
} }
@ -3113,7 +3113,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
default: assert(0 && "Operation not supported"); default: assert(0 && "Operation not supported");
case TargetLowering::Custom: case TargetLowering::Custom:
Tmp1 = TLI.LowerOperation(Result, DAG); Tmp1 = TLI.LowerOperation(Result, DAG);
if (Tmp1.Val) Result = Tmp1; if (Tmp1.getNode()) Result = Tmp1;
break; break;
case TargetLowering::Legal: break; case TargetLowering::Legal: break;
case TargetLowering::Expand: { case TargetLowering::Expand: {
@ -3216,7 +3216,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
Result = DAG.UpdateNodeOperands(Result, Tmp1, Tmp2); Result = DAG.UpdateNodeOperands(Result, Tmp1, Tmp2);
if (isCustom) { if (isCustom) {
Tmp1 = TLI.LowerOperation(Result, DAG); Tmp1 = TLI.LowerOperation(Result, DAG);
if (Tmp1.Val) Result = Tmp1; if (Tmp1.getNode()) Result = Tmp1;
} }
break; break;
case TargetLowering::Expand: { case TargetLowering::Expand: {
@ -3228,12 +3228,12 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
SDVTList VTs = DAG.getVTList(VT, VT); SDVTList VTs = DAG.getVTList(VT, VT);
if (Node->getOpcode() == ISD::SREM && if (Node->getOpcode() == ISD::SREM &&
TLI.isOperationLegal(ISD::SDIVREM, VT)) { TLI.isOperationLegal(ISD::SDIVREM, VT)) {
Result = SDValue(DAG.getNode(ISD::SDIVREM, VTs, Tmp1, Tmp2).Val, 1); Result = SDValue(DAG.getNode(ISD::SDIVREM, VTs, Tmp1, Tmp2).getNode(), 1);
break; break;
} }
if (Node->getOpcode() == ISD::UREM && if (Node->getOpcode() == ISD::UREM &&
TLI.isOperationLegal(ISD::UDIVREM, VT)) { TLI.isOperationLegal(ISD::UDIVREM, VT)) {
Result = SDValue(DAG.getNode(ISD::UDIVREM, VTs, Tmp1, Tmp2).Val, 1); Result = SDValue(DAG.getNode(ISD::UDIVREM, VTs, Tmp1, Tmp2).getNode(), 1);
break; break;
} }
@ -3288,7 +3288,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
if (isCustom) { if (isCustom) {
Tmp2 = TLI.LowerOperation(Result, DAG); Tmp2 = TLI.LowerOperation(Result, DAG);
if (Tmp2.Val) { if (Tmp2.getNode()) {
Result = LegalizeOp(Tmp2); Result = LegalizeOp(Tmp2);
Tmp1 = LegalizeOp(Tmp2.getValue(1)); Tmp1 = LegalizeOp(Tmp2.getValue(1));
} }
@ -3332,7 +3332,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
Node->getOperand(3), Node->getOperand(4)); Node->getOperand(3), Node->getOperand(4));
if (isCustom) { if (isCustom) {
Tmp1 = TLI.LowerOperation(Result, DAG); Tmp1 = TLI.LowerOperation(Result, DAG);
if (Tmp1.Val) Result = Tmp1; if (Tmp1.getNode()) Result = Tmp1;
} }
break; break;
case TargetLowering::Expand: case TargetLowering::Expand:
@ -3359,7 +3359,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
Result = DAG.UpdateNodeOperands(Result, Tmp1, Tmp2, Node->getOperand(2)); Result = DAG.UpdateNodeOperands(Result, Tmp1, Tmp2, Node->getOperand(2));
if (isCustom) { if (isCustom) {
Tmp1 = TLI.LowerOperation(Tmp1, DAG); Tmp1 = TLI.LowerOperation(Tmp1, DAG);
if (Tmp1.Val) Result = Tmp1; if (Tmp1.getNode()) Result = Tmp1;
} }
break; break;
case TargetLowering::Expand: case TargetLowering::Expand:
@ -3379,7 +3379,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
case TargetLowering::Legal: break; case TargetLowering::Legal: break;
case TargetLowering::Custom: case TargetLowering::Custom:
Tmp1 = TLI.LowerOperation(Result, DAG); Tmp1 = TLI.LowerOperation(Result, DAG);
if (Tmp1.Val) Result = Tmp1; if (Tmp1.getNode()) Result = Tmp1;
break; break;
} }
break; break;
@ -3397,7 +3397,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
break; break;
case TargetLowering::Custom: case TargetLowering::Custom:
Tmp1 = TLI.LowerOperation(Result, DAG); Tmp1 = TLI.LowerOperation(Result, DAG);
if (Tmp1.Val) Result = Tmp1; if (Tmp1.getNode()) Result = Tmp1;
break; break;
case TargetLowering::Promote: case TargetLowering::Promote:
assert(0 && "Do not know how to promote ROTL/ROTR"); assert(0 && "Do not know how to promote ROTL/ROTR");
@ -3444,7 +3444,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
if (TLI.getOperationAction(Node->getOpcode(), Node->getValueType(0)) == if (TLI.getOperationAction(Node->getOpcode(), Node->getValueType(0)) ==
TargetLowering::Custom) { TargetLowering::Custom) {
Tmp1 = TLI.LowerOperation(Result, DAG); Tmp1 = TLI.LowerOperation(Result, DAG);
if (Tmp1.Val) { if (Tmp1.getNode()) {
Result = Tmp1; Result = Tmp1;
} }
} }
@ -3505,7 +3505,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
Result = DAG.UpdateNodeOperands(Result, Tmp1); Result = DAG.UpdateNodeOperands(Result, Tmp1);
if (isCustom) { if (isCustom) {
Tmp1 = TLI.LowerOperation(Result, DAG); Tmp1 = TLI.LowerOperation(Result, DAG);
if (Tmp1.Val) Result = Tmp1; if (Tmp1.getNode()) Result = Tmp1;
} }
break; break;
case TargetLowering::Expand: case TargetLowering::Expand:
@ -3609,7 +3609,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
} else if (Op.getOperand(0).getValueType().isVector()) { } else if (Op.getOperand(0).getValueType().isVector()) {
// The input has to be a vector type, we have to either scalarize it, pack // The input has to be a vector type, we have to either scalarize it, pack
// it, or convert it based on whether the input vector type is legal. // it, or convert it based on whether the input vector type is legal.
SDNode *InVal = Node->getOperand(0).Val; SDNode *InVal = Node->getOperand(0).getNode();
int InIx = Node->getOperand(0).getResNo(); int InIx = Node->getOperand(0).getResNo();
unsigned NumElems = InVal->getValueType(InIx).getVectorNumElements(); unsigned NumElems = InVal->getValueType(InIx).getVectorNumElements();
MVT EVT = InVal->getValueType(InIx).getVectorElementType(); MVT EVT = InVal->getValueType(InIx).getVectorElementType();
@ -3690,7 +3690,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
Result = DAG.UpdateNodeOperands(Result, Tmp1); Result = DAG.UpdateNodeOperands(Result, Tmp1);
if (isCustom) { if (isCustom) {
Tmp1 = TLI.LowerOperation(Result, DAG); Tmp1 = TLI.LowerOperation(Result, DAG);
if (Tmp1.Val) Result = Tmp1; if (Tmp1.getNode()) Result = Tmp1;
} }
break; break;
case TargetLowering::Promote: case TargetLowering::Promote:
@ -3832,7 +3832,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
if (TLI.getOperationAction(Node->getOpcode(), Node->getValueType(0)) == if (TLI.getOperationAction(Node->getOpcode(), Node->getValueType(0)) ==
TargetLowering::Custom) { TargetLowering::Custom) {
Tmp1 = TLI.LowerOperation(Result, DAG); Tmp1 = TLI.LowerOperation(Result, DAG);
if (Tmp1.Val) Result = Tmp1; if (Tmp1.getNode()) Result = Tmp1;
} }
break; break;
case Promote: case Promote:
@ -3904,7 +3904,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
Result = DAG.UpdateNodeOperands(Result, Ops, 6); Result = DAG.UpdateNodeOperands(Result, Ops, 6);
// The only option for this node is to custom lower it. // The only option for this node is to custom lower it.
Result = TLI.LowerOperation(Result, DAG); Result = TLI.LowerOperation(Result, DAG);
assert(Result.Val && "Should always custom lower!"); assert(Result.getNode() && "Should always custom lower!");
// Since trampoline produces two values, make sure to remember that we // Since trampoline produces two values, make sure to remember that we
// legalized both of them. // legalized both of them.
@ -3920,7 +3920,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
default: assert(0 && "This action not supported for this op yet!"); default: assert(0 && "This action not supported for this op yet!");
case TargetLowering::Custom: case TargetLowering::Custom:
Result = TLI.LowerOperation(Op, DAG); Result = TLI.LowerOperation(Op, DAG);
if (Result.Val) break; if (Result.getNode()) break;
// Fall Thru // Fall Thru
case TargetLowering::Legal: case TargetLowering::Legal:
// If this operation is not supported, lower it to constant 1 // If this operation is not supported, lower it to constant 1
@ -3939,7 +3939,7 @@ SDValue SelectionDAGLegalize::LegalizeOp(SDValue Op) {
break; break;
case TargetLowering::Custom: case TargetLowering::Custom:
Result = TLI.LowerOperation(Op, DAG); Result = TLI.LowerOperation(Op, DAG);
if (Result.Val) break; if (Result.getNode()) break;
// Fall Thru // Fall Thru
case TargetLowering::Expand: case TargetLowering::Expand:
// If this operation is not supported, lower it to 'abort()' call // If this operation is not supported, lower it to 'abort()' call
@ -3984,7 +3984,7 @@ SDValue SelectionDAGLegalize::PromoteOp(SDValue Op) {
SDValue Tmp1, Tmp2, Tmp3; SDValue Tmp1, Tmp2, Tmp3;
SDValue Result; SDValue Result;
SDNode *Node = Op.Val; SDNode *Node = Op.getNode();
DenseMap<SDValue, SDValue>::iterator I = PromotedNodes.find(Op); DenseMap<SDValue, SDValue>::iterator I = PromotedNodes.find(Op);
if (I != PromotedNodes.end()) return I->second; if (I != PromotedNodes.end()) return I->second;
@ -4461,7 +4461,7 @@ SDValue SelectionDAGLegalize::PromoteOp(SDValue Op) {
break; break;
} }
assert(Result.Val && "Didn't set a result!"); assert(Result.getNode() && "Didn't set a result!");
// Make sure the result is itself legal. // Make sure the result is itself legal.
Result = LegalizeOp(Result); Result = LegalizeOp(Result);
@ -4491,7 +4491,7 @@ SDValue SelectionDAGLegalize::ExpandEXTRACT_VECTOR_ELT(SDValue Op) {
Vec = LegalizeOp(Vec); Vec = LegalizeOp(Vec);
Op = DAG.UpdateNodeOperands(Op, Vec, Idx); Op = DAG.UpdateNodeOperands(Op, Vec, Idx);
SDValue Tmp3 = TLI.LowerOperation(Op, DAG); SDValue Tmp3 = TLI.LowerOperation(Op, DAG);
if (Tmp3.Val) if (Tmp3.getNode())
return Tmp3; return Tmp3;
break; break;
} }
@ -4697,14 +4697,14 @@ void SelectionDAGLegalize::LegalizeSetCCOperands(SDValue &LHS,
SDValue Dummy; SDValue Dummy;
SDValue Ops[2] = { LHS, RHS }; SDValue Ops[2] = { LHS, RHS };
Tmp1 = ExpandLibCall(LC1, DAG.getMergeValues(Ops, 2).Val, Tmp1 = ExpandLibCall(LC1, DAG.getMergeValues(Ops, 2).getNode(),
false /*sign irrelevant*/, Dummy); false /*sign irrelevant*/, Dummy);
Tmp2 = DAG.getConstant(0, MVT::i32); Tmp2 = DAG.getConstant(0, MVT::i32);
CC = DAG.getCondCode(TLI.getCmpLibcallCC(LC1)); CC = DAG.getCondCode(TLI.getCmpLibcallCC(LC1));
if (LC2 != RTLIB::UNKNOWN_LIBCALL) { if (LC2 != RTLIB::UNKNOWN_LIBCALL) {
Tmp1 = DAG.getNode(ISD::SETCC, TLI.getSetCCResultType(Tmp1), Tmp1, Tmp2, Tmp1 = DAG.getNode(ISD::SETCC, TLI.getSetCCResultType(Tmp1), Tmp1, Tmp2,
CC); CC);
LHS = ExpandLibCall(LC2, DAG.getMergeValues(Ops, 2).Val, LHS = ExpandLibCall(LC2, DAG.getMergeValues(Ops, 2).getNode(),
false /*sign irrelevant*/, Dummy); false /*sign irrelevant*/, Dummy);
Tmp2 = DAG.getNode(ISD::SETCC, TLI.getSetCCResultType(LHS), LHS, Tmp2, Tmp2 = DAG.getNode(ISD::SETCC, TLI.getSetCCResultType(LHS), LHS, Tmp2,
DAG.getCondCode(TLI.getCmpLibcallCC(LC2))); DAG.getCondCode(TLI.getCmpLibcallCC(LC2)));
@ -4791,16 +4791,16 @@ void SelectionDAGLegalize::LegalizeSetCCOperands(SDValue &LHS,
TargetLowering::DAGCombinerInfo DagCombineInfo(DAG, false, true, NULL); TargetLowering::DAGCombinerInfo DagCombineInfo(DAG, false, true, NULL);
Tmp1 = TLI.SimplifySetCC(TLI.getSetCCResultType(LHSLo), LHSLo, RHSLo, Tmp1 = TLI.SimplifySetCC(TLI.getSetCCResultType(LHSLo), LHSLo, RHSLo,
LowCC, false, DagCombineInfo); LowCC, false, DagCombineInfo);
if (!Tmp1.Val) if (!Tmp1.getNode())
Tmp1 = DAG.getSetCC(TLI.getSetCCResultType(LHSLo), LHSLo, RHSLo, LowCC); Tmp1 = DAG.getSetCC(TLI.getSetCCResultType(LHSLo), LHSLo, RHSLo, LowCC);
Tmp2 = TLI.SimplifySetCC(TLI.getSetCCResultType(LHSHi), LHSHi, RHSHi, Tmp2 = TLI.SimplifySetCC(TLI.getSetCCResultType(LHSHi), LHSHi, RHSHi,
CCCode, false, DagCombineInfo); CCCode, false, DagCombineInfo);
if (!Tmp2.Val) if (!Tmp2.getNode())
Tmp2 = DAG.getNode(ISD::SETCC, TLI.getSetCCResultType(LHSHi), LHSHi, Tmp2 = DAG.getNode(ISD::SETCC, TLI.getSetCCResultType(LHSHi), LHSHi,
RHSHi,CC); RHSHi,CC);
ConstantSDNode *Tmp1C = dyn_cast<ConstantSDNode>(Tmp1.Val); ConstantSDNode *Tmp1C = dyn_cast<ConstantSDNode>(Tmp1.getNode());
ConstantSDNode *Tmp2C = dyn_cast<ConstantSDNode>(Tmp2.Val); ConstantSDNode *Tmp2C = dyn_cast<ConstantSDNode>(Tmp2.getNode());
if ((Tmp1C && Tmp1C->isNullValue()) || if ((Tmp1C && Tmp1C->isNullValue()) ||
(Tmp2C && Tmp2C->isNullValue() && (Tmp2C && Tmp2C->isNullValue() &&
(CCCode == ISD::SETLE || CCCode == ISD::SETGE || (CCCode == ISD::SETLE || CCCode == ISD::SETGE ||
@ -4816,7 +4816,7 @@ void SelectionDAGLegalize::LegalizeSetCCOperands(SDValue &LHS,
} else { } else {
Result = TLI.SimplifySetCC(TLI.getSetCCResultType(LHSHi), LHSHi, RHSHi, Result = TLI.SimplifySetCC(TLI.getSetCCResultType(LHSHi), LHSHi, RHSHi,
ISD::SETEQ, false, DagCombineInfo); ISD::SETEQ, false, DagCombineInfo);
if (!Result.Val) if (!Result.getNode())
Result=DAG.getSetCC(TLI.getSetCCResultType(LHSHi), LHSHi, RHSHi, Result=DAG.getSetCC(TLI.getSetCCResultType(LHSHi), LHSHi, RHSHi,
ISD::SETEQ); ISD::SETEQ);
Result = LegalizeOp(DAG.getNode(ISD::SELECT, Tmp1.getValueType(), Result = LegalizeOp(DAG.getNode(ISD::SELECT, Tmp1.getValueType(),
@ -4958,7 +4958,7 @@ SDValue SelectionDAGLegalize::ExpandBUILD_VECTOR(SDNode *Node) {
PseudoSourceValue::getConstantPool(), 0); PseudoSourceValue::getConstantPool(), 0);
} }
if (SplatValue.Val) { // Splat of one value? if (SplatValue.getNode()) { // Splat of one value?
// Build the shuffle constant vector: <0, 0, 0, 0> // Build the shuffle constant vector: <0, 0, 0, 0>
MVT MaskVT = MVT::getIntVectorWithNumElements(NumElems); MVT MaskVT = MVT::getIntVectorWithNumElements(NumElems);
SDValue Zero = DAG.getConstant(0, MaskVT.getVectorElementType()); SDValue Zero = DAG.getConstant(0, MaskVT.getVectorElementType());
@ -5095,7 +5095,7 @@ bool SelectionDAGLegalize::ExpandShift(unsigned Opc, SDValue Op,SDValue Amt,
unsigned NVTBits = NVT.getSizeInBits(); unsigned NVTBits = NVT.getSizeInBits();
// Handle the case when Amt is an immediate. // Handle the case when Amt is an immediate.
if (ConstantSDNode *CN = dyn_cast<ConstantSDNode>(Amt.Val)) { if (ConstantSDNode *CN = dyn_cast<ConstantSDNode>(Amt.getNode())) {
unsigned Cst = CN->getValue(); unsigned Cst = CN->getValue();
// Expand the incoming operand to be shifted, so that we have its parts // Expand the incoming operand to be shifted, so that we have its parts
SDValue InL, InH; SDValue InL, InH;
@ -5292,14 +5292,14 @@ LegalizeINT_TO_FP(SDValue Result, bool isSigned, MVT DestTy, SDValue Op) {
// FALLTHROUGH // FALLTHROUGH
case TargetLowering::Legal: case TargetLowering::Legal:
Tmp1 = LegalizeOp(Op); Tmp1 = LegalizeOp(Op);
if (Result.Val) if (Result.getNode())
Result = DAG.UpdateNodeOperands(Result, Tmp1); Result = DAG.UpdateNodeOperands(Result, Tmp1);
else else
Result = DAG.getNode(isSigned ? ISD::SINT_TO_FP : ISD::UINT_TO_FP, Result = DAG.getNode(isSigned ? ISD::SINT_TO_FP : ISD::UINT_TO_FP,
DestTy, Tmp1); DestTy, Tmp1);
if (isCustom) { if (isCustom) {
Tmp1 = TLI.LowerOperation(Result, DAG); Tmp1 = TLI.LowerOperation(Result, DAG);
if (Tmp1.Val) Result = Tmp1; if (Tmp1.getNode()) Result = Tmp1;
} }
break; break;
case TargetLowering::Expand: case TargetLowering::Expand:
@ -5322,7 +5322,7 @@ LegalizeINT_TO_FP(SDValue Result, bool isSigned, MVT DestTy, SDValue Op) {
Tmp1 = DAG.getZeroExtendInReg(Tmp1, Tmp1 = DAG.getZeroExtendInReg(Tmp1,
Op.getValueType()); Op.getValueType());
} }
if (Result.Val) if (Result.getNode())
Result = DAG.UpdateNodeOperands(Result, Tmp1); Result = DAG.UpdateNodeOperands(Result, Tmp1);
else else
Result = DAG.getNode(isSigned ? ISD::SINT_TO_FP : ISD::UINT_TO_FP, Result = DAG.getNode(isSigned ? ISD::SINT_TO_FP : ISD::UINT_TO_FP,
@ -5427,7 +5427,7 @@ ExpandIntToFP(bool isSigned, MVT DestTy, SDValue Source) {
case TargetLowering::Custom: { case TargetLowering::Custom: {
SDValue NV = TLI.LowerOperation(DAG.getNode(ISD::SINT_TO_FP, DestTy, SDValue NV = TLI.LowerOperation(DAG.getNode(ISD::SINT_TO_FP, DestTy,
Source), DAG); Source), DAG);
if (NV.Val) if (NV.getNode())
return LegalizeOp(NV); return LegalizeOp(NV);
break; // The target decided this was legal after all break; // The target decided this was legal after all
} }
@ -5448,8 +5448,8 @@ ExpandIntToFP(bool isSigned, MVT DestTy, SDValue Source) {
Source = DAG.getNode(ISD::SINT_TO_FP, DestTy, Source); Source = DAG.getNode(ISD::SINT_TO_FP, DestTy, Source);
SDValue HiPart; SDValue HiPart;
SDValue Result = ExpandLibCall(LC, Source.Val, isSigned, HiPart); SDValue Result = ExpandLibCall(LC, Source.getNode(), isSigned, HiPart);
if (Result.getValueType() != DestTy && HiPart.Val) if (Result.getValueType() != DestTy && HiPart.getNode())
Result = DAG.getNode(ISD::BUILD_PAIR, DestTy, Result, HiPart); Result = DAG.getNode(ISD::BUILD_PAIR, DestTy, Result, HiPart);
return Result; return Result;
} }
@ -5665,8 +5665,8 @@ SDValue SelectionDAGLegalize::PromoteLegalFP_TO_INT(SDValue LegalOp,
// the target lowering hooks to expand it. Just keep the low part of the // the target lowering hooks to expand it. Just keep the low part of the
// expanded operation, we know that we're truncating anyway. // expanded operation, we know that we're truncating anyway.
if (getTypeAction(NewOutTy) == Expand) { if (getTypeAction(NewOutTy) == Expand) {
Operation = SDValue(TLI.ReplaceNodeResults(Operation.Val, DAG), 0); Operation = SDValue(TLI.ReplaceNodeResults(Operation.getNode(), DAG), 0);
assert(Operation.Val && "Didn't return anything"); assert(Operation.getNode() && "Didn't return anything");
} }
// Truncate the result of the extended FP_TO_*INT operation to the desired // Truncate the result of the extended FP_TO_*INT operation to the desired
@ -5794,7 +5794,7 @@ SDValue SelectionDAGLegalize::ExpandBitCount(unsigned Opc, SDValue Op) {
void SelectionDAGLegalize::ExpandOp(SDValue Op, SDValue &Lo, SDValue &Hi){ void SelectionDAGLegalize::ExpandOp(SDValue Op, SDValue &Lo, SDValue &Hi){
MVT VT = Op.getValueType(); MVT VT = Op.getValueType();
MVT NVT = TLI.getTypeToTransformTo(VT); MVT NVT = TLI.getTypeToTransformTo(VT);
SDNode *Node = Op.Val; SDNode *Node = Op.getNode();
assert(getTypeAction(VT) == Expand && "Not an expanded type!"); assert(getTypeAction(VT) == Expand && "Not an expanded type!");
assert(((NVT.isInteger() && NVT.bitsLT(VT)) || VT.isFloatingPoint() || assert(((NVT.isInteger() && NVT.bitsLT(VT)) || VT.isFloatingPoint() ||
VT.isVector()) && "Cannot expand to FP value or to larger int value!"); VT.isVector()) && "Cannot expand to FP value or to larger int value!");
@ -5820,9 +5820,9 @@ void SelectionDAGLegalize::ExpandOp(SDValue Op, SDValue &Lo, SDValue &Hi){
Src = DAG.getNode(ISD::BUILD_PAIR, VT, SrcLo, SrcHi); Src = DAG.getNode(ISD::BUILD_PAIR, VT, SrcLo, SrcHi);
SDValue Result = TLI.LowerOperation( SDValue Result = TLI.LowerOperation(
DAG.getNode(ISD::FP_ROUND_INREG, VT, Src, Op.getOperand(1)), DAG); DAG.getNode(ISD::FP_ROUND_INREG, VT, Src, Op.getOperand(1)), DAG);
assert(Result.Val->getOpcode() == ISD::BUILD_PAIR); assert(Result.getNode()->getOpcode() == ISD::BUILD_PAIR);
Lo = Result.Val->getOperand(0); Lo = Result.getNode()->getOperand(0);
Hi = Result.Val->getOperand(1); Hi = Result.getNode()->getOperand(1);
break; break;
} }
// fall through // fall through
@ -6145,7 +6145,7 @@ void SelectionDAGLegalize::ExpandOp(SDValue Op, SDValue &Lo, SDValue &Hi){
} }
// Turn this into a load/store pair by default. // Turn this into a load/store pair by default.
if (Tmp.Val == 0) if (Tmp.getNode() == 0)
Tmp = EmitStackConvert(Node->getOperand(0), VT, VT); Tmp = EmitStackConvert(Node->getOperand(0), VT, VT);
ExpandOp(Tmp, Lo, Hi); ExpandOp(Tmp, Lo, Hi);
@ -6157,7 +6157,7 @@ void SelectionDAGLegalize::ExpandOp(SDValue Op, SDValue &Lo, SDValue &Hi){
TargetLowering::Custom && TargetLowering::Custom &&
"Must custom expand ReadCycleCounter"); "Must custom expand ReadCycleCounter");
SDValue Tmp = TLI.LowerOperation(Op, DAG); SDValue Tmp = TLI.LowerOperation(Op, DAG);
assert(Tmp.Val && "Node must be custom expanded!"); assert(Tmp.getNode() && "Node must be custom expanded!");
ExpandOp(Tmp.getValue(0), Lo, Hi); ExpandOp(Tmp.getValue(0), Lo, Hi);
AddLegalizedOperand(SDValue(Node, 1), // Remember we legalized the chain. AddLegalizedOperand(SDValue(Node, 1), // Remember we legalized the chain.
LegalizeOp(Tmp.getValue(1))); LegalizeOp(Tmp.getValue(1)));
@ -6170,7 +6170,7 @@ void SelectionDAGLegalize::ExpandOp(SDValue Op, SDValue &Lo, SDValue &Hi){
case ISD::ATOMIC_CMP_SWAP_32: case ISD::ATOMIC_CMP_SWAP_32:
case ISD::ATOMIC_CMP_SWAP_64: { case ISD::ATOMIC_CMP_SWAP_64: {
SDValue Tmp = TLI.LowerOperation(Op, DAG); SDValue Tmp = TLI.LowerOperation(Op, DAG);
assert(Tmp.Val && "Node must be custom expanded!"); assert(Tmp.getNode() && "Node must be custom expanded!");
ExpandOp(Tmp.getValue(0), Lo, Hi); ExpandOp(Tmp.getValue(0), Lo, Hi);
AddLegalizedOperand(SDValue(Node, 1), // Remember we legalized the chain. AddLegalizedOperand(SDValue(Node, 1), // Remember we legalized the chain.
LegalizeOp(Tmp.getValue(1))); LegalizeOp(Tmp.getValue(1)));
@ -6194,7 +6194,7 @@ void SelectionDAGLegalize::ExpandOp(SDValue Op, SDValue &Lo, SDValue &Hi){
// Now that the custom expander is done, expand the result, which is still // Now that the custom expander is done, expand the result, which is still
// VT. // VT.
if (Op.Val) { if (Op.getNode()) {
ExpandOp(Op, Lo, Hi); ExpandOp(Op, Lo, Hi);
break; break;
} }
@ -6219,7 +6219,7 @@ void SelectionDAGLegalize::ExpandOp(SDValue Op, SDValue &Lo, SDValue &Hi){
Op = TLI.LowerOperation(DAG.getNode(ISD::FP_TO_UINT, VT, Op), DAG); Op = TLI.LowerOperation(DAG.getNode(ISD::FP_TO_UINT, VT, Op), DAG);
// Now that the custom expander is done, expand the result. // Now that the custom expander is done, expand the result.
if (Op.Val) { if (Op.getNode()) {
ExpandOp(Op, Lo, Hi); ExpandOp(Op, Lo, Hi);
break; break;
} }
@ -6238,7 +6238,7 @@ void SelectionDAGLegalize::ExpandOp(SDValue Op, SDValue &Lo, SDValue &Hi){
if (TLI.getOperationAction(ISD::SHL, VT) == TargetLowering::Custom) { if (TLI.getOperationAction(ISD::SHL, VT) == TargetLowering::Custom) {
SDValue Op = DAG.getNode(ISD::SHL, VT, Node->getOperand(0), ShiftAmt); SDValue Op = DAG.getNode(ISD::SHL, VT, Node->getOperand(0), ShiftAmt);
Op = TLI.LowerOperation(Op, DAG); Op = TLI.LowerOperation(Op, DAG);
if (Op.Val) { if (Op.getNode()) {
// Now that the custom expander is done, expand the result, which is // Now that the custom expander is done, expand the result, which is
// still VT. // still VT.
ExpandOp(Op, Lo, Hi); ExpandOp(Op, Lo, Hi);
@ -6288,7 +6288,7 @@ void SelectionDAGLegalize::ExpandOp(SDValue Op, SDValue &Lo, SDValue &Hi){
if (TLI.getOperationAction(ISD::SRA, VT) == TargetLowering::Custom) { if (TLI.getOperationAction(ISD::SRA, VT) == TargetLowering::Custom) {
SDValue Op = DAG.getNode(ISD::SRA, VT, Node->getOperand(0), ShiftAmt); SDValue Op = DAG.getNode(ISD::SRA, VT, Node->getOperand(0), ShiftAmt);
Op = TLI.LowerOperation(Op, DAG); Op = TLI.LowerOperation(Op, DAG);
if (Op.Val) { if (Op.getNode()) {
// Now that the custom expander is done, expand the result, which is // Now that the custom expander is done, expand the result, which is
// still VT. // still VT.
ExpandOp(Op, Lo, Hi); ExpandOp(Op, Lo, Hi);
@ -6320,7 +6320,7 @@ void SelectionDAGLegalize::ExpandOp(SDValue Op, SDValue &Lo, SDValue &Hi){
if (TLI.getOperationAction(ISD::SRL, VT) == TargetLowering::Custom) { if (TLI.getOperationAction(ISD::SRL, VT) == TargetLowering::Custom) {
SDValue Op = DAG.getNode(ISD::SRL, VT, Node->getOperand(0), ShiftAmt); SDValue Op = DAG.getNode(ISD::SRL, VT, Node->getOperand(0), ShiftAmt);
Op = TLI.LowerOperation(Op, DAG); Op = TLI.LowerOperation(Op, DAG);
if (Op.Val) { if (Op.getNode()) {
// Now that the custom expander is done, expand the result, which is // Now that the custom expander is done, expand the result, which is
// still VT. // still VT.
ExpandOp(Op, Lo, Hi); ExpandOp(Op, Lo, Hi);
@ -6352,7 +6352,7 @@ void SelectionDAGLegalize::ExpandOp(SDValue Op, SDValue &Lo, SDValue &Hi){
if (TLI.getOperationAction(Node->getOpcode(), VT) == if (TLI.getOperationAction(Node->getOpcode(), VT) ==
TargetLowering::Custom) { TargetLowering::Custom) {
SDValue Result = TLI.LowerOperation(Op, DAG); SDValue Result = TLI.LowerOperation(Op, DAG);
if (Result.Val) { if (Result.getNode()) {
ExpandOp(Result, Lo, Hi); ExpandOp(Result, Lo, Hi);
break; break;
} }
@ -6425,7 +6425,7 @@ void SelectionDAGLegalize::ExpandOp(SDValue Op, SDValue &Lo, SDValue &Hi){
// If the target wants to custom expand this, let them. // If the target wants to custom expand this, let them.
if (TLI.getOperationAction(ISD::MUL, VT) == TargetLowering::Custom) { if (TLI.getOperationAction(ISD::MUL, VT) == TargetLowering::Custom) {
SDValue New = TLI.LowerOperation(Op, DAG); SDValue New = TLI.LowerOperation(Op, DAG);
if (New.Val) { if (New.getNode()) {
ExpandOp(New, Lo, Hi); ExpandOp(New, Lo, Hi);
break; break;
} }
@ -6450,7 +6450,7 @@ void SelectionDAGLegalize::ExpandOp(SDValue Op, SDValue &Lo, SDValue &Hi){
if (HasUMUL_LOHI) { if (HasUMUL_LOHI) {
// We can emit a umul_lohi. // We can emit a umul_lohi.
Lo = DAG.getNode(ISD::UMUL_LOHI, DAG.getVTList(NVT, NVT), LL, RL); Lo = DAG.getNode(ISD::UMUL_LOHI, DAG.getVTList(NVT, NVT), LL, RL);
Hi = SDValue(Lo.Val, 1); Hi = SDValue(Lo.getNode(), 1);
break; break;
} }
if (HasMULHU) { if (HasMULHU) {
@ -6465,7 +6465,7 @@ void SelectionDAGLegalize::ExpandOp(SDValue Op, SDValue &Lo, SDValue &Hi){
if (HasSMUL_LOHI) { if (HasSMUL_LOHI) {
// We can emit a smul_lohi. // We can emit a smul_lohi.
Lo = DAG.getNode(ISD::SMUL_LOHI, DAG.getVTList(NVT, NVT), LL, RL); Lo = DAG.getNode(ISD::SMUL_LOHI, DAG.getVTList(NVT, NVT), LL, RL);
Hi = SDValue(Lo.Val, 1); Hi = SDValue(Lo.getNode(), 1);
break; break;
} }
if (HasMULHS) { if (HasMULHS) {
@ -6678,7 +6678,7 @@ void SelectionDAGLegalize::ExpandOp(SDValue Op, SDValue &Lo, SDValue &Hi){
? DAG.getNode(ISD::SIGN_EXTEND_INREG, Tmp.getValueType(), Tmp, ? DAG.getNode(ISD::SIGN_EXTEND_INREG, Tmp.getValueType(), Tmp,
DAG.getValueType(SrcVT)) DAG.getValueType(SrcVT))
: DAG.getZeroExtendInReg(Tmp, SrcVT); : DAG.getZeroExtendInReg(Tmp, SrcVT);
Node = DAG.UpdateNodeOperands(Op, Tmp).Val; Node = DAG.UpdateNodeOperands(Op, Tmp).getNode();
SrcVT = Node->getOperand(0).getValueType(); SrcVT = Node->getOperand(0).getValueType();
} }
@ -6739,7 +6739,7 @@ void SelectionDAGLegalize::ExpandOp(SDValue Op, SDValue &Lo, SDValue &Hi){
// is a type that requires multi-step expansion. // is a type that requires multi-step expansion.
if (getTypeAction(NVT) != Expand && NVT != MVT::isVoid) { if (getTypeAction(NVT) != Expand && NVT != MVT::isVoid) {
Lo = LegalizeOp(Lo); Lo = LegalizeOp(Lo);
if (Hi.Val) if (Hi.getNode())
// Don't legalize the high part if it is expanded to a single node. // Don't legalize the high part if it is expanded to a single node.
Hi = LegalizeOp(Hi); Hi = LegalizeOp(Hi);
} }
@ -6755,7 +6755,7 @@ void SelectionDAGLegalize::ExpandOp(SDValue Op, SDValue &Lo, SDValue &Hi){
void SelectionDAGLegalize::SplitVectorOp(SDValue Op, SDValue &Lo, void SelectionDAGLegalize::SplitVectorOp(SDValue Op, SDValue &Lo,
SDValue &Hi) { SDValue &Hi) {
assert(Op.getValueType().isVector() && "Cannot split non-vector type!"); assert(Op.getValueType().isVector() && "Cannot split non-vector type!");
SDNode *Node = Op.Val; SDNode *Node = Op.getNode();
unsigned NumElements = Op.getValueType().getVectorNumElements(); unsigned NumElements = Op.getValueType().getVectorNumElements();
assert(NumElements > 1 && "Cannot split a single element vector!"); assert(NumElements > 1 && "Cannot split a single element vector!");
@ -7033,7 +7033,7 @@ void SelectionDAGLegalize::SplitVectorOp(SDValue Op, SDValue &Lo,
unsigned LdAlign = TLI.getTargetData()->getPrefTypeAlignment( unsigned LdAlign = TLI.getTargetData()->getPrefTypeAlignment(
Op.getValueType().getTypeForMVT()); Op.getValueType().getTypeForMVT());
SDValue Ptr = DAG.CreateStackTemporary(InOp.getValueType(), LdAlign); SDValue Ptr = DAG.CreateStackTemporary(InOp.getValueType(), LdAlign);
int FI = cast<FrameIndexSDNode>(Ptr.Val)->getIndex(); int FI = cast<FrameIndexSDNode>(Ptr.getNode())->getIndex();
SDValue St = DAG.getStore(DAG.getEntryNode(), SDValue St = DAG.getStore(DAG.getEntryNode(),
InOp, Ptr, InOp, Ptr,
@ -7061,7 +7061,7 @@ void SelectionDAGLegalize::SplitVectorOp(SDValue Op, SDValue &Lo,
/// scalar (e.g. f32) value. /// scalar (e.g. f32) value.
SDValue SelectionDAGLegalize::ScalarizeVectorOp(SDValue Op) { SDValue SelectionDAGLegalize::ScalarizeVectorOp(SDValue Op) {
assert(Op.getValueType().isVector() && "Bad ScalarizeVectorOp invocation!"); assert(Op.getValueType().isVector() && "Bad ScalarizeVectorOp invocation!");
SDNode *Node = Op.Val; SDNode *Node = Op.getNode();
MVT NewVT = Op.getValueType().getVectorElementType(); MVT NewVT = Op.getValueType().getVectorElementType();
assert(Op.getValueType().getVectorNumElements() == 1); assert(Op.getValueType().getVectorNumElements() == 1);

36
lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp
View File

@ -76,7 +76,7 @@ void DAGTypeLegalizer::SoftenFloatResult(SDNode *N, unsigned ResNo) {
} }
// If R is null, the sub-method took care of registering the result. // If R is null, the sub-method took care of registering the result.
if (R.Val) if (R.getNode())
SetSoftenedFloat(SDValue(N, ResNo), R); SetSoftenedFloat(SDValue(N, ResNo), R);
} }
@ -311,11 +311,11 @@ bool DAGTypeLegalizer::SoftenFloatOperand(SDNode *N, unsigned OpNo) {
} }
// If the result is null, the sub-method took care of registering results etc. // If the result is null, the sub-method took care of registering results etc.
if (!Res.Val) return false; if (!Res.getNode()) return false;
// If the result is N, the sub-method updated N in place. Check to see if any // If the result is N, the sub-method updated N in place. Check to see if any
// operands are new, and if so, mark them. // operands are new, and if so, mark them.
if (Res.Val == N) { if (Res.getNode() == N) {
// Mark N as new and remark N and its operands. This allows us to correctly // Mark N as new and remark N and its operands. This allows us to correctly
// revisit N if it needs another step of promotion and allows us to visit // revisit N if it needs another step of promotion and allows us to visit
// any new operands to N. // any new operands to N.
@ -438,7 +438,7 @@ SDValue DAGTypeLegalizer::SoftenFloatOp_BR_CC(SDNode *N) {
// If SoftenSetCCOperands returned a scalar, we need to compare the result // If SoftenSetCCOperands returned a scalar, we need to compare the result
// against zero to select between true and false values. // against zero to select between true and false values.
if (NewRHS.Val == 0) { if (NewRHS.getNode() == 0) {
NewRHS = DAG.getConstant(0, NewLHS.getValueType()); NewRHS = DAG.getConstant(0, NewLHS.getValueType());
CCCode = ISD::SETNE; CCCode = ISD::SETNE;
} }
@ -472,7 +472,7 @@ SDValue DAGTypeLegalizer::SoftenFloatOp_SELECT_CC(SDNode *N) {
// If SoftenSetCCOperands returned a scalar, we need to compare the result // If SoftenSetCCOperands returned a scalar, we need to compare the result
// against zero to select between true and false values. // against zero to select between true and false values.
if (NewRHS.Val == 0) { if (NewRHS.getNode() == 0) {
NewRHS = DAG.getConstant(0, NewLHS.getValueType()); NewRHS = DAG.getConstant(0, NewLHS.getValueType());
CCCode = ISD::SETNE; CCCode = ISD::SETNE;
} }
@ -489,7 +489,7 @@ SDValue DAGTypeLegalizer::SoftenFloatOp_SETCC(SDNode *N) {
SoftenSetCCOperands(NewLHS, NewRHS, CCCode); SoftenSetCCOperands(NewLHS, NewRHS, CCCode);
// If SoftenSetCCOperands returned a scalar, use it. // If SoftenSetCCOperands returned a scalar, use it.
if (NewRHS.Val == 0) { if (NewRHS.getNode() == 0) {
assert(NewLHS.getValueType() == N->getValueType(0) && assert(NewLHS.getValueType() == N->getValueType(0) &&
"Unexpected setcc expansion!"); "Unexpected setcc expansion!");
return NewLHS; return NewLHS;
@ -577,7 +577,7 @@ void DAGTypeLegalizer::ExpandFloatResult(SDNode *N, unsigned ResNo) {
} }
// If Lo/Hi is null, the sub-method took care of registering results etc. // If Lo/Hi is null, the sub-method took care of registering results etc.
if (Lo.Val) if (Lo.getNode())
SetExpandedFloat(SDValue(N, ResNo), Lo, Hi); SetExpandedFloat(SDValue(N, ResNo), Lo, Hi);
} }
@ -603,7 +603,7 @@ void DAGTypeLegalizer::ExpandFloatRes_FADD(SDNode *N, SDValue &Lo,
RTLIB::ADD_PPCF128), RTLIB::ADD_PPCF128),
N->getValueType(0), Ops, 2, N->getValueType(0), Ops, 2,
false); false);
assert(Call.Val->getOpcode() == ISD::BUILD_PAIR && "Call lowered wrongly!"); assert(Call.getNode()->getOpcode() == ISD::BUILD_PAIR && "Call lowered wrongly!");
Lo = Call.getOperand(0); Hi = Call.getOperand(1); Lo = Call.getOperand(0); Hi = Call.getOperand(1);
} }
@ -630,7 +630,7 @@ void DAGTypeLegalizer::ExpandFloatRes_FDIV(SDNode *N, SDValue &Lo,
RTLIB::DIV_PPCF128), RTLIB::DIV_PPCF128),
N->getValueType(0), Ops, 2, N->getValueType(0), Ops, 2,
false); false);
assert(Call.Val->getOpcode() == ISD::BUILD_PAIR && "Call lowered wrongly!"); assert(Call.getNode()->getOpcode() == ISD::BUILD_PAIR && "Call lowered wrongly!");
Lo = Call.getOperand(0); Hi = Call.getOperand(1); Lo = Call.getOperand(0); Hi = Call.getOperand(1);
} }
@ -644,7 +644,7 @@ void DAGTypeLegalizer::ExpandFloatRes_FMUL(SDNode *N, SDValue &Lo,
RTLIB::MUL_PPCF128), RTLIB::MUL_PPCF128),
N->getValueType(0), Ops, 2, N->getValueType(0), Ops, 2,
false); false);
assert(Call.Val->getOpcode() == ISD::BUILD_PAIR && "Call lowered wrongly!"); assert(Call.getNode()->getOpcode() == ISD::BUILD_PAIR && "Call lowered wrongly!");
Lo = Call.getOperand(0); Hi = Call.getOperand(1); Lo = Call.getOperand(0); Hi = Call.getOperand(1);
} }
@ -672,7 +672,7 @@ void DAGTypeLegalizer::ExpandFloatRes_FSUB(SDNode *N, SDValue &Lo,
RTLIB::SUB_PPCF128), RTLIB::SUB_PPCF128),
N->getValueType(0), Ops, 2, N->getValueType(0), Ops, 2,
false); false);
assert(Call.Val->getOpcode() == ISD::BUILD_PAIR && "Call lowered wrongly!"); assert(Call.getNode()->getOpcode() == ISD::BUILD_PAIR && "Call lowered wrongly!");
Lo = Call.getOperand(0); Hi = Call.getOperand(1); Lo = Call.getOperand(0); Hi = Call.getOperand(1);
} }
@ -734,7 +734,7 @@ void DAGTypeLegalizer::ExpandFloatRes_XINT_TO_FP(SDNode *N, SDValue &Lo,
assert(LC != RTLIB::UNKNOWN_LIBCALL && "Unsupported XINT_TO_FP!"); assert(LC != RTLIB::UNKNOWN_LIBCALL && "Unsupported XINT_TO_FP!");
Hi = MakeLibCall(LC, VT, &Src, 1, true); Hi = MakeLibCall(LC, VT, &Src, 1, true);
assert(Hi.Val->getOpcode() == ISD::BUILD_PAIR && "Call lowered wrongly!"); assert(Hi.getNode()->getOpcode() == ISD::BUILD_PAIR && "Call lowered wrongly!");
Lo = Hi.getOperand(0); Hi = Hi.getOperand(1); Lo = Hi.getOperand(0); Hi = Hi.getOperand(1);
} }
@ -790,7 +790,7 @@ bool DAGTypeLegalizer::ExpandFloatOperand(SDNode *N, unsigned OpNo) {
== TargetLowering::Custom) == TargetLowering::Custom)
Res = TLI.LowerOperation(SDValue(N, OpNo), DAG); Res = TLI.LowerOperation(SDValue(N, OpNo), DAG);
if (Res.Val == 0) { if (Res.getNode() == 0) {
switch (N->getOpcode()) { switch (N->getOpcode()) {
default: default:
#ifndef NDEBUG #ifndef NDEBUG
@ -816,10 +816,10 @@ bool DAGTypeLegalizer::ExpandFloatOperand(SDNode *N, unsigned OpNo) {
} }
// If the result is null, the sub-method took care of registering results etc. // If the result is null, the sub-method took care of registering results etc.
if (!Res.Val) return false; if (!Res.getNode()) return false;
// If the result is N, the sub-method updated N in place. Check to see if any // If the result is N, the sub-method updated N in place. Check to see if any
// operands are new, and if so, mark them. // operands are new, and if so, mark them.
if (Res.Val == N) { if (Res.getNode() == N) {
// Mark N as new and remark N and its operands. This allows us to correctly // Mark N as new and remark N and its operands. This allows us to correctly
// revisit N if it needs another step of expansion and allows us to visit // revisit N if it needs another step of expansion and allows us to visit
// any new operands to N. // any new operands to N.
@ -869,7 +869,7 @@ SDValue DAGTypeLegalizer::ExpandFloatOp_BR_CC(SDNode *N) {
// If ExpandSetCCOperands returned a scalar, we need to compare the result // If ExpandSetCCOperands returned a scalar, we need to compare the result
// against zero to select between true and false values. // against zero to select between true and false values.
if (NewRHS.Val == 0) { if (NewRHS.getNode() == 0) {
NewRHS = DAG.getConstant(0, NewLHS.getValueType()); NewRHS = DAG.getConstant(0, NewLHS.getValueType());
CCCode = ISD::SETNE; CCCode = ISD::SETNE;
} }
@ -910,7 +910,7 @@ SDValue DAGTypeLegalizer::ExpandFloatOp_SELECT_CC(SDNode *N) {
// If ExpandSetCCOperands returned a scalar, we need to compare the result // If ExpandSetCCOperands returned a scalar, we need to compare the result
// against zero to select between true and false values. // against zero to select between true and false values.
if (NewRHS.Val == 0) { if (NewRHS.getNode() == 0) {
NewRHS = DAG.getConstant(0, NewLHS.getValueType()); NewRHS = DAG.getConstant(0, NewLHS.getValueType());
CCCode = ISD::SETNE; CCCode = ISD::SETNE;
} }
@ -927,7 +927,7 @@ SDValue DAGTypeLegalizer::ExpandFloatOp_SETCC(SDNode *N) {
FloatExpandSetCCOperands(NewLHS, NewRHS, CCCode); FloatExpandSetCCOperands(NewLHS, NewRHS, CCCode);
// If ExpandSetCCOperands returned a scalar, use it. // If ExpandSetCCOperands returned a scalar, use it.
if (NewRHS.Val == 0) { if (NewRHS.getNode() == 0) {
assert(NewLHS.getValueType() == N->getValueType(0) && assert(NewLHS.getValueType() == N->getValueType(0) &&
"Unexpected setcc expansion!"); "Unexpected setcc expansion!");
return NewLHS; return NewLHS;

38
lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
View File

@ -99,7 +99,7 @@ void DAGTypeLegalizer::PromoteIntegerResult(SDNode *N, unsigned ResNo) {
} }
// If Result is null, the sub-method took care of registering the result. // If Result is null, the sub-method took care of registering the result.
if (Result.Val) if (Result.getNode())
SetPromotedInteger(SDValue(N, ResNo), Result); SetPromotedInteger(SDValue(N, ResNo), Result);
} }
@ -167,7 +167,7 @@ SDValue DAGTypeLegalizer::PromoteIntRes_BIT_CONVERT(SDNode *N) {
// Otherwise, lower the bit-convert to a store/load from the stack, then // Otherwise, lower the bit-convert to a store/load from the stack, then
// promote the load. // promote the load.
SDValue Op = CreateStackStoreLoad(InOp, N->getValueType(0)); SDValue Op = CreateStackStoreLoad(InOp, N->getValueType(0));
return PromoteIntRes_LOAD(cast<LoadSDNode>(Op.Val)); return PromoteIntRes_LOAD(cast<LoadSDNode>(Op.getNode()));
} }
SDValue DAGTypeLegalizer::PromoteIntRes_BSWAP(SDNode *N) { SDValue DAGTypeLegalizer::PromoteIntRes_BSWAP(SDNode *N) {
@ -494,7 +494,7 @@ bool DAGTypeLegalizer::PromoteIntegerOperand(SDNode *N, unsigned OpNo) {
== TargetLowering::Custom) == TargetLowering::Custom)
Res = TLI.LowerOperation(SDValue(N, OpNo), DAG); Res = TLI.LowerOperation(SDValue(N, OpNo), DAG);
if (Res.Val == 0) { if (Res.getNode() == 0) {
switch (N->getOpcode()) { switch (N->getOpcode()) {
default: default:
#ifndef NDEBUG #ifndef NDEBUG
@ -529,9 +529,9 @@ bool DAGTypeLegalizer::PromoteIntegerOperand(SDNode *N, unsigned OpNo) {
} }
// If the result is null, the sub-method took care of registering results etc. // If the result is null, the sub-method took care of registering results etc.
if (!Res.Val) return false; if (!Res.getNode()) return false;
// If the result is N, the sub-method updated N in place. // If the result is N, the sub-method updated N in place.
if (Res.Val == N) { if (Res.getNode() == N) {
// Mark N as new and remark N and its operands. This allows us to correctly // Mark N as new and remark N and its operands. This allows us to correctly
// revisit N if it needs another step of promotion and allows us to visit // revisit N if it needs another step of promotion and allows us to visit
// any new operands to N. // any new operands to N.
@ -885,7 +885,7 @@ void DAGTypeLegalizer::ExpandIntegerResult(SDNode *N, unsigned ResNo) {
} }
// If Lo/Hi is null, the sub-method took care of registering results etc. // If Lo/Hi is null, the sub-method took care of registering results etc.
if (Lo.Val) if (Lo.getNode())
SetExpandedInteger(SDValue(N, ResNo), Lo, Hi); SetExpandedInteger(SDValue(N, ResNo), Lo, Hi);
} }
@ -1395,7 +1395,7 @@ void DAGTypeLegalizer::ExpandIntRes_MUL(SDNode *N,
if (HasUMUL_LOHI) { if (HasUMUL_LOHI) {
// We can emit a umul_lohi. // We can emit a umul_lohi.
Lo = DAG.getNode(ISD::UMUL_LOHI, DAG.getVTList(NVT, NVT), LL, RL); Lo = DAG.getNode(ISD::UMUL_LOHI, DAG.getVTList(NVT, NVT), LL, RL);
Hi = SDValue(Lo.Val, 1); Hi = SDValue(Lo.getNode(), 1);
return; return;
} }
if (HasMULHU) { if (HasMULHU) {
@ -1410,7 +1410,7 @@ void DAGTypeLegalizer::ExpandIntRes_MUL(SDNode *N,
if (HasSMUL_LOHI) { if (HasSMUL_LOHI) {
// We can emit a smul_lohi. // We can emit a smul_lohi.
Lo = DAG.getNode(ISD::SMUL_LOHI, DAG.getVTList(NVT, NVT), LL, RL); Lo = DAG.getNode(ISD::SMUL_LOHI, DAG.getVTList(NVT, NVT), LL, RL);
Hi = SDValue(Lo.Val, 1); Hi = SDValue(Lo.getNode(), 1);
return; return;
} }
if (HasMULHS) { if (HasMULHS) {
@ -1706,7 +1706,7 @@ bool DAGTypeLegalizer::ExpandIntegerOperand(SDNode *N, unsigned OpNo) {
== TargetLowering::Custom) == TargetLowering::Custom)
Res = TLI.LowerOperation(SDValue(N, OpNo), DAG); Res = TLI.LowerOperation(SDValue(N, OpNo), DAG);
if (Res.Val == 0) { if (Res.getNode() == 0) {
switch (N->getOpcode()) { switch (N->getOpcode()) {
default: default:
#ifndef NDEBUG #ifndef NDEBUG
@ -1732,10 +1732,10 @@ bool DAGTypeLegalizer::ExpandIntegerOperand(SDNode *N, unsigned OpNo) {
} }
// If the result is null, the sub-method took care of registering results etc. // If the result is null, the sub-method took care of registering results etc.
if (!Res.Val) return false; if (!Res.getNode()) return false;
// If the result is N, the sub-method updated N in place. Check to see if any // If the result is N, the sub-method updated N in place. Check to see if any
// operands are new, and if so, mark them. // operands are new, and if so, mark them.
if (Res.Val == N) { if (Res.getNode() == N) {
// Mark N as new and remark N and its operands. This allows us to correctly // Mark N as new and remark N and its operands. This allows us to correctly
// revisit N if it needs another step of expansion and allows us to visit // revisit N if it needs another step of expansion and allows us to visit
// any new operands to N. // any new operands to N.
@ -1814,16 +1814,16 @@ void DAGTypeLegalizer::IntegerExpandSetCCOperands(SDValue &NewLHS,
SDValue Tmp1, Tmp2; SDValue Tmp1, Tmp2;
Tmp1 = TLI.SimplifySetCC(TLI.getSetCCResultType(LHSLo), LHSLo, RHSLo, LowCC, Tmp1 = TLI.SimplifySetCC(TLI.getSetCCResultType(LHSLo), LHSLo, RHSLo, LowCC,
false, DagCombineInfo); false, DagCombineInfo);
if (!Tmp1.Val) if (!Tmp1.getNode())
Tmp1 = DAG.getSetCC(TLI.getSetCCResultType(LHSLo), LHSLo, RHSLo, LowCC); Tmp1 = DAG.getSetCC(TLI.getSetCCResultType(LHSLo), LHSLo, RHSLo, LowCC);
Tmp2 = TLI.SimplifySetCC(TLI.getSetCCResultType(LHSHi), LHSHi, RHSHi, Tmp2 = TLI.SimplifySetCC(TLI.getSetCCResultType(LHSHi), LHSHi, RHSHi,
CCCode, false, DagCombineInfo); CCCode, false, DagCombineInfo);
if (!Tmp2.Val) if (!Tmp2.getNode())
Tmp2 = DAG.getNode(ISD::SETCC, TLI.getSetCCResultType(LHSHi), LHSHi, RHSHi, Tmp2 = DAG.getNode(ISD::SETCC, TLI.getSetCCResultType(LHSHi), LHSHi, RHSHi,
DAG.getCondCode(CCCode)); DAG.getCondCode(CCCode));
ConstantSDNode *Tmp1C = dyn_cast<ConstantSDNode>(Tmp1.Val); ConstantSDNode *Tmp1C = dyn_cast<ConstantSDNode>(Tmp1.getNode());
ConstantSDNode *Tmp2C = dyn_cast<ConstantSDNode>(Tmp2.Val); ConstantSDNode *Tmp2C = dyn_cast<ConstantSDNode>(Tmp2.getNode());
if ((Tmp1C && Tmp1C->isNullValue()) || if ((Tmp1C && Tmp1C->isNullValue()) ||
(Tmp2C && Tmp2C->isNullValue() && (Tmp2C && Tmp2C->isNullValue() &&
(CCCode == ISD::SETLE || CCCode == ISD::SETGE || (CCCode == ISD::SETLE || CCCode == ISD::SETGE ||
@ -1841,7 +1841,7 @@ void DAGTypeLegalizer::IntegerExpandSetCCOperands(SDValue &NewLHS,
NewLHS = TLI.SimplifySetCC(TLI.getSetCCResultType(LHSHi), LHSHi, RHSHi, NewLHS = TLI.SimplifySetCC(TLI.getSetCCResultType(LHSHi), LHSHi, RHSHi,
ISD::SETEQ, false, DagCombineInfo); ISD::SETEQ, false, DagCombineInfo);
if (!NewLHS.Val) if (!NewLHS.getNode())
NewLHS = DAG.getSetCC(TLI.getSetCCResultType(LHSHi), LHSHi, RHSHi, NewLHS = DAG.getSetCC(TLI.getSetCCResultType(LHSHi), LHSHi, RHSHi,
ISD::SETEQ); ISD::SETEQ);
NewLHS = DAG.getNode(ISD::SELECT, Tmp1.getValueType(), NewLHS = DAG.getNode(ISD::SELECT, Tmp1.getValueType(),
@ -1856,7 +1856,7 @@ SDValue DAGTypeLegalizer::ExpandIntOp_BR_CC(SDNode *N) {
// If ExpandSetCCOperands returned a scalar, we need to compare the result // If ExpandSetCCOperands returned a scalar, we need to compare the result
// against zero to select between true and false values. // against zero to select between true and false values.
if (NewRHS.Val == 0) { if (NewRHS.getNode() == 0) {
NewRHS = DAG.getConstant(0, NewLHS.getValueType()); NewRHS = DAG.getConstant(0, NewLHS.getValueType());
CCCode = ISD::SETNE; CCCode = ISD::SETNE;
} }
@ -1874,7 +1874,7 @@ SDValue DAGTypeLegalizer::ExpandIntOp_SELECT_CC(SDNode *N) {
// If ExpandSetCCOperands returned a scalar, we need to compare the result // If ExpandSetCCOperands returned a scalar, we need to compare the result
// against zero to select between true and false values. // against zero to select between true and false values.
if (NewRHS.Val == 0) { if (NewRHS.getNode() == 0) {
NewRHS = DAG.getConstant(0, NewLHS.getValueType()); NewRHS = DAG.getConstant(0, NewLHS.getValueType());
CCCode = ISD::SETNE; CCCode = ISD::SETNE;
} }
@ -1891,7 +1891,7 @@ SDValue DAGTypeLegalizer::ExpandIntOp_SETCC(SDNode *N) {
IntegerExpandSetCCOperands(NewLHS, NewRHS, CCCode); IntegerExpandSetCCOperands(NewLHS, NewRHS, CCCode);
// If ExpandSetCCOperands returned a scalar, use it. // If ExpandSetCCOperands returned a scalar, use it.
if (NewRHS.Val == 0) { if (NewRHS.getNode() == 0) {
assert(NewLHS.getValueType() == N->getValueType(0) && assert(NewLHS.getValueType() == N->getValueType(0) &&
"Unexpected setcc expansion!"); "Unexpected setcc expansion!");
return NewLHS; return NewLHS;

83
lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
View File

@ -92,7 +92,7 @@ ScanOperands:
bool NeedsRevisit = false; bool NeedsRevisit = false;
unsigned i; unsigned i;
for (i = 0; i != NumOperands; ++i) { for (i = 0; i != NumOperands; ++i) {
if (IgnoreNodeResults(N->getOperand(i).Val)) if (IgnoreNodeResults(N->getOperand(i).getNode()))
continue; continue;
MVT OpVT = N->getOperand(i).getValueType(); MVT OpVT = N->getOperand(i).getValueType();
@ -194,7 +194,7 @@ NodeDone:
// Check that all operand types are legal. // Check that all operand types are legal.
for (unsigned i = 0, NumOps = I->getNumOperands(); i < NumOps; ++i) for (unsigned i = 0, NumOps = I->getNumOperands(); i < NumOps; ++i)
if (!IgnoreNodeResults(I->getOperand(i).Val) && if (!IgnoreNodeResults(I->getOperand(i).getNode()) &&
!isTypeLegal(I->getOperand(i).getValueType())) { !isTypeLegal(I->getOperand(i).getValueType())) {
cerr << "Operand type " << i << " illegal!\n"; cerr << "Operand type " << i << " illegal!\n";
Failed = true; Failed = true;
@ -221,7 +221,8 @@ NodeDone:
/// AnalyzeNewNode - The specified node is the root of a subtree of potentially /// AnalyzeNewNode - The specified node is the root of a subtree of potentially
/// new nodes. Correct any processed operands (this may change the node) and /// new nodes. Correct any processed operands (this may change the node) and
/// calculate the NodeId. /// calculate the NodeId.
void DAGTypeLegalizer::AnalyzeNewNode(SDNode *&N) { void DAGTypeLegalizer::AnalyzeNewNode(SDValue &Val) {
SDNode * const N(Val.getNode());
// If this was an existing node that is already done, we're done. // If this was an existing node that is already done, we're done.
if (N->getNodeId() != NewNode) if (N->getNodeId() != NewNode)
return; return;
@ -246,12 +247,12 @@ void DAGTypeLegalizer::AnalyzeNewNode(SDNode *&N) {
SDValue OrigOp = N->getOperand(i); SDValue OrigOp = N->getOperand(i);
SDValue Op = OrigOp; SDValue Op = OrigOp;
if (Op.Val->getNodeId() == Processed) if (Op.getNode()->getNodeId() == Processed)
RemapNode(Op); RemapNode(Op);
if (Op.Val->getNodeId() == NewNode) if (Op.getNode()->getNodeId() == NewNode)
AnalyzeNewNode(Op.Val); AnalyzeNewNode(Op);
else if (Op.Val->getNodeId() == Processed) else if (Op.getNode()->getNodeId() == Processed)
++NumProcessed; ++NumProcessed;
if (!NewOps.empty()) { if (!NewOps.empty()) {
@ -267,11 +268,14 @@ void DAGTypeLegalizer::AnalyzeNewNode(SDNode *&N) {
// Some operands changed - update the node. // Some operands changed - update the node.
if (!NewOps.empty()) if (!NewOps.empty())
N = DAG.UpdateNodeOperands(SDValue(N, 0), &NewOps[0], NewOps.size()).Val; Val.setNode(DAG.UpdateNodeOperands(SDValue(N, 0),
&NewOps[0],
NewOps.size()).getNode());
N->setNodeId(N->getNumOperands()-NumProcessed); SDNode * const Nu(Val.getNode());
if (N->getNodeId() == ReadyToProcess) Nu->setNodeId(Nu->getNumOperands()-NumProcessed);
Worklist.push_back(N); if (Nu->getNodeId() == ReadyToProcess)
Worklist.push_back(Nu);
} }
namespace { namespace {
@ -313,8 +317,8 @@ void DAGTypeLegalizer::ReplaceValueWith(SDValue From, SDValue To) {
if (From == To) return; if (From == To) return;
// If expansion produced new nodes, make sure they are properly marked. // If expansion produced new nodes, make sure they are properly marked.
ExpungeNode(From.Val); ExpungeNode(From.getNode());
AnalyzeNewNode(To.Val); // Expunges To. AnalyzeNewNode(To); // Expunges To.
// Anything that used the old node should now use the new one. Note that this // Anything that used the old node should now use the new one. Note that this
// can potentially cause recursive merging. // can potentially cause recursive merging.
@ -333,7 +337,10 @@ void DAGTypeLegalizer::ReplaceNodeWith(SDNode *From, SDNode *To) {
// If expansion produced new nodes, make sure they are properly marked. // If expansion produced new nodes, make sure they are properly marked.
ExpungeNode(From); ExpungeNode(From);
AnalyzeNewNode(To); // Expunges To.
SDValue ToNode(To, 0);
AnalyzeNewNode(ToNode); // Expunges To.
To = ToNode.getNode();
assert(From->getNumValues() == To->getNumValues() && assert(From->getNumValues() == To->getNumValues() &&
"Node results don't match"); "Node results don't match");
@ -394,39 +401,39 @@ void DAGTypeLegalizer::ExpungeNode(SDNode *N) {
for (DenseMap<SDValue, SDValue>::iterator I = PromotedIntegers.begin(), for (DenseMap<SDValue, SDValue>::iterator I = PromotedIntegers.begin(),
E = PromotedIntegers.end(); I != E; ++I) { E = PromotedIntegers.end(); I != E; ++I) {
assert(I->first.Val != N); assert(I->first.getNode() != N);
RemapNode(I->second); RemapNode(I->second);
} }
for (DenseMap<SDValue, SDValue>::iterator I = SoftenedFloats.begin(), for (DenseMap<SDValue, SDValue>::iterator I = SoftenedFloats.begin(),
E = SoftenedFloats.end(); I != E; ++I) { E = SoftenedFloats.end(); I != E; ++I) {
assert(I->first.Val != N); assert(I->first.getNode() != N);
RemapNode(I->second); RemapNode(I->second);
} }
for (DenseMap<SDValue, SDValue>::iterator I = ScalarizedVectors.begin(), for (DenseMap<SDValue, SDValue>::iterator I = ScalarizedVectors.begin(),
E = ScalarizedVectors.end(); I != E; ++I) { E = ScalarizedVectors.end(); I != E; ++I) {
assert(I->first.Val != N); assert(I->first.getNode() != N);
RemapNode(I->second); RemapNode(I->second);
} }
for (DenseMap<SDValue, std::pair<SDValue, SDValue> >::iterator for (DenseMap<SDValue, std::pair<SDValue, SDValue> >::iterator
I = ExpandedIntegers.begin(), E = ExpandedIntegers.end(); I != E; ++I){ I = ExpandedIntegers.begin(), E = ExpandedIntegers.end(); I != E; ++I){
assert(I->first.Val != N); assert(I->first.getNode() != N);
RemapNode(I->second.first); RemapNode(I->second.first);
RemapNode(I->second.second); RemapNode(I->second.second);
} }
for (DenseMap<SDValue, std::pair<SDValue, SDValue> >::iterator for (DenseMap<SDValue, std::pair<SDValue, SDValue> >::iterator
I = ExpandedFloats.begin(), E = ExpandedFloats.end(); I != E; ++I) { I = ExpandedFloats.begin(), E = ExpandedFloats.end(); I != E; ++I) {
assert(I->first.Val != N); assert(I->first.getNode() != N);
RemapNode(I->second.first); RemapNode(I->second.first);
RemapNode(I->second.second); RemapNode(I->second.second);
} }
for (DenseMap<SDValue, std::pair<SDValue, SDValue> >::iterator for (DenseMap<SDValue, std::pair<SDValue, SDValue> >::iterator
I = SplitVectors.begin(), E = SplitVectors.end(); I != E; ++I) { I = SplitVectors.begin(), E = SplitVectors.end(); I != E; ++I) {
assert(I->first.Val != N); assert(I->first.getNode() != N);
RemapNode(I->second.first); RemapNode(I->second.first);
RemapNode(I->second.second); RemapNode(I->second.second);
} }
@ -440,26 +447,26 @@ void DAGTypeLegalizer::ExpungeNode(SDNode *N) {
} }
void DAGTypeLegalizer::SetPromotedInteger(SDValue Op, SDValue Result) { void DAGTypeLegalizer::SetPromotedInteger(SDValue Op, SDValue Result) {
AnalyzeNewNode(Result.Val); AnalyzeNewNode(Result);
SDValue &OpEntry = PromotedIntegers[Op]; SDValue &OpEntry = PromotedIntegers[Op];
assert(OpEntry.Val == 0 && "Node is already promoted!"); assert(OpEntry.getNode() == 0 && "Node is already promoted!");
OpEntry = Result; OpEntry = Result;
} }
void DAGTypeLegalizer::SetSoftenedFloat(SDValue Op, SDValue Result) { void DAGTypeLegalizer::SetSoftenedFloat(SDValue Op, SDValue Result) {
AnalyzeNewNode(Result.Val); AnalyzeNewNode(Result);
SDValue &OpEntry = SoftenedFloats[Op]; SDValue &OpEntry = SoftenedFloats[Op];
assert(OpEntry.Val == 0 && "Node is already converted to integer!"); assert(OpEntry.getNode() == 0 && "Node is already converted to integer!");
OpEntry = Result; OpEntry = Result;
} }
void DAGTypeLegalizer::SetScalarizedVector(SDValue Op, SDValue Result) { void DAGTypeLegalizer::SetScalarizedVector(SDValue Op, SDValue Result) {
AnalyzeNewNode(Result.Val); AnalyzeNewNode(Result);
SDValue &OpEntry = ScalarizedVectors[Op]; SDValue &OpEntry = ScalarizedVectors[Op];
assert(OpEntry.Val == 0 && "Node is already scalarized!"); assert(OpEntry.getNode() == 0 && "Node is already scalarized!");
OpEntry = Result; OpEntry = Result;
} }
@ -468,7 +475,7 @@ void DAGTypeLegalizer::GetExpandedInteger(SDValue Op, SDValue &Lo,
std::pair<SDValue, SDValue> &Entry = ExpandedIntegers[Op]; std::pair<SDValue, SDValue> &Entry = ExpandedIntegers[Op];
RemapNode(Entry.first); RemapNode(Entry.first);
RemapNode(Entry.second); RemapNode(Entry.second);
assert(Entry.first.Val && "Operand isn't expanded"); assert(Entry.first.getNode() && "Operand isn't expanded");
Lo = Entry.first; Lo = Entry.first;
Hi = Entry.second; Hi = Entry.second;
} }
@ -476,12 +483,12 @@ void DAGTypeLegalizer::GetExpandedInteger(SDValue Op, SDValue &Lo,
void DAGTypeLegalizer::SetExpandedInteger(SDValue Op, SDValue Lo, void DAGTypeLegalizer::SetExpandedInteger(SDValue Op, SDValue Lo,
SDValue Hi) { SDValue Hi) {
// Lo/Hi may have been newly allocated, if so, add nodeid's as relevant. // Lo/Hi may have been newly allocated, if so, add nodeid's as relevant.
AnalyzeNewNode(Lo.Val); AnalyzeNewNode(Lo);
AnalyzeNewNode(Hi.Val); AnalyzeNewNode(Hi);
// Remember that this is the result of the node. // Remember that this is the result of the node.
std::pair<SDValue, SDValue> &Entry = ExpandedIntegers[Op]; std::pair<SDValue, SDValue> &Entry = ExpandedIntegers[Op];
assert(Entry.first.Val == 0 && "Node already expanded"); assert(Entry.first.getNode() == 0 && "Node already expanded");
Entry.first = Lo; Entry.first = Lo;
Entry.second = Hi; Entry.second = Hi;
} }
@ -491,7 +498,7 @@ void DAGTypeLegalizer::GetExpandedFloat(SDValue Op, SDValue &Lo,
std::pair<SDValue, SDValue> &Entry = ExpandedFloats[Op]; std::pair<SDValue, SDValue> &Entry = ExpandedFloats[Op];
RemapNode(Entry.first); RemapNode(Entry.first);
RemapNode(Entry.second); RemapNode(Entry.second);
assert(Entry.first.Val && "Operand isn't expanded"); assert(Entry.first.getNode() && "Operand isn't expanded");
Lo = Entry.first; Lo = Entry.first;
Hi = Entry.second; Hi = Entry.second;
} }
@ -499,12 +506,12 @@ void DAGTypeLegalizer::GetExpandedFloat(SDValue Op, SDValue &Lo,
void DAGTypeLegalizer::SetExpandedFloat(SDValue Op, SDValue Lo, void DAGTypeLegalizer::SetExpandedFloat(SDValue Op, SDValue Lo,
SDValue Hi) { SDValue Hi) {
// Lo/Hi may have been newly allocated, if so, add nodeid's as relevant. // Lo/Hi may have been newly allocated, if so, add nodeid's as relevant.
AnalyzeNewNode(Lo.Val); AnalyzeNewNode(Lo);
AnalyzeNewNode(Hi.Val); AnalyzeNewNode(Hi);
// Remember that this is the result of the node. // Remember that this is the result of the node.
std::pair<SDValue, SDValue> &Entry = ExpandedFloats[Op]; std::pair<SDValue, SDValue> &Entry = ExpandedFloats[Op];
assert(Entry.first.Val == 0 && "Node already expanded"); assert(Entry.first.getNode() == 0 && "Node already expanded");
Entry.first = Lo; Entry.first = Lo;
Entry.second = Hi; Entry.second = Hi;
} }
@ -514,7 +521,7 @@ void DAGTypeLegalizer::GetSplitVector(SDValue Op, SDValue &Lo,
std::pair<SDValue, SDValue> &Entry = SplitVectors[Op]; std::pair<SDValue, SDValue> &Entry = SplitVectors[Op];
RemapNode(Entry.first); RemapNode(Entry.first);
RemapNode(Entry.second); RemapNode(Entry.second);
assert(Entry.first.Val && "Operand isn't split"); assert(Entry.first.getNode() && "Operand isn't split");
Lo = Entry.first; Lo = Entry.first;
Hi = Entry.second; Hi = Entry.second;
} }
@ -522,12 +529,12 @@ void DAGTypeLegalizer::GetSplitVector(SDValue Op, SDValue &Lo,
void DAGTypeLegalizer::SetSplitVector(SDValue Op, SDValue Lo, void DAGTypeLegalizer::SetSplitVector(SDValue Op, SDValue Lo,
SDValue Hi) { SDValue Hi) {
// Lo/Hi may have been newly allocated, if so, add nodeid's as relevant. // Lo/Hi may have been newly allocated, if so, add nodeid's as relevant.
AnalyzeNewNode(Lo.Val); AnalyzeNewNode(Lo);
AnalyzeNewNode(Hi.Val); AnalyzeNewNode(Hi);
// Remember that this is the result of the node. // Remember that this is the result of the node.
std::pair<SDValue, SDValue> &Entry = SplitVectors[Op]; std::pair<SDValue, SDValue> &Entry = SplitVectors[Op];
assert(Entry.first.Val == 0 && "Node already split"); assert(Entry.first.getNode() == 0 && "Node already split");
Entry.first = Lo; Entry.first = Lo;
Entry.second = Hi; Entry.second = Hi;
} }

11
lib/CodeGen/SelectionDAG/LegalizeTypes.h
View File

@ -157,7 +157,8 @@ public:
/// for the specified node, adding it to the worklist if ready. /// for the specified node, adding it to the worklist if ready.
void ReanalyzeNode(SDNode *N) { void ReanalyzeNode(SDNode *N) {
N->setNodeId(NewNode); N->setNodeId(NewNode);
AnalyzeNewNode(N); SDValue V(N, 0);
AnalyzeNewNode(V); // FIXME: ignore the change?
} }
void NoteDeletion(SDNode *Old, SDNode *New) { void NoteDeletion(SDNode *Old, SDNode *New) {
@ -168,7 +169,7 @@ public:
} }
private: private:
void AnalyzeNewNode(SDNode *&N); void AnalyzeNewNode(SDValue &Val);
void ReplaceValueWith(SDValue From, SDValue To); void ReplaceValueWith(SDValue From, SDValue To);
void ReplaceNodeWith(SDNode *From, SDNode *To); void ReplaceNodeWith(SDNode *From, SDNode *To);
@ -197,7 +198,7 @@ private:
SDValue GetPromotedInteger(SDValue Op) { SDValue GetPromotedInteger(SDValue Op) {
SDValue &PromotedOp = PromotedIntegers[Op]; SDValue &PromotedOp = PromotedIntegers[Op];
RemapNode(PromotedOp); RemapNode(PromotedOp);
assert(PromotedOp.Val && "Operand wasn't promoted?"); assert(PromotedOp.getNode() && "Operand wasn't promoted?");
return PromotedOp; return PromotedOp;
} }
void SetPromotedInteger(SDValue Op, SDValue Result); void SetPromotedInteger(SDValue Op, SDValue Result);
@ -324,7 +325,7 @@ private:
SDValue GetSoftenedFloat(SDValue Op) { SDValue GetSoftenedFloat(SDValue Op) {
SDValue &SoftenedOp = SoftenedFloats[Op]; SDValue &SoftenedOp = SoftenedFloats[Op];
RemapNode(SoftenedOp); RemapNode(SoftenedOp);
assert(SoftenedOp.Val && "Operand wasn't converted to integer?"); assert(SoftenedOp.getNode() && "Operand wasn't converted to integer?");
return SoftenedOp; return SoftenedOp;
} }
void SetSoftenedFloat(SDValue Op, SDValue Result); void SetSoftenedFloat(SDValue Op, SDValue Result);
@ -403,7 +404,7 @@ private:
SDValue GetScalarizedVector(SDValue Op) { SDValue GetScalarizedVector(SDValue Op) {
SDValue &ScalarizedOp = ScalarizedVectors[Op]; SDValue &ScalarizedOp = ScalarizedVectors[Op];
RemapNode(ScalarizedOp); RemapNode(ScalarizedOp);
assert(ScalarizedOp.Val && "Operand wasn't scalarized?"); assert(ScalarizedOp.getNode() && "Operand wasn't scalarized?");
return ScalarizedOp; return ScalarizedOp;
} }
void SetScalarizedVector(SDValue Op, SDValue Result); void SetScalarizedVector(SDValue Op, SDValue Result);

2
lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp
View File

@ -75,7 +75,7 @@ void DAGTypeLegalizer::ExpandRes_BIT_CONVERT(SDNode *N, SDValue &Lo,
// Lower the bit-convert to a store/load from the stack, then expand the load. // Lower the bit-convert to a store/load from the stack, then expand the load.
SDValue Op = CreateStackStoreLoad(InOp, N->getValueType(0)); SDValue Op = CreateStackStoreLoad(InOp, N->getValueType(0));
ExpandRes_NormalLoad(Op.Val, Lo, Hi); ExpandRes_NormalLoad(Op.getNode(), Lo, Hi);
} }
void DAGTypeLegalizer::ExpandRes_BUILD_PAIR(SDNode *N, SDValue &Lo, void DAGTypeLegalizer::ExpandRes_BUILD_PAIR(SDNode *N, SDValue &Lo,

18
lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
View File

@ -88,7 +88,7 @@ void DAGTypeLegalizer::ScalarizeVectorResult(SDNode *N, unsigned ResNo) {
} }
// If R is null, the sub-method took care of registering the result. // If R is null, the sub-method took care of registering the result.
if (R.Val) if (R.getNode())
SetScalarizedVector(SDValue(N, ResNo), R); SetScalarizedVector(SDValue(N, ResNo), R);
} }
@ -184,7 +184,7 @@ bool DAGTypeLegalizer::ScalarizeVectorOperand(SDNode *N, unsigned OpNo) {
cerr << "\n"); cerr << "\n");
SDValue Res = SDValue(); SDValue Res = SDValue();
if (Res.Val == 0) { if (Res.getNode() == 0) {
switch (N->getOpcode()) { switch (N->getOpcode()) {
default: default:
#ifndef NDEBUG #ifndef NDEBUG
@ -206,11 +206,11 @@ bool DAGTypeLegalizer::ScalarizeVectorOperand(SDNode *N, unsigned OpNo) {
} }
// If the result is null, the sub-method took care of registering results etc. // If the result is null, the sub-method took care of registering results etc.
if (!Res.Val) return false; if (!Res.getNode()) return false;
// If the result is N, the sub-method updated N in place. Check to see if any // If the result is N, the sub-method updated N in place. Check to see if any
// operands are new, and if so, mark them. // operands are new, and if so, mark them.
if (Res.Val == N) { if (Res.getNode() == N) {
// Mark N as new and remark N and its operands. This allows us to correctly // Mark N as new and remark N and its operands. This allows us to correctly
// revisit N if it needs another step of promotion and allows us to visit // revisit N if it needs another step of promotion and allows us to visit
// any new operands to N. // any new operands to N.
@ -332,7 +332,7 @@ void DAGTypeLegalizer::SplitVectorResult(SDNode *N, unsigned ResNo) {
} }
// If Lo/Hi is null, the sub-method took care of registering results etc. // If Lo/Hi is null, the sub-method took care of registering results etc.
if (Lo.Val) if (Lo.getNode())
SetSplitVector(SDValue(N, ResNo), Lo, Hi); SetSplitVector(SDValue(N, ResNo), Lo, Hi);
} }
@ -475,7 +475,7 @@ void DAGTypeLegalizer::SplitVecRes_INSERT_VECTOR_ELT(SDNode *N, SDValue &Lo,
SDValue Load = DAG.getLoad(VecVT, Store, StackPtr, NULL, 0); SDValue Load = DAG.getLoad(VecVT, Store, StackPtr, NULL, 0);
// Split it. // Split it.
SplitVecRes_LOAD(cast<LoadSDNode>(Load.Val), Lo, Hi); SplitVecRes_LOAD(cast<LoadSDNode>(Load.getNode()), Lo, Hi);
} }
void DAGTypeLegalizer::SplitVecRes_LOAD(LoadSDNode *LD, SDValue &Lo, void DAGTypeLegalizer::SplitVecRes_LOAD(LoadSDNode *LD, SDValue &Lo,
@ -595,7 +595,7 @@ bool DAGTypeLegalizer::SplitVectorOperand(SDNode *N, unsigned OpNo) {
DEBUG(cerr << "Split node operand: "; N->dump(&DAG); cerr << "\n"); DEBUG(cerr << "Split node operand: "; N->dump(&DAG); cerr << "\n");
SDValue Res = SDValue(); SDValue Res = SDValue();
if (Res.Val == 0) { if (Res.getNode() == 0) {
switch (N->getOpcode()) { switch (N->getOpcode()) {
default: default:
#ifndef NDEBUG #ifndef NDEBUG
@ -615,11 +615,11 @@ bool DAGTypeLegalizer::SplitVectorOperand(SDNode *N, unsigned OpNo) {
} }
// If the result is null, the sub-method took care of registering results etc. // If the result is null, the sub-method took care of registering results etc.
if (!Res.Val) return false; if (!Res.getNode()) return false;
// If the result is N, the sub-method updated N in place. Check to see if any // If the result is N, the sub-method updated N in place. Check to see if any
// operands are new, and if so, mark them. // operands are new, and if so, mark them.
if (Res.Val == N) { if (Res.getNode() == N) {
// Mark N as new and remark N and its operands. This allows us to correctly // Mark N as new and remark N and its operands. This allows us to correctly
// revisit N if it needs another step of promotion and allows us to visit // revisit N if it needs another step of promotion and allows us to visit
// any new operands to N. // any new operands to N.

20
lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
View File

@ -122,7 +122,7 @@ void ScheduleDAG::BuildSchedUnits() {
if (N->getNumOperands() && if (N->getNumOperands() &&
N->getOperand(N->getNumOperands()-1).getValueType() == MVT::Flag) { N->getOperand(N->getNumOperands()-1).getValueType() == MVT::Flag) {
do { do {
N = N->getOperand(N->getNumOperands()-1).Val; N = N->getOperand(N->getNumOperands()-1).getNode();
NodeSUnit->FlaggedNodes.push_back(N); NodeSUnit->FlaggedNodes.push_back(N);
assert(N->getNodeId() == -1 && "Node already inserted!"); assert(N->getNodeId() == -1 && "Node already inserted!");
N->setNodeId(NodeSUnit->NodeNum); N->setNodeId(NodeSUnit->NodeNum);
@ -192,7 +192,7 @@ void ScheduleDAG::BuildSchedUnits() {
SU->hasPhysRegDefs = true; SU->hasPhysRegDefs = true;
for (unsigned i = 0, e = N->getNumOperands(); i != e; ++i) { for (unsigned i = 0, e = N->getNumOperands(); i != e; ++i) {
SDNode *OpN = N->getOperand(i).Val; SDNode *OpN = N->getOperand(i).getNode();
if (isPassiveNode(OpN)) continue; // Not scheduled. if (isPassiveNode(OpN)) continue; // Not scheduled.
SUnit *OpSU = &SUnits[OpN->getNodeId()]; SUnit *OpSU = &SUnits[OpN->getNodeId()];
assert(OpSU && "Node has no SUnit!"); assert(OpSU && "Node has no SUnit!");
@ -373,7 +373,7 @@ unsigned ScheduleDAG::CountResults(SDNode *Node) {
/// actual operands that will go into the resulting MachineInstr. /// actual operands that will go into the resulting MachineInstr.
unsigned ScheduleDAG::CountOperands(SDNode *Node) { unsigned ScheduleDAG::CountOperands(SDNode *Node) {
unsigned N = ComputeMemOperandsEnd(Node); unsigned N = ComputeMemOperandsEnd(Node);
while (N && isa<MemOperandSDNode>(Node->getOperand(N - 1).Val)) while (N && isa<MemOperandSDNode>(Node->getOperand(N - 1).getNode()))
--N; // Ignore MEMOPERAND nodes --N; // Ignore MEMOPERAND nodes
return N; return N;
} }
@ -429,7 +429,7 @@ void ScheduleDAG::EmitCopyFromReg(SDNode *Node, unsigned ResNo,
SDNode *User = *UI; SDNode *User = *UI;
bool Match = true; bool Match = true;
if (User->getOpcode() == ISD::CopyToReg && if (User->getOpcode() == ISD::CopyToReg &&
User->getOperand(2).Val == Node && User->getOperand(2).getNode() == Node &&
User->getOperand(2).getResNo() == ResNo) { User->getOperand(2).getResNo() == ResNo) {
unsigned DestReg = cast<RegisterSDNode>(User->getOperand(1))->getReg(); unsigned DestReg = cast<RegisterSDNode>(User->getOperand(1))->getReg();
if (TargetRegisterInfo::isVirtualRegister(DestReg)) { if (TargetRegisterInfo::isVirtualRegister(DestReg)) {
@ -440,7 +440,7 @@ void ScheduleDAG::EmitCopyFromReg(SDNode *Node, unsigned ResNo,
} else { } else {
for (unsigned i = 0, e = User->getNumOperands(); i != e; ++i) { for (unsigned i = 0, e = User->getNumOperands(); i != e; ++i) {
SDValue Op = User->getOperand(i); SDValue Op = User->getOperand(i);
if (Op.Val != Node || Op.getResNo() != ResNo) if (Op.getNode() != Node || Op.getResNo() != ResNo)
continue; continue;
MVT VT = Node->getValueType(Op.getResNo()); MVT VT = Node->getValueType(Op.getResNo());
if (VT != MVT::Other && VT != MVT::Flag) if (VT != MVT::Other && VT != MVT::Flag)
@ -489,7 +489,7 @@ unsigned ScheduleDAG::getDstOfOnlyCopyToRegUse(SDNode *Node,
SDNode *User = *Node->use_begin(); SDNode *User = *Node->use_begin();
if (User->getOpcode() == ISD::CopyToReg && if (User->getOpcode() == ISD::CopyToReg &&
User->getOperand(2).Val == Node && User->getOperand(2).getNode() == Node &&
User->getOperand(2).getResNo() == ResNo) { User->getOperand(2).getResNo() == ResNo) {
unsigned Reg = cast<RegisterSDNode>(User->getOperand(1))->getReg(); unsigned Reg = cast<RegisterSDNode>(User->getOperand(1))->getReg();
if (TargetRegisterInfo::isVirtualRegister(Reg)) if (TargetRegisterInfo::isVirtualRegister(Reg))
@ -513,7 +513,7 @@ void ScheduleDAG::CreateVirtualRegisters(SDNode *Node, MachineInstr *MI,
UI != E; ++UI) { UI != E; ++UI) {
SDNode *User = *UI; SDNode *User = *UI;
if (User->getOpcode() == ISD::CopyToReg && if (User->getOpcode() == ISD::CopyToReg &&
User->getOperand(2).Val == Node && User->getOperand(2).getNode() == Node &&
User->getOperand(2).getResNo() == i) { User->getOperand(2).getResNo() == i) {
unsigned Reg = cast<RegisterSDNode>(User->getOperand(1))->getReg(); unsigned Reg = cast<RegisterSDNode>(User->getOperand(1))->getReg();
if (TargetRegisterInfo::isVirtualRegister(Reg)) { if (TargetRegisterInfo::isVirtualRegister(Reg)) {
@ -547,7 +547,7 @@ unsigned ScheduleDAG::getVR(SDValue Op,
if (Op.isMachineOpcode() && if (Op.isMachineOpcode() &&
Op.getMachineOpcode() == TargetInstrInfo::IMPLICIT_DEF) { Op.getMachineOpcode() == TargetInstrInfo::IMPLICIT_DEF) {
// Add an IMPLICIT_DEF instruction before every use. // Add an IMPLICIT_DEF instruction before every use.
unsigned VReg = getDstOfOnlyCopyToRegUse(Op.Val, Op.getResNo()); unsigned VReg = getDstOfOnlyCopyToRegUse(Op.getNode(), Op.getResNo());
// IMPLICIT_DEF can produce any type of result so its TargetInstrDesc // IMPLICIT_DEF can produce any type of result so its TargetInstrDesc
// does not include operand register class info. // does not include operand register class info.
if (!VReg) { if (!VReg) {
@ -600,7 +600,7 @@ void ScheduleDAG::AddOperand(MachineInstr *MI, SDValue Op,
if (RC && VRC != RC) { if (RC && VRC != RC) {
cerr << "Register class of operand and regclass of use don't agree!\n"; cerr << "Register class of operand and regclass of use don't agree!\n";
cerr << "Operand = " << IIOpNum << "\n"; cerr << "Operand = " << IIOpNum << "\n";
cerr << "Op->Val = "; Op.Val->dump(&DAG); cerr << "\n"; cerr << "Op->Val = "; Op.getNode()->dump(&DAG); cerr << "\n";
cerr << "MI = "; MI->print(cerr); cerr << "MI = "; MI->print(cerr);
cerr << "VReg = " << VReg << "\n"; cerr << "VReg = " << VReg << "\n";
cerr << "VReg RegClass size = " << VRC->getSize() cerr << "VReg RegClass size = " << VRC->getSize()
@ -712,7 +712,7 @@ void ScheduleDAG::EmitSubregNode(SDNode *Node,
UI != E; ++UI) { UI != E; ++UI) {
SDNode *User = *UI; SDNode *User = *UI;
if (User->getOpcode() == ISD::CopyToReg && if (User->getOpcode() == ISD::CopyToReg &&
User->getOperand(2).Val == Node) { User->getOperand(2).getNode() == Node) {
unsigned DestReg = cast<RegisterSDNode>(User->getOperand(1))->getReg(); unsigned DestReg = cast<RegisterSDNode>(User->getOperand(1))->getReg();
if (TargetRegisterInfo::isVirtualRegister(DestReg)) { if (TargetRegisterInfo::isVirtualRegister(DestReg)) {
VRBase = DestReg; VRBase = DestReg;

12
lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
View File

@ -224,7 +224,7 @@ void ScheduleDAGRRList::CommuteNodesToReducePressure() {
if (TID.getOperandConstraint(j+NumRes, TOI::TIED_TO) == -1) if (TID.getOperandConstraint(j+NumRes, TOI::TIED_TO) == -1)
continue; continue;
SDNode *OpN = SU->Node->getOperand(j).Val; SDNode *OpN = SU->Node->getOperand(j).getNode();
SUnit *OpSU = isPassiveNode(OpN) ? NULL : &SUnits[OpN->getNodeId()]; SUnit *OpSU = isPassiveNode(OpN) ? NULL : &SUnits[OpN->getNodeId()];
if (OpSU && OperandSeen.count(OpSU) == 1) { if (OpSU && OperandSeen.count(OpSU) == 1) {
// Ok, so SU is not the last use of OpSU, but SU is two-address so // Ok, so SU is not the last use of OpSU, but SU is two-address so
@ -233,7 +233,7 @@ void ScheduleDAGRRList::CommuteNodesToReducePressure() {
bool DoCommute = true; bool DoCommute = true;
for (unsigned k = 0; k < NumOps; ++k) { for (unsigned k = 0; k < NumOps; ++k) {
if (k != j) { if (k != j) {
OpN = SU->Node->getOperand(k).Val; OpN = SU->Node->getOperand(k).getNode();
OpSU = isPassiveNode(OpN) ? NULL : &SUnits[OpN->getNodeId()]; OpSU = isPassiveNode(OpN) ? NULL : &SUnits[OpN->getNodeId()];
if (OpSU && OperandSeen.count(OpSU) == 1) { if (OpSU && OperandSeen.count(OpSU) == 1) {
DoCommute = false; DoCommute = false;
@ -641,7 +641,7 @@ SUnit *ScheduleDAGRRList::CopyAndMoveSuccessors(SUnit *SU) {
} }
for (unsigned i = 0, e = N->getNumOperands(); i != e; ++i) { for (unsigned i = 0, e = N->getNumOperands(); i != e; ++i) {
const SDValue &Op = N->getOperand(i); const SDValue &Op = N->getOperand(i);
MVT VT = Op.Val->getValueType(Op.getResNo()); MVT VT = Op.getNode()->getValueType(Op.getResNo());
if (VT == MVT::Flag) if (VT == MVT::Flag)
return NULL; return NULL;
} }
@ -930,7 +930,7 @@ void ScheduleDAGRRList::ListScheduleBottomUp() {
unsigned CurCycle = 0; unsigned CurCycle = 0;
// Add root to Available queue. // Add root to Available queue.
if (!SUnits.empty()) { if (!SUnits.empty()) {
SUnit *RootSU = &SUnits[DAG.getRoot().Val->getNodeId()]; SUnit *RootSU = &SUnits[DAG.getRoot().getNode()->getNodeId()];
assert(RootSU->Succs.empty() && "Graph root shouldn't have successors!"); assert(RootSU->Succs.empty() && "Graph root shouldn't have successors!");
RootSU->isAvailable = true; RootSU->isAvailable = true;
AvailableQueue->push(RootSU); AvailableQueue->push(RootSU);
@ -1668,7 +1668,7 @@ BURegReductionPriorityQueue::canClobber(const SUnit *SU, const SUnit *Op) {
unsigned NumOps = TID.getNumOperands() - NumRes; unsigned NumOps = TID.getNumOperands() - NumRes;
for (unsigned i = 0; i != NumOps; ++i) { for (unsigned i = 0; i != NumOps; ++i) {
if (TID.getOperandConstraint(i+NumRes, TOI::TIED_TO) != -1) { if (TID.getOperandConstraint(i+NumRes, TOI::TIED_TO) != -1) {
SDNode *DU = SU->Node->getOperand(i).Val; SDNode *DU = SU->Node->getOperand(i).getNode();
if (DU->getNodeId() != -1 && if (DU->getNodeId() != -1 &&
Op->OrigNode == &(*SUnits)[DU->getNodeId()]) Op->OrigNode == &(*SUnits)[DU->getNodeId()])
return true; return true;
@ -1742,7 +1742,7 @@ void BURegReductionPriorityQueue::AddPseudoTwoAddrDeps() {
unsigned NumOps = TID.getNumOperands() - NumRes; unsigned NumOps = TID.getNumOperands() - NumRes;
for (unsigned j = 0; j != NumOps; ++j) { for (unsigned j = 0; j != NumOps; ++j) {
if (TID.getOperandConstraint(j+NumRes, TOI::TIED_TO) != -1) { if (TID.getOperandConstraint(j+NumRes, TOI::TIED_TO) != -1) {
SDNode *DU = SU->Node->getOperand(j).Val; SDNode *DU = SU->Node->getOperand(j).getNode();
if (DU->getNodeId() == -1) if (DU->getNodeId() == -1)
continue; continue;
const SUnit *DUSU = &(*SUnits)[DU->getNodeId()]; const SUnit *DUSU = &(*SUnits)[DU->getNodeId()];

180
lib/CodeGen/SelectionDAG/SelectionDAG.cpp
View File

@ -96,7 +96,7 @@ bool ConstantFPSDNode::isValueValidForType(MVT VT,
bool ISD::isBuildVectorAllOnes(const SDNode *N) { bool ISD::isBuildVectorAllOnes(const SDNode *N) {
// Look through a bit convert. // Look through a bit convert.
if (N->getOpcode() == ISD::BIT_CONVERT) if (N->getOpcode() == ISD::BIT_CONVERT)
N = N->getOperand(0).Val; N = N->getOperand(0).getNode();
if (N->getOpcode() != ISD::BUILD_VECTOR) return false; if (N->getOpcode() != ISD::BUILD_VECTOR) return false;
@ -137,7 +137,7 @@ bool ISD::isBuildVectorAllOnes(const SDNode *N) {
bool ISD::isBuildVectorAllZeros(const SDNode *N) { bool ISD::isBuildVectorAllZeros(const SDNode *N) {
// Look through a bit convert. // Look through a bit convert.
if (N->getOpcode() == ISD::BIT_CONVERT) if (N->getOpcode() == ISD::BIT_CONVERT)
N = N->getOperand(0).Val; N = N->getOperand(0).getNode();
if (N->getOpcode() != ISD::BUILD_VECTOR) return false; if (N->getOpcode() != ISD::BUILD_VECTOR) return false;
@ -326,7 +326,7 @@ static void AddNodeIDValueTypes(FoldingSetNodeID &ID, SDVTList VTList) {
static void AddNodeIDOperands(FoldingSetNodeID &ID, static void AddNodeIDOperands(FoldingSetNodeID &ID,
const SDValue *Ops, unsigned NumOps) { const SDValue *Ops, unsigned NumOps) {
for (; NumOps; --NumOps, ++Ops) { for (; NumOps; --NumOps, ++Ops) {
ID.AddPointer(Ops->Val); ID.AddPointer(Ops->getNode());
ID.AddInteger(Ops->getResNo()); ID.AddInteger(Ops->getResNo());
} }
} }
@ -1230,9 +1230,9 @@ SDValue SelectionDAG::FoldSetCC(MVT VT, SDValue N1,
break; break;
} }
if (ConstantSDNode *N2C = dyn_cast<ConstantSDNode>(N2.Val)) { if (ConstantSDNode *N2C = dyn_cast<ConstantSDNode>(N2.getNode())) {
const APInt &C2 = N2C->getAPIntValue(); const APInt &C2 = N2C->getAPIntValue();
if (ConstantSDNode *N1C = dyn_cast<ConstantSDNode>(N1.Val)) { if (ConstantSDNode *N1C = dyn_cast<ConstantSDNode>(N1.getNode())) {
const APInt &C1 = N1C->getAPIntValue(); const APInt &C1 = N1C->getAPIntValue();
switch (Cond) { switch (Cond) {
@ -1250,8 +1250,8 @@ SDValue SelectionDAG::FoldSetCC(MVT VT, SDValue N1,
} }
} }
} }
if (ConstantFPSDNode *N1C = dyn_cast<ConstantFPSDNode>(N1.Val)) { if (ConstantFPSDNode *N1C = dyn_cast<ConstantFPSDNode>(N1.getNode())) {
if (ConstantFPSDNode *N2C = dyn_cast<ConstantFPSDNode>(N2.Val)) { if (ConstantFPSDNode *N2C = dyn_cast<ConstantFPSDNode>(N2.getNode())) {
// No compile time operations on this type yet. // No compile time operations on this type yet.
if (N1C->getValueType(0) == MVT::ppcf128) if (N1C->getValueType(0) == MVT::ppcf128)
return SDValue(); return SDValue();
@ -1572,7 +1572,7 @@ void SelectionDAG::ComputeMaskedBits(SDValue Op, const APInt &Mask,
return; return;
} }
case ISD::LOAD: { case ISD::LOAD: {
if (ISD::isZEXTLoad(Op.Val)) { if (ISD::isZEXTLoad(Op.getNode())) {
LoadSDNode *LD = cast<LoadSDNode>(Op); LoadSDNode *LD = cast<LoadSDNode>(Op);
MVT VT = LD->getMemoryVT(); MVT VT = LD->getMemoryVT();
unsigned MemBits = VT.getSizeInBits(); unsigned MemBits = VT.getSizeInBits();
@ -2024,7 +2024,7 @@ SDValue SelectionDAG::getShuffleScalarElt(const SDNode *N, unsigned i) {
if (V.getOpcode() == ISD::BUILD_VECTOR) if (V.getOpcode() == ISD::BUILD_VECTOR)
return V.getOperand(Index); return V.getOperand(Index);
if (V.getOpcode() == ISD::VECTOR_SHUFFLE) if (V.getOpcode() == ISD::VECTOR_SHUFFLE)
return getShuffleScalarElt(V.Val, Index); return getShuffleScalarElt(V.getNode(), Index);
return SDValue(); return SDValue();
} }
@ -2050,7 +2050,7 @@ SDValue SelectionDAG::getNode(unsigned Opcode, MVT VT) {
SDValue SelectionDAG::getNode(unsigned Opcode, MVT VT, SDValue Operand) { SDValue SelectionDAG::getNode(unsigned Opcode, MVT VT, SDValue Operand) {
// Constant fold unary operations with an integer constant operand. // Constant fold unary operations with an integer constant operand.
if (ConstantSDNode *C = dyn_cast<ConstantSDNode>(Operand.Val)) { if (ConstantSDNode *C = dyn_cast<ConstantSDNode>(Operand.getNode())) {
const APInt &Val = C->getAPIntValue(); const APInt &Val = C->getAPIntValue();
unsigned BitWidth = VT.getSizeInBits(); unsigned BitWidth = VT.getSizeInBits();
switch (Opcode) { switch (Opcode) {
@ -2091,7 +2091,7 @@ SDValue SelectionDAG::getNode(unsigned Opcode, MVT VT, SDValue Operand) {
} }
// Constant fold unary operations with a floating point constant operand. // Constant fold unary operations with a floating point constant operand.
if (ConstantFPSDNode *C = dyn_cast<ConstantFPSDNode>(Operand.Val)) { if (ConstantFPSDNode *C = dyn_cast<ConstantFPSDNode>(Operand.getNode())) {
APFloat V = C->getValueAPF(); // make copy APFloat V = C->getValueAPF(); // make copy
if (VT != MVT::ppcf128 && Operand.getValueType() != MVT::ppcf128) { if (VT != MVT::ppcf128 && Operand.getValueType() != MVT::ppcf128) {
switch (Opcode) { switch (Opcode) {
@ -2130,7 +2130,7 @@ SDValue SelectionDAG::getNode(unsigned Opcode, MVT VT, SDValue Operand) {
} }
} }
unsigned OpOpcode = Operand.Val->getOpcode(); unsigned OpOpcode = Operand.getNode()->getOpcode();
switch (Opcode) { switch (Opcode) {
case ISD::TokenFactor: case ISD::TokenFactor:
case ISD::CONCAT_VECTORS: case ISD::CONCAT_VECTORS:
@ -2150,7 +2150,7 @@ SDValue SelectionDAG::getNode(unsigned Opcode, MVT VT, SDValue Operand) {
assert(Operand.getValueType().bitsLT(VT) assert(Operand.getValueType().bitsLT(VT)
&& "Invalid sext node, dst < src!"); && "Invalid sext node, dst < src!");
if (OpOpcode == ISD::SIGN_EXTEND || OpOpcode == ISD::ZERO_EXTEND) if (OpOpcode == ISD::SIGN_EXTEND || OpOpcode == ISD::ZERO_EXTEND)
return getNode(OpOpcode, VT, Operand.Val->getOperand(0)); return getNode(OpOpcode, VT, Operand.getNode()->getOperand(0));
break; break;
case ISD::ZERO_EXTEND: case ISD::ZERO_EXTEND:
assert(VT.isInteger() && Operand.getValueType().isInteger() && assert(VT.isInteger() && Operand.getValueType().isInteger() &&
@ -2159,7 +2159,7 @@ SDValue SelectionDAG::getNode(unsigned Opcode, MVT VT, SDValue Operand) {
assert(Operand.getValueType().bitsLT(VT) assert(Operand.getValueType().bitsLT(VT)
&& "Invalid zext node, dst < src!"); && "Invalid zext node, dst < src!");
if (OpOpcode == ISD::ZERO_EXTEND) // (zext (zext x)) -> (zext x) if (OpOpcode == ISD::ZERO_EXTEND) // (zext (zext x)) -> (zext x)
return getNode(ISD::ZERO_EXTEND, VT, Operand.Val->getOperand(0)); return getNode(ISD::ZERO_EXTEND, VT, Operand.getNode()->getOperand(0));
break; break;
case ISD::ANY_EXTEND: case ISD::ANY_EXTEND:
assert(VT.isInteger() && Operand.getValueType().isInteger() && assert(VT.isInteger() && Operand.getValueType().isInteger() &&
@ -2169,7 +2169,7 @@ SDValue SelectionDAG::getNode(unsigned Opcode, MVT VT, SDValue Operand) {
&& "Invalid anyext node, dst < src!"); && "Invalid anyext node, dst < src!");
if (OpOpcode == ISD::ZERO_EXTEND || OpOpcode == ISD::SIGN_EXTEND) if (OpOpcode == ISD::ZERO_EXTEND || OpOpcode == ISD::SIGN_EXTEND)
// (ext (zext x)) -> (zext x) and (ext (sext x)) -> (sext x) // (ext (zext x)) -> (zext x) and (ext (sext x)) -> (sext x)
return getNode(OpOpcode, VT, Operand.Val->getOperand(0)); return getNode(OpOpcode, VT, Operand.getNode()->getOperand(0));
break; break;
case ISD::TRUNCATE: case ISD::TRUNCATE:
assert(VT.isInteger() && Operand.getValueType().isInteger() && assert(VT.isInteger() && Operand.getValueType().isInteger() &&
@ -2178,16 +2178,16 @@ SDValue SelectionDAG::getNode(unsigned Opcode, MVT VT, SDValue Operand) {
assert(Operand.getValueType().bitsGT(VT) assert(Operand.getValueType().bitsGT(VT)
&& "Invalid truncate node, src < dst!"); && "Invalid truncate node, src < dst!");
if (OpOpcode == ISD::TRUNCATE) if (OpOpcode == ISD::TRUNCATE)
return getNode(ISD::TRUNCATE, VT, Operand.Val->getOperand(0)); return getNode(ISD::TRUNCATE, VT, Operand.getNode()->getOperand(0));
else if (OpOpcode == ISD::ZERO_EXTEND || OpOpcode == ISD::SIGN_EXTEND || else if (OpOpcode == ISD::ZERO_EXTEND || OpOpcode == ISD::SIGN_EXTEND ||
OpOpcode == ISD::ANY_EXTEND) { OpOpcode == ISD::ANY_EXTEND) {
// If the source is smaller than the dest, we still need an extend. // If the source is smaller than the dest, we still need an extend.
if (Operand.Val->getOperand(0).getValueType().bitsLT(VT)) if (Operand.getNode()->getOperand(0).getValueType().bitsLT(VT))
return getNode(OpOpcode, VT, Operand.Val->getOperand(0)); return getNode(OpOpcode, VT, Operand.getNode()->getOperand(0));
else if (Operand.Val->getOperand(0).getValueType().bitsGT(VT)) else if (Operand.getNode()->getOperand(0).getValueType().bitsGT(VT))
return getNode(ISD::TRUNCATE, VT, Operand.Val->getOperand(0)); return getNode(ISD::TRUNCATE, VT, Operand.getNode()->getOperand(0));
else else
return Operand.Val->getOperand(0); return Operand.getNode()->getOperand(0);
} }
break; break;
case ISD::BIT_CONVERT: case ISD::BIT_CONVERT:
@ -2215,14 +2215,14 @@ SDValue SelectionDAG::getNode(unsigned Opcode, MVT VT, SDValue Operand) {
break; break;
case ISD::FNEG: case ISD::FNEG:
if (OpOpcode == ISD::FSUB) // -(X-Y) -> (Y-X) if (OpOpcode == ISD::FSUB) // -(X-Y) -> (Y-X)
return getNode(ISD::FSUB, VT, Operand.Val->getOperand(1), return getNode(ISD::FSUB, VT, Operand.getNode()->getOperand(1),
Operand.Val->getOperand(0)); Operand.getNode()->getOperand(0));
if (OpOpcode == ISD::FNEG) // --X -> X if (OpOpcode == ISD::FNEG) // --X -> X
return Operand.Val->getOperand(0); return Operand.getNode()->getOperand(0);
break; break;
case ISD::FABS: case ISD::FABS:
if (OpOpcode == ISD::FNEG) // abs(-X) -> abs(X) if (OpOpcode == ISD::FNEG) // abs(-X) -> abs(X)
return getNode(ISD::FABS, VT, Operand.Val->getOperand(0)); return getNode(ISD::FABS, VT, Operand.getNode()->getOperand(0));
break; break;
} }
@ -2252,8 +2252,8 @@ SDValue SelectionDAG::getNode(unsigned Opcode, MVT VT, SDValue Operand) {
SDValue SelectionDAG::getNode(unsigned Opcode, MVT VT, SDValue SelectionDAG::getNode(unsigned Opcode, MVT VT,
SDValue N1, SDValue N2) { SDValue N1, SDValue N2) {
ConstantSDNode *N1C = dyn_cast<ConstantSDNode>(N1.Val); ConstantSDNode *N1C = dyn_cast<ConstantSDNode>(N1.getNode());
ConstantSDNode *N2C = dyn_cast<ConstantSDNode>(N2.Val); ConstantSDNode *N2C = dyn_cast<ConstantSDNode>(N2.getNode());
switch (Opcode) { switch (Opcode) {
default: break; default: break;
case ISD::TokenFactor: case ISD::TokenFactor:
@ -2268,8 +2268,8 @@ SDValue SelectionDAG::getNode(unsigned Opcode, MVT VT,
// one big BUILD_VECTOR. // one big BUILD_VECTOR.
if (N1.getOpcode() == ISD::BUILD_VECTOR && if (N1.getOpcode() == ISD::BUILD_VECTOR &&
N2.getOpcode() == ISD::BUILD_VECTOR) { N2.getOpcode() == ISD::BUILD_VECTOR) {
SmallVector<SDValue, 16> Elts(N1.Val->op_begin(), N1.Val->op_end()); SmallVector<SDValue, 16> Elts(N1.getNode()->op_begin(), N1.getNode()->op_end());
Elts.insert(Elts.end(), N2.Val->op_begin(), N2.Val->op_end()); Elts.insert(Elts.end(), N2.getNode()->op_begin(), N2.getNode()->op_end());
return getNode(ISD::BUILD_VECTOR, VT, &Elts[0], Elts.size()); return getNode(ISD::BUILD_VECTOR, VT, &Elts[0], Elts.size());
} }
break; break;
@ -2471,8 +2471,8 @@ SDValue SelectionDAG::getNode(unsigned Opcode, MVT VT,
} }
// Constant fold FP operations. // Constant fold FP operations.
ConstantFPSDNode *N1CFP = dyn_cast<ConstantFPSDNode>(N1.Val); ConstantFPSDNode *N1CFP = dyn_cast<ConstantFPSDNode>(N1.getNode());
ConstantFPSDNode *N2CFP = dyn_cast<ConstantFPSDNode>(N2.Val); ConstantFPSDNode *N2CFP = dyn_cast<ConstantFPSDNode>(N2.getNode());
if (N1CFP) { if (N1CFP) {
if (!N2CFP && isCommutativeBinOp(Opcode)) { if (!N2CFP && isCommutativeBinOp(Opcode)) {
// Cannonicalize constant to RHS if commutative // Cannonicalize constant to RHS if commutative
@ -2615,8 +2615,8 @@ SDValue SelectionDAG::getNode(unsigned Opcode, MVT VT,
SDValue SelectionDAG::getNode(unsigned Opcode, MVT VT, SDValue SelectionDAG::getNode(unsigned Opcode, MVT VT,
SDValue N1, SDValue N2, SDValue N3) { SDValue N1, SDValue N2, SDValue N3) {
// Perform various simplifications. // Perform various simplifications.
ConstantSDNode *N1C = dyn_cast<ConstantSDNode>(N1.Val); ConstantSDNode *N1C = dyn_cast<ConstantSDNode>(N1.getNode());
ConstantSDNode *N2C = dyn_cast<ConstantSDNode>(N2.Val); ConstantSDNode *N2C = dyn_cast<ConstantSDNode>(N2.getNode());
switch (Opcode) { switch (Opcode) {
case ISD::CONCAT_VECTORS: case ISD::CONCAT_VECTORS:
// A CONCAT_VECTOR with all operands BUILD_VECTOR can be simplified to // A CONCAT_VECTOR with all operands BUILD_VECTOR can be simplified to
@ -2624,16 +2624,16 @@ SDValue SelectionDAG::getNode(unsigned Opcode, MVT VT,
if (N1.getOpcode() == ISD::BUILD_VECTOR && if (N1.getOpcode() == ISD::BUILD_VECTOR &&
N2.getOpcode() == ISD::BUILD_VECTOR && N2.getOpcode() == ISD::BUILD_VECTOR &&
N3.getOpcode() == ISD::BUILD_VECTOR) { N3.getOpcode() == ISD::BUILD_VECTOR) {
SmallVector<SDValue, 16> Elts(N1.Val->op_begin(), N1.Val->op_end()); SmallVector<SDValue, 16> Elts(N1.getNode()->op_begin(), N1.getNode()->op_end());
Elts.insert(Elts.end(), N2.Val->op_begin(), N2.Val->op_end()); Elts.insert(Elts.end(), N2.getNode()->op_begin(), N2.getNode()->op_end());
Elts.insert(Elts.end(), N3.Val->op_begin(), N3.Val->op_end()); Elts.insert(Elts.end(), N3.getNode()->op_begin(), N3.getNode()->op_end());
return getNode(ISD::BUILD_VECTOR, VT, &Elts[0], Elts.size()); return getNode(ISD::BUILD_VECTOR, VT, &Elts[0], Elts.size());
} }
break; break;
case ISD::SETCC: { case ISD::SETCC: {
// Use FoldSetCC to simplify SETCC's. // Use FoldSetCC to simplify SETCC's.
SDValue Simp = FoldSetCC(VT, N1, N2, cast<CondCodeSDNode>(N3)->get()); SDValue Simp = FoldSetCC(VT, N1, N2, cast<CondCodeSDNode>(N3)->get());
if (Simp.Val) return Simp; if (Simp.getNode()) return Simp;
break; break;
} }
case ISD::SELECT: case ISD::SELECT:
@ -3049,7 +3049,7 @@ SDValue SelectionDAG::getMemcpy(SDValue Chain, SDValue Dst,
SDValue Result = SDValue Result =
getMemcpyLoadsAndStores(*this, Chain, Dst, Src, ConstantSize->getValue(), getMemcpyLoadsAndStores(*this, Chain, Dst, Src, ConstantSize->getValue(),
Align, false, DstSV, DstSVOff, SrcSV, SrcSVOff); Align, false, DstSV, DstSVOff, SrcSV, SrcSVOff);
if (Result.Val) if (Result.getNode())
return Result; return Result;
} }
@ -3059,7 +3059,7 @@ SDValue SelectionDAG::getMemcpy(SDValue Chain, SDValue Dst,
TLI.EmitTargetCodeForMemcpy(*this, Chain, Dst, Src, Size, Align, TLI.EmitTargetCodeForMemcpy(*this, Chain, Dst, Src, Size, Align,
AlwaysInline, AlwaysInline,
DstSV, DstSVOff, SrcSV, SrcSVOff); DstSV, DstSVOff, SrcSV, SrcSVOff);
if (Result.Val) if (Result.getNode())
return Result; return Result;
// If we really need inline code and the target declined to provide it, // If we really need inline code and the target declined to provide it,
@ -3103,7 +3103,7 @@ SDValue SelectionDAG::getMemmove(SDValue Chain, SDValue Dst,
SDValue Result = SDValue Result =
getMemmoveLoadsAndStores(*this, Chain, Dst, Src, ConstantSize->getValue(), getMemmoveLoadsAndStores(*this, Chain, Dst, Src, ConstantSize->getValue(),
Align, false, DstSV, DstSVOff, SrcSV, SrcSVOff); Align, false, DstSV, DstSVOff, SrcSV, SrcSVOff);
if (Result.Val) if (Result.getNode())
return Result; return Result;
} }
@ -3112,7 +3112,7 @@ SDValue SelectionDAG::getMemmove(SDValue Chain, SDValue Dst,
SDValue Result = SDValue Result =
TLI.EmitTargetCodeForMemmove(*this, Chain, Dst, Src, Size, Align, TLI.EmitTargetCodeForMemmove(*this, Chain, Dst, Src, Size, Align,
DstSV, DstSVOff, SrcSV, SrcSVOff); DstSV, DstSVOff, SrcSV, SrcSVOff);
if (Result.Val) if (Result.getNode())
return Result; return Result;
// Emit a library call. // Emit a library call.
@ -3146,7 +3146,7 @@ SDValue SelectionDAG::getMemset(SDValue Chain, SDValue Dst,
SDValue Result = SDValue Result =
getMemsetStores(*this, Chain, Dst, Src, ConstantSize->getValue(), Align, getMemsetStores(*this, Chain, Dst, Src, ConstantSize->getValue(), Align,
DstSV, DstSVOff); DstSV, DstSVOff);
if (Result.Val) if (Result.getNode())
return Result; return Result;
} }
@ -3155,7 +3155,7 @@ SDValue SelectionDAG::getMemset(SDValue Chain, SDValue Dst,
SDValue Result = SDValue Result =
TLI.EmitTargetCodeForMemset(*this, Chain, Dst, Src, Size, Align, TLI.EmitTargetCodeForMemset(*this, Chain, Dst, Src, Size, Align,
DstSV, DstSVOff); DstSV, DstSVOff);
if (Result.Val) if (Result.getNode())
return Result; return Result;
// Emit a library call. // Emit a library call.
@ -3737,7 +3737,7 @@ SDVTList SelectionDAG::getVTList(const MVT *VTs, unsigned NumVTs) {
/// input node is returned. As a degenerate case, if you specify the same /// input node is returned. As a degenerate case, if you specify the same
/// input operands as the node already has, the input node is returned. /// input operands as the node already has, the input node is returned.
SDValue SelectionDAG::UpdateNodeOperands(SDValue InN, SDValue Op) { SDValue SelectionDAG::UpdateNodeOperands(SDValue InN, SDValue Op) {
SDNode *N = InN.Val; SDNode *N = InN.getNode();
assert(N->getNumOperands() == 1 && "Update with wrong number of operands"); assert(N->getNumOperands() == 1 && "Update with wrong number of operands");
// Check to see if there is no change. // Check to see if there is no change.
@ -3756,7 +3756,7 @@ SDValue SelectionDAG::UpdateNodeOperands(SDValue InN, SDValue Op) {
N->OperandList[0].getVal()->removeUser(0, N); N->OperandList[0].getVal()->removeUser(0, N);
N->OperandList[0] = Op; N->OperandList[0] = Op;
N->OperandList[0].setUser(N); N->OperandList[0].setUser(N);
Op.Val->addUser(0, N); Op.getNode()->addUser(0, N);
// If this gets put into a CSE map, add it. // If this gets put into a CSE map, add it.
if (InsertPos) CSEMap.InsertNode(N, InsertPos); if (InsertPos) CSEMap.InsertNode(N, InsertPos);
@ -3765,7 +3765,7 @@ SDValue SelectionDAG::UpdateNodeOperands(SDValue InN, SDValue Op) {
SDValue SelectionDAG:: SDValue SelectionDAG::
UpdateNodeOperands(SDValue InN, SDValue Op1, SDValue Op2) { UpdateNodeOperands(SDValue InN, SDValue Op1, SDValue Op2) {
SDNode *N = InN.Val; SDNode *N = InN.getNode();
assert(N->getNumOperands() == 2 && "Update with wrong number of operands"); assert(N->getNumOperands() == 2 && "Update with wrong number of operands");
// Check to see if there is no change. // Check to see if there is no change.
@ -3786,13 +3786,13 @@ UpdateNodeOperands(SDValue InN, SDValue Op1, SDValue Op2) {
N->OperandList[0].getVal()->removeUser(0, N); N->OperandList[0].getVal()->removeUser(0, N);
N->OperandList[0] = Op1; N->OperandList[0] = Op1;
N->OperandList[0].setUser(N); N->OperandList[0].setUser(N);
Op1.Val->addUser(0, N); Op1.getNode()->addUser(0, N);
} }
if (N->OperandList[1] != Op2) { if (N->OperandList[1] != Op2) {
N->OperandList[1].getVal()->removeUser(1, N); N->OperandList[1].getVal()->removeUser(1, N);
N->OperandList[1] = Op2; N->OperandList[1] = Op2;
N->OperandList[1].setUser(N); N->OperandList[1].setUser(N);
Op2.Val->addUser(1, N); Op2.getNode()->addUser(1, N);
} }
// If this gets put into a CSE map, add it. // If this gets put into a CSE map, add it.
@ -3822,7 +3822,7 @@ UpdateNodeOperands(SDValue N, SDValue Op1, SDValue Op2,
SDValue SelectionDAG:: SDValue SelectionDAG::
UpdateNodeOperands(SDValue InN, const SDValue *Ops, unsigned NumOps) { UpdateNodeOperands(SDValue InN, const SDValue *Ops, unsigned NumOps) {
SDNode *N = InN.Val; SDNode *N = InN.getNode();
assert(N->getNumOperands() == NumOps && assert(N->getNumOperands() == NumOps &&
"Update with wrong number of operands"); "Update with wrong number of operands");
@ -3853,7 +3853,7 @@ UpdateNodeOperands(SDValue InN, const SDValue *Ops, unsigned NumOps) {
N->OperandList[i].getVal()->removeUser(i, N); N->OperandList[i].getVal()->removeUser(i, N);
N->OperandList[i] = Ops[i]; N->OperandList[i] = Ops[i];
N->OperandList[i].setUser(N); N->OperandList[i].setUser(N);
Ops[i].Val->addUser(i, N); Ops[i].getNode()->addUser(i, N);
} }
} }
@ -4134,70 +4134,70 @@ SDNode *SelectionDAG::MorphNodeTo(SDNode *N, unsigned Opc,
/// node of the specified opcode and operands, it returns that node instead of /// node of the specified opcode and operands, it returns that node instead of
/// the current one. /// the current one.
SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT) { SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT) {
return getNode(~Opcode, VT).Val; return getNode(~Opcode, VT).getNode();
} }
SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT, SDValue Op1) { SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT, SDValue Op1) {
return getNode(~Opcode, VT, Op1).Val; return getNode(~Opcode, VT, Op1).getNode();
} }
SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT, SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT,
SDValue Op1, SDValue Op2) { SDValue Op1, SDValue Op2) {
return getNode(~Opcode, VT, Op1, Op2).Val; return getNode(~Opcode, VT, Op1, Op2).getNode();
} }
SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT, SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT,
SDValue Op1, SDValue Op2, SDValue Op1, SDValue Op2,
SDValue Op3) { SDValue Op3) {
return getNode(~Opcode, VT, Op1, Op2, Op3).Val; return getNode(~Opcode, VT, Op1, Op2, Op3).getNode();
} }
SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT, SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT,
const SDValue *Ops, unsigned NumOps) { const SDValue *Ops, unsigned NumOps) {
return getNode(~Opcode, VT, Ops, NumOps).Val; return getNode(~Opcode, VT, Ops, NumOps).getNode();
} }
SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT1, MVT VT2) { SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT1, MVT VT2) {
const MVT *VTs = getNodeValueTypes(VT1, VT2); const MVT *VTs = getNodeValueTypes(VT1, VT2);
SDValue Op; SDValue Op;
return getNode(~Opcode, VTs, 2, &Op, 0).Val; return getNode(~Opcode, VTs, 2, &Op, 0).getNode();
} }
SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT1, SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT1,
MVT VT2, SDValue Op1) { MVT VT2, SDValue Op1) {
const MVT *VTs = getNodeValueTypes(VT1, VT2); const MVT *VTs = getNodeValueTypes(VT1, VT2);
return getNode(~Opcode, VTs, 2, &Op1, 1).Val; return getNode(~Opcode, VTs, 2, &Op1, 1).getNode();
} }
SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT1, SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT1,
MVT VT2, SDValue Op1, MVT VT2, SDValue Op1,
SDValue Op2) { SDValue Op2) {
const MVT *VTs = getNodeValueTypes(VT1, VT2); const MVT *VTs = getNodeValueTypes(VT1, VT2);
SDValue Ops[] = { Op1, Op2 }; SDValue Ops[] = { Op1, Op2 };
return getNode(~Opcode, VTs, 2, Ops, 2).Val; return getNode(~Opcode, VTs, 2, Ops, 2).getNode();
} }
SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT1, SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT1,
MVT VT2, SDValue Op1, MVT VT2, SDValue Op1,
SDValue Op2, SDValue Op3) { SDValue Op2, SDValue Op3) {
const MVT *VTs = getNodeValueTypes(VT1, VT2); const MVT *VTs = getNodeValueTypes(VT1, VT2);
SDValue Ops[] = { Op1, Op2, Op3 }; SDValue Ops[] = { Op1, Op2, Op3 };
return getNode(~Opcode, VTs, 2, Ops, 3).Val; return getNode(~Opcode, VTs, 2, Ops, 3).getNode();
} }
SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT1, MVT VT2, SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT1, MVT VT2,
const SDValue *Ops, unsigned NumOps) { const SDValue *Ops, unsigned NumOps) {
const MVT *VTs = getNodeValueTypes(VT1, VT2); const MVT *VTs = getNodeValueTypes(VT1, VT2);
return getNode(~Opcode, VTs, 2, Ops, NumOps).Val; return getNode(~Opcode, VTs, 2, Ops, NumOps).getNode();
} }
SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT1, MVT VT2, MVT VT3, SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT1, MVT VT2, MVT VT3,
SDValue Op1, SDValue Op2) { SDValue Op1, SDValue Op2) {
const MVT *VTs = getNodeValueTypes(VT1, VT2, VT3); const MVT *VTs = getNodeValueTypes(VT1, VT2, VT3);
SDValue Ops[] = { Op1, Op2 }; SDValue Ops[] = { Op1, Op2 };
return getNode(~Opcode, VTs, 3, Ops, 2).Val; return getNode(~Opcode, VTs, 3, Ops, 2).getNode();
} }
SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT1, MVT VT2, MVT VT3, SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT1, MVT VT2, MVT VT3,
SDValue Op1, SDValue Op2, SDValue Op1, SDValue Op2,
SDValue Op3) { SDValue Op3) {
const MVT *VTs = getNodeValueTypes(VT1, VT2, VT3); const MVT *VTs = getNodeValueTypes(VT1, VT2, VT3);
SDValue Ops[] = { Op1, Op2, Op3 }; SDValue Ops[] = { Op1, Op2, Op3 };
return getNode(~Opcode, VTs, 3, Ops, 3).Val; return getNode(~Opcode, VTs, 3, Ops, 3).getNode();
} }
SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT1, MVT VT2, MVT VT3, SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT1, MVT VT2, MVT VT3,
const SDValue *Ops, unsigned NumOps) { const SDValue *Ops, unsigned NumOps) {
const MVT *VTs = getNodeValueTypes(VT1, VT2, VT3); const MVT *VTs = getNodeValueTypes(VT1, VT2, VT3);
return getNode(~Opcode, VTs, 3, Ops, NumOps).Val; return getNode(~Opcode, VTs, 3, Ops, NumOps).getNode();
} }
SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT1, SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT1,
MVT VT2, MVT VT3, MVT VT4, MVT VT2, MVT VT3, MVT VT4,
@ -4208,14 +4208,14 @@ SDNode *SelectionDAG::getTargetNode(unsigned Opcode, MVT VT1,
VTList.push_back(VT3); VTList.push_back(VT3);
VTList.push_back(VT4); VTList.push_back(VT4);
const MVT *VTs = getNodeValueTypes(VTList); const MVT *VTs = getNodeValueTypes(VTList);
return getNode(~Opcode, VTs, 4, Ops, NumOps).Val; return getNode(~Opcode, VTs, 4, Ops, NumOps).getNode();
} }
SDNode *SelectionDAG::getTargetNode(unsigned Opcode, SDNode *SelectionDAG::getTargetNode(unsigned Opcode,
const std::vector<MVT> &ResultTys, const std::vector<MVT> &ResultTys,
const SDValue *Ops, unsigned NumOps) { const SDValue *Ops, unsigned NumOps) {
const MVT *VTs = getNodeValueTypes(ResultTys); const MVT *VTs = getNodeValueTypes(ResultTys);
return getNode(~Opcode, VTs, ResultTys.size(), return getNode(~Opcode, VTs, ResultTys.size(),
Ops, NumOps).Val; Ops, NumOps).getNode();
} }
/// getNodeIfExists - Get the specified node if it's already available, or /// getNodeIfExists - Get the specified node if it's already available, or
@ -4240,10 +4240,10 @@ SDNode *SelectionDAG::getNodeIfExists(unsigned Opcode, SDVTList VTList,
/// ///
void SelectionDAG::ReplaceAllUsesWith(SDValue FromN, SDValue To, void SelectionDAG::ReplaceAllUsesWith(SDValue FromN, SDValue To,
DAGUpdateListener *UpdateListener) { DAGUpdateListener *UpdateListener) {
SDNode *From = FromN.Val; SDNode *From = FromN.getNode();
assert(From->getNumValues() == 1 && FromN.getResNo() == 0 && assert(From->getNumValues() == 1 && FromN.getResNo() == 0 &&
"Cannot replace with this method!"); "Cannot replace with this method!");
assert(From != To.Val && "Cannot replace uses of with self"); assert(From != To.getNode() && "Cannot replace uses of with self");
while (!From->use_empty()) { while (!From->use_empty()) {
SDNode::use_iterator UI = From->use_begin(); SDNode::use_iterator UI = From->use_begin();
@ -4258,7 +4258,7 @@ void SelectionDAG::ReplaceAllUsesWith(SDValue FromN, SDValue To,
From->removeUser(operandNum, U); From->removeUser(operandNum, U);
*I = To; *I = To;
I->setUser(U); I->setUser(U);
To.Val->addUser(operandNum, U); To.getNode()->addUser(operandNum, U);
} }
// Now that we have modified U, add it back to the CSE maps. If it already // Now that we have modified U, add it back to the CSE maps. If it already
@ -4305,7 +4305,7 @@ void SelectionDAG::ReplaceAllUsesWith(SDNode *From, SDNode *To,
I != E; ++I, ++operandNum) I != E; ++I, ++operandNum)
if (I->getVal() == From) { if (I->getVal() == From) {
From->removeUser(operandNum, U); From->removeUser(operandNum, U);
I->getVal() = To; I->getSDValue().setNode(To);
To->addUser(operandNum, U); To->addUser(operandNum, U);
} }
@ -4351,7 +4351,7 @@ void SelectionDAG::ReplaceAllUsesWith(SDNode *From,
From->removeUser(operandNum, U); From->removeUser(operandNum, U);
*I = ToOp; *I = ToOp;
I->setUser(U); I->setUser(U);
ToOp.Val->addUser(operandNum, U); ToOp.getNode()->addUser(operandNum, U);
} }
// Now that we have modified U, add it back to the CSE maps. If it already // Now that we have modified U, add it back to the CSE maps. If it already
@ -4372,7 +4372,7 @@ void SelectionDAG::ReplaceAllUsesWith(SDNode *From,
} }
/// ReplaceAllUsesOfValueWith - Replace any uses of From with To, leaving /// ReplaceAllUsesOfValueWith - Replace any uses of From with To, leaving
/// uses of other values produced by From.Val alone. The Deleted vector is /// uses of other values produced by From.getVal() alone. The Deleted vector is
/// handled the same way as for ReplaceAllUsesWith. /// handled the same way as for ReplaceAllUsesWith.
void SelectionDAG::ReplaceAllUsesOfValueWith(SDValue From, SDValue To, void SelectionDAG::ReplaceAllUsesOfValueWith(SDValue From, SDValue To,
DAGUpdateListener *UpdateListener){ DAGUpdateListener *UpdateListener){
@ -4380,14 +4380,14 @@ void SelectionDAG::ReplaceAllUsesOfValueWith(SDValue From, SDValue To,
if (From == To) return; if (From == To) return;
// Handle the simple, trivial, case efficiently. // Handle the simple, trivial, case efficiently.
if (From.Val->getNumValues() == 1) { if (From.getNode()->getNumValues() == 1) {
ReplaceAllUsesWith(From, To, UpdateListener); ReplaceAllUsesWith(From, To, UpdateListener);
return; return;
} }
// Get all of the users of From.Val. We want these in a nice, // Get all of the users of From.getNode(). We want these in a nice,
// deterministically ordered and uniqued set, so we use a SmallSetVector. // deterministically ordered and uniqued set, so we use a SmallSetVector.
SmallSetVector<SDNode*, 16> Users(From.Val->use_begin(), From.Val->use_end()); SmallSetVector<SDNode*, 16> Users(From.getNode()->use_begin(), From.getNode()->use_end());
while (!Users.empty()) { while (!Users.empty()) {
// We know that this user uses some value of From. If it is the right // We know that this user uses some value of From. If it is the right
@ -4410,10 +4410,10 @@ void SelectionDAG::ReplaceAllUsesOfValueWith(SDValue From, SDValue To,
// Update all operands that match "From" in case there are multiple uses. // Update all operands that match "From" in case there are multiple uses.
for (; Op != E; ++Op) { for (; Op != E; ++Op) {
if (*Op == From) { if (*Op == From) {
From.Val->removeUser(Op-User->op_begin(), User); From.getNode()->removeUser(Op-User->op_begin(), User);
*Op = To; *Op = To;
Op->setUser(User); Op->setUser(User);
To.Val->addUser(Op-User->op_begin(), User); To.getNode()->addUser(Op-User->op_begin(), User);
} }
} }
@ -4437,7 +4437,7 @@ void SelectionDAG::ReplaceAllUsesOfValueWith(SDValue From, SDValue To,
} }
/// ReplaceAllUsesOfValuesWith - Replace any uses of From with To, leaving /// ReplaceAllUsesOfValuesWith - Replace any uses of From with To, leaving
/// uses of other values produced by From.Val alone. The same value may /// uses of other values produced by From.getVal() alone. The same value may
/// appear in both the From and To list. The Deleted vector is /// appear in both the From and To list. The Deleted vector is
/// handled the same way as for ReplaceAllUsesWith. /// handled the same way as for ReplaceAllUsesWith.
void SelectionDAG::ReplaceAllUsesOfValuesWith(const SDValue *From, void SelectionDAG::ReplaceAllUsesOfValuesWith(const SDValue *From,
@ -4450,8 +4450,8 @@ void SelectionDAG::ReplaceAllUsesOfValuesWith(const SDValue *From,
SmallVector<std::pair<SDNode *, unsigned>, 16> Users; SmallVector<std::pair<SDNode *, unsigned>, 16> Users;
for (unsigned i = 0; i != Num; ++i) for (unsigned i = 0; i != Num; ++i)
for (SDNode::use_iterator UI = From[i].Val->use_begin(), for (SDNode::use_iterator UI = From[i].getNode()->use_begin(),
E = From[i].Val->use_end(); UI != E; ++UI) E = From[i].getNode()->use_end(); UI != E; ++UI)
Users.push_back(std::make_pair(*UI, i)); Users.push_back(std::make_pair(*UI, i));
while (!Users.empty()) { while (!Users.empty()) {
@ -4476,10 +4476,10 @@ void SelectionDAG::ReplaceAllUsesOfValuesWith(const SDValue *From,
// Update all operands that match "From" in case there are multiple uses. // Update all operands that match "From" in case there are multiple uses.
for (; Op != E; ++Op) { for (; Op != E; ++Op) {
if (*Op == From[i]) { if (*Op == From[i]) {
From[i].Val->removeUser(Op-User->op_begin(), User); From[i].getNode()->removeUser(Op-User->op_begin(), User);
*Op = To[i]; *Op = To[i];
Op->setUser(User); Op->setUser(User);
To[i].Val->addUser(Op-User->op_begin(), User); To[i].getNode()->addUser(Op-User->op_begin(), User);
} }
} }
@ -4617,7 +4617,7 @@ MachineMemOperand MemSDNode::getMemOperand() const {
// Check if the memory reference references a frame index // Check if the memory reference references a frame index
const FrameIndexSDNode *FI = const FrameIndexSDNode *FI =
dyn_cast<const FrameIndexSDNode>(getBasePtr().Val); dyn_cast<const FrameIndexSDNode>(getBasePtr().getNode());
if (!getSrcValue() && FI) if (!getSrcValue() && FI)
return MachineMemOperand(PseudoSourceValue::getFixedStack(FI->getIndex()), return MachineMemOperand(PseudoSourceValue::getFixedStack(FI->getIndex()),
Flags, 0, Size, getAlignment()); Flags, 0, Size, getAlignment());
@ -4746,7 +4746,7 @@ static void findPredecessor(SDNode *N, const SDNode *P, bool &found,
return; return;
for (unsigned i = 0, e = N->getNumOperands(); !found && i != e; ++i) { for (unsigned i = 0, e = N->getNumOperands(); !found && i != e; ++i) {
SDNode *Op = N->getOperand(i).Val; SDNode *Op = N->getOperand(i).getNode();
if (Op == P) { if (Op == P) {
found = true; found = true;
return; return;
@ -5115,13 +5115,13 @@ void SDNode::print(raw_ostream &OS, const SelectionDAG *G) const {
OS << " "; OS << " ";
for (unsigned i = 0, e = getNumOperands(); i != e; ++i) { for (unsigned i = 0, e = getNumOperands(); i != e; ++i) {
if (i) OS << ", "; if (i) OS << ", ";
OS << (void*)getOperand(i).Val; OS << (void*)getOperand(i).getNode();
if (unsigned RN = getOperand(i).getResNo()) if (unsigned RN = getOperand(i).getResNo())
OS << ":" << RN; OS << ":" << RN;
} }
if (!isTargetOpcode() && getOpcode() == ISD::VECTOR_SHUFFLE) { if (!isTargetOpcode() && getOpcode() == ISD::VECTOR_SHUFFLE) {
SDNode *Mask = getOperand(2).Val; SDNode *Mask = getOperand(2).getNode();
OS << "<"; OS << "<";
for (unsigned i = 0, e = Mask->getNumOperands(); i != e; ++i) { for (unsigned i = 0, e = Mask->getNumOperands(); i != e; ++i) {
if (i) OS << ","; if (i) OS << ",";
@ -5262,11 +5262,11 @@ void SDNode::print(raw_ostream &OS, const SelectionDAG *G) const {
static void DumpNodes(const SDNode *N, unsigned indent, const SelectionDAG *G) { static void DumpNodes(const SDNode *N, unsigned indent, const SelectionDAG *G) {
for (unsigned i = 0, e = N->getNumOperands(); i != e; ++i) for (unsigned i = 0, e = N->getNumOperands(); i != e; ++i)
if (N->getOperand(i).Val->hasOneUse()) if (N->getOperand(i).getNode()->hasOneUse())
DumpNodes(N->getOperand(i).Val, indent+2, G); DumpNodes(N->getOperand(i).getNode(), indent+2, G);
else else
cerr << "\n" << std::string(indent+2, ' ') cerr << "\n" << std::string(indent+2, ' ')
<< (void*)N->getOperand(i).Val << ": <multiple use>"; << (void*)N->getOperand(i).getNode() << ": <multiple use>";
cerr << "\n" << std::string(indent, ' '); cerr << "\n" << std::string(indent, ' ');
@ -5279,11 +5279,11 @@ void SelectionDAG::dump() const {
for (allnodes_const_iterator I = allnodes_begin(), E = allnodes_end(); for (allnodes_const_iterator I = allnodes_begin(), E = allnodes_end();
I != E; ++I) { I != E; ++I) {
const SDNode *N = I; const SDNode *N = I;
if (!N->hasOneUse() && N != getRoot().Val) if (!N->hasOneUse() && N != getRoot().getNode())
DumpNodes(N, 2, this); DumpNodes(N, 2, this);
} }
if (getRoot().Val) DumpNodes(getRoot().Val, 2, this); if (getRoot().getNode()) DumpNodes(getRoot().getNode(), 2, this);
cerr << "\n\n"; cerr << "\n\n";
} }

60
lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
View File

@ -784,8 +784,8 @@ public:
if (Root.getOpcode() != ISD::EntryToken) { if (Root.getOpcode() != ISD::EntryToken) {
unsigned i = 0, e = PendingExports.size(); unsigned i = 0, e = PendingExports.size();
for (; i != e; ++i) { for (; i != e; ++i) {
assert(PendingExports[i].Val->getNumOperands() > 1); assert(PendingExports[i].getNode()->getNumOperands() > 1);
if (PendingExports[i].Val->getOperand(0) == Root) if (PendingExports[i].getNode()->getOperand(0) == Root)
break; // Don't add the root if we already indirectly depend on it. break; // Don't add the root if we already indirectly depend on it.
} }
@ -824,7 +824,7 @@ public:
void setValue(const Value *V, SDValue NewN) { void setValue(const Value *V, SDValue NewN) {
SDValue &N = NodeMap[V]; SDValue &N = NodeMap[V];
assert(N.Val == 0 && "Already set a value for this node!"); assert(N.getNode() == 0 && "Already set a value for this node!");
N = NewN; N = NewN;
} }
@ -1286,7 +1286,7 @@ static void getCopyToParts(SelectionDAG &DAG,
SDValue SelectionDAGLowering::getValue(const Value *V) { SDValue SelectionDAGLowering::getValue(const Value *V) {
SDValue &N = NodeMap[V]; SDValue &N = NodeMap[V];
if (N.Val) return N; if (N.getNode()) return N;
if (Constant *C = const_cast<Constant*>(dyn_cast<Constant>(V))) { if (Constant *C = const_cast<Constant*>(dyn_cast<Constant>(V))) {
MVT VT = TLI.getValueType(V->getType(), true); MVT VT = TLI.getValueType(V->getType(), true);
@ -1310,7 +1310,7 @@ SDValue SelectionDAGLowering::getValue(const Value *V) {
if (ConstantExpr *CE = dyn_cast<ConstantExpr>(C)) { if (ConstantExpr *CE = dyn_cast<ConstantExpr>(C)) {
visit(CE->getOpcode(), *CE); visit(CE->getOpcode(), *CE);
SDValue N1 = NodeMap[V]; SDValue N1 = NodeMap[V];
assert(N1.Val && "visit didn't populate the ValueMap!"); assert(N1.getNode() && "visit didn't populate the ValueMap!");
return N1; return N1;
} }
@ -1318,7 +1318,7 @@ SDValue SelectionDAGLowering::getValue(const Value *V) {
SmallVector<SDValue, 4> Constants; SmallVector<SDValue, 4> Constants;
for (User::const_op_iterator OI = C->op_begin(), OE = C->op_end(); for (User::const_op_iterator OI = C->op_begin(), OE = C->op_end();
OI != OE; ++OI) { OI != OE; ++OI) {
SDNode *Val = getValue(*OI).Val; SDNode *Val = getValue(*OI).getNode();
for (unsigned i = 0, e = Val->getNumValues(); i != e; ++i) for (unsigned i = 0, e = Val->getNumValues(); i != e; ++i)
Constants.push_back(SDValue(Val, i)); Constants.push_back(SDValue(Val, i));
} }
@ -1428,7 +1428,7 @@ void SelectionDAGLowering::visitRet(ReturnInst &I) {
else if (F->paramHasAttr(0, ParamAttr::ZExt)) else if (F->paramHasAttr(0, ParamAttr::ZExt))
ExtendKind = ISD::ZERO_EXTEND; ExtendKind = ISD::ZERO_EXTEND;
getCopyToParts(DAG, SDValue(RetOp.Val, RetOp.getResNo() + j), getCopyToParts(DAG, SDValue(RetOp.getNode(), RetOp.getResNo() + j),
&Parts[0], NumParts, PartVT, ExtendKind); &Parts[0], NumParts, PartVT, ExtendKind);
for (unsigned i = 0; i < NumParts; ++i) { for (unsigned i = 0; i < NumParts; ++i) {
@ -2855,15 +2855,15 @@ void SelectionDAGLowering::visitInsertValue(InsertValueInst &I) {
// Copy the beginning value(s) from the original aggregate. // Copy the beginning value(s) from the original aggregate.
for (; i != LinearIndex; ++i) for (; i != LinearIndex; ++i)
Values[i] = IntoUndef ? DAG.getNode(ISD::UNDEF, AggValueVTs[i]) : Values[i] = IntoUndef ? DAG.getNode(ISD::UNDEF, AggValueVTs[i]) :
SDValue(Agg.Val, Agg.getResNo() + i); SDValue(Agg.getNode(), Agg.getResNo() + i);
// Copy values from the inserted value(s). // Copy values from the inserted value(s).
for (; i != LinearIndex + NumValValues; ++i) for (; i != LinearIndex + NumValValues; ++i)
Values[i] = FromUndef ? DAG.getNode(ISD::UNDEF, AggValueVTs[i]) : Values[i] = FromUndef ? DAG.getNode(ISD::UNDEF, AggValueVTs[i]) :
SDValue(Val.Val, Val.getResNo() + i - LinearIndex); SDValue(Val.getNode(), Val.getResNo() + i - LinearIndex);
// Copy remaining value(s) from the original aggregate. // Copy remaining value(s) from the original aggregate.
for (; i != NumAggValues; ++i) for (; i != NumAggValues; ++i)
Values[i] = IntoUndef ? DAG.getNode(ISD::UNDEF, AggValueVTs[i]) : Values[i] = IntoUndef ? DAG.getNode(ISD::UNDEF, AggValueVTs[i]) :
SDValue(Agg.Val, Agg.getResNo() + i); SDValue(Agg.getNode(), Agg.getResNo() + i);
setValue(&I, DAG.getMergeValues(DAG.getVTList(&AggValueVTs[0], NumAggValues), setValue(&I, DAG.getMergeValues(DAG.getVTList(&AggValueVTs[0], NumAggValues),
&Values[0], NumAggValues)); &Values[0], NumAggValues));
@ -2888,8 +2888,8 @@ void SelectionDAGLowering::visitExtractValue(ExtractValueInst &I) {
// Copy out the selected value(s). // Copy out the selected value(s).
for (unsigned i = LinearIndex; i != LinearIndex + NumValValues; ++i) for (unsigned i = LinearIndex; i != LinearIndex + NumValValues; ++i)
Values[i - LinearIndex] = Values[i - LinearIndex] =
OutOfUndef ? DAG.getNode(ISD::UNDEF, Agg.Val->getValueType(Agg.getResNo() + i)) : OutOfUndef ? DAG.getNode(ISD::UNDEF, Agg.getNode()->getValueType(Agg.getResNo() + i)) :
SDValue(Agg.Val, Agg.getResNo() + i); SDValue(Agg.getNode(), Agg.getResNo() + i);
setValue(&I, DAG.getMergeValues(DAG.getVTList(&ValValueVTs[0], NumValValues), setValue(&I, DAG.getMergeValues(DAG.getVTList(&ValValueVTs[0], NumValValues),
&Values[0], NumValValues)); &Values[0], NumValValues));
@ -3084,7 +3084,7 @@ void SelectionDAGLowering::visitStore(StoreInst &I) {
bool isVolatile = I.isVolatile(); bool isVolatile = I.isVolatile();
unsigned Alignment = I.getAlignment(); unsigned Alignment = I.getAlignment();
for (unsigned i = 0; i != NumValues; ++i) for (unsigned i = 0; i != NumValues; ++i)
Chains[i] = DAG.getStore(Root, SDValue(Src.Val, Src.getResNo() + i), Chains[i] = DAG.getStore(Root, SDValue(Src.getNode(), Src.getResNo() + i),
DAG.getNode(ISD::ADD, PtrVT, Ptr, DAG.getNode(ISD::ADD, PtrVT, Ptr,
DAG.getConstant(Offsets[i], PtrVT)), DAG.getConstant(Offsets[i], PtrVT)),
PtrV, Offsets[i], PtrV, Offsets[i],
@ -3154,7 +3154,7 @@ void SelectionDAGLowering::visitTargetIntrinsic(CallInst &I,
&Ops[0], Ops.size()); &Ops[0], Ops.size());
if (HasChain) { if (HasChain) {
SDValue Chain = Result.getValue(Result.Val->getNumValues()-1); SDValue Chain = Result.getValue(Result.getNode()->getNumValues()-1);
if (OnlyLoad) if (OnlyLoad)
PendingLoads.push_back(Chain); PendingLoads.push_back(Chain);
else else
@ -3621,7 +3621,7 @@ SelectionDAGLowering::visitIntrinsicCall(CallInst &I, unsigned Intrinsic) {
Value *Alloca = I.getOperand(1); Value *Alloca = I.getOperand(1);
Constant *TypeMap = cast<Constant>(I.getOperand(2)); Constant *TypeMap = cast<Constant>(I.getOperand(2));
FrameIndexSDNode *FI = cast<FrameIndexSDNode>(getValue(Alloca).Val); FrameIndexSDNode *FI = cast<FrameIndexSDNode>(getValue(Alloca).getNode());
GFI->addStackRoot(FI->getIndex(), TypeMap); GFI->addStackRoot(FI->getIndex(), TypeMap);
} }
return 0; return 0;
@ -4751,7 +4751,7 @@ void SelectionDAGLowering::visitInlineAsm(CallSite CS) {
// Finish up input operands. // Finish up input operands.
AsmNodeOperands[0] = Chain; AsmNodeOperands[0] = Chain;
if (Flag.Val) AsmNodeOperands.push_back(Flag); if (Flag.getNode()) AsmNodeOperands.push_back(Flag);
Chain = DAG.getNode(ISD::INLINEASM, Chain = DAG.getNode(ISD::INLINEASM,
DAG.getNodeValueTypes(MVT::Other, MVT::Flag), 2, DAG.getNodeValueTypes(MVT::Other, MVT::Flag), 2,
@ -4770,7 +4770,7 @@ void SelectionDAGLowering::visitInlineAsm(CallSite CS) {
// bit_convert. // bit_convert.
if (const StructType *ResSTy = dyn_cast<StructType>(CS.getType())) { if (const StructType *ResSTy = dyn_cast<StructType>(CS.getType())) {
for (unsigned i = 0, e = ResSTy->getNumElements(); i != e; ++i) { for (unsigned i = 0, e = ResSTy->getNumElements(); i != e; ++i) {
if (Val.Val->getValueType(i).isVector()) if (Val.getNode()->getValueType(i).isVector())
Val = DAG.getNode(ISD::BIT_CONVERT, Val = DAG.getNode(ISD::BIT_CONVERT,
TLI.getValueType(ResSTy->getElementType(i)), Val); TLI.getValueType(ResSTy->getElementType(i)), Val);
} }
@ -4963,7 +4963,7 @@ void TargetLowering::LowerArguments(Function &F, SelectionDAG &DAG,
// Create the node. // Create the node.
SDNode *Result = DAG.getNode(ISD::FORMAL_ARGUMENTS, SDNode *Result = DAG.getNode(ISD::FORMAL_ARGUMENTS,
DAG.getVTList(&RetVals[0], RetVals.size()), DAG.getVTList(&RetVals[0], RetVals.size()),
&Ops[0], Ops.size()).Val; &Ops[0], Ops.size()).getNode();
// Prelower FORMAL_ARGUMENTS. This isn't required for functionality, but // Prelower FORMAL_ARGUMENTS. This isn't required for functionality, but
// allows exposing the loads that may be part of the argument access to the // allows exposing the loads that may be part of the argument access to the
@ -4972,18 +4972,18 @@ void TargetLowering::LowerArguments(Function &F, SelectionDAG &DAG,
// The number of results should match up, except that the lowered one may have // The number of results should match up, except that the lowered one may have
// an extra flag result. // an extra flag result.
assert((Result->getNumValues() == TmpRes.Val->getNumValues() || assert((Result->getNumValues() == TmpRes.getNode()->getNumValues() ||
(Result->getNumValues()+1 == TmpRes.Val->getNumValues() && (Result->getNumValues()+1 == TmpRes.getNode()->getNumValues() &&
TmpRes.getValue(Result->getNumValues()).getValueType() == MVT::Flag)) TmpRes.getValue(Result->getNumValues()).getValueType() == MVT::Flag))
&& "Lowering produced unexpected number of results!"); && "Lowering produced unexpected number of results!");
// The FORMAL_ARGUMENTS node itself is likely no longer needed. // The FORMAL_ARGUMENTS node itself is likely no longer needed.
if (Result != TmpRes.Val && Result->use_empty()) { if (Result != TmpRes.getNode() && Result->use_empty()) {
HandleSDNode Dummy(DAG.getRoot()); HandleSDNode Dummy(DAG.getRoot());
DAG.RemoveDeadNode(Result); DAG.RemoveDeadNode(Result);
} }
Result = TmpRes.Val; Result = TmpRes.getNode();
unsigned NumArgRegs = Result->getNumValues() - 1; unsigned NumArgRegs = Result->getNumValues() - 1;
DAG.setRoot(SDValue(Result, NumArgRegs)); DAG.setRoot(SDValue(Result, NumArgRegs));
@ -5044,7 +5044,7 @@ TargetLowering::LowerCallTo(SDValue Chain, const Type *RetTy,
Value != NumValues; ++Value) { Value != NumValues; ++Value) {
MVT VT = ValueVTs[Value]; MVT VT = ValueVTs[Value];
const Type *ArgTy = VT.getTypeForMVT(); const Type *ArgTy = VT.getTypeForMVT();
SDValue Op = SDValue(Args[i].Node.Val, Args[i].Node.getResNo() + Value); SDValue Op = SDValue(Args[i].Node.getNode(), Args[i].Node.getResNo() + Value);
ISD::ArgFlagsTy Flags; ISD::ArgFlagsTy Flags;
unsigned OriginalAlignment = unsigned OriginalAlignment =
getTargetData()->getABITypeAlignment(ArgTy); getTargetData()->getABITypeAlignment(ArgTy);
@ -5333,7 +5333,7 @@ static void CheckDAGForTailCallsAndFixThem(SelectionDAG &DAG,
// Find RET node. // Find RET node.
if (Terminator.getOpcode() == ISD::RET) { if (Terminator.getOpcode() == ISD::RET) {
Ret = Terminator.Val; Ret = Terminator.getNode();
} }
// Fix tail call attribute of CALL nodes. // Fix tail call attribute of CALL nodes.
@ -5355,8 +5355,8 @@ static void CheckDAGForTailCallsAndFixThem(SelectionDAG &DAG,
// Not eligible. Mark CALL node as non tail call. // Not eligible. Mark CALL node as non tail call.
SmallVector<SDValue, 32> Ops; SmallVector<SDValue, 32> Ops;
unsigned idx=0; unsigned idx=0;
for(SDNode::op_iterator I =OpCall.Val->op_begin(), for(SDNode::op_iterator I =OpCall.getNode()->op_begin(),
E = OpCall.Val->op_end(); I != E; I++, idx++) { E = OpCall.getNode()->op_end(); I != E; I++, idx++) {
if (idx!=3) if (idx!=3)
Ops.push_back(*I); Ops.push_back(*I);
else else
@ -5369,8 +5369,8 @@ static void CheckDAGForTailCallsAndFixThem(SelectionDAG &DAG,
SmallVector<SDValue, 32> Ops; SmallVector<SDValue, 32> Ops;
SDValue Chain = OpCall.getOperand(0), InFlag; SDValue Chain = OpCall.getOperand(0), InFlag;
unsigned idx=0; unsigned idx=0;
for(SDNode::op_iterator I = OpCall.Val->op_begin(), for(SDNode::op_iterator I = OpCall.getNode()->op_begin(),
E = OpCall.Val->op_end(); I != E; I++, idx++) { E = OpCall.getNode()->op_end(); I != E; I++, idx++) {
SDValue Arg = *I; SDValue Arg = *I;
if (idx > 4 && (idx % 2)) { if (idx > 4 && (idx % 2)) {
bool isByVal = cast<ARG_FLAGSSDNode>(OpCall.getOperand(idx+1))-> bool isByVal = cast<ARG_FLAGSSDNode>(OpCall.getOperand(idx+1))->
@ -5557,7 +5557,7 @@ void SelectionDAGISel::ComputeLiveOutVRegInfo() {
SmallPtrSet<SDNode*, 128> VisitedNodes; SmallPtrSet<SDNode*, 128> VisitedNodes;
SmallVector<SDNode*, 128> Worklist; SmallVector<SDNode*, 128> Worklist;
Worklist.push_back(CurDAG->getRoot().Val); Worklist.push_back(CurDAG->getRoot().getNode());
APInt Mask; APInt Mask;
APInt KnownZero; APInt KnownZero;
@ -5574,7 +5574,7 @@ void SelectionDAGISel::ComputeLiveOutVRegInfo() {
// Otherwise, add all chain operands to the worklist. // Otherwise, add all chain operands to the worklist.
for (unsigned i = 0, e = N->getNumOperands(); i != e; ++i) for (unsigned i = 0, e = N->getNumOperands(); i != e; ++i)
if (N->getOperand(i).getValueType() == MVT::Other) if (N->getOperand(i).getValueType() == MVT::Other)
Worklist.push_back(N->getOperand(i).Val); Worklist.push_back(N->getOperand(i).getNode());
// If this is a CopyToReg with a vreg dest, process it. // If this is a CopyToReg with a vreg dest, process it.
if (N->getOpcode() != ISD::CopyToReg) if (N->getOpcode() != ISD::CopyToReg)

6
lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp
View File

@ -109,8 +109,8 @@ namespace llvm {
static void addCustomGraphFeatures(SelectionDAG *G, static void addCustomGraphFeatures(SelectionDAG *G,
GraphWriter<SelectionDAG*> &GW) { GraphWriter<SelectionDAG*> &GW) {
GW.emitSimpleNode(0, "plaintext=circle", "GraphRoot"); GW.emitSimpleNode(0, "plaintext=circle", "GraphRoot");
if (G->getRoot().Val) if (G->getRoot().getNode())
GW.emitEdge(0, -1, G->getRoot().Val, G->getRoot().getResNo(), GW.emitEdge(0, -1, G->getRoot().getNode(), G->getRoot().getResNo(),
"color=blue,style=dashed"); "color=blue,style=dashed");
} }
}; };
@ -356,7 +356,7 @@ namespace llvm {
static void addCustomGraphFeatures(ScheduleDAG *G, static void addCustomGraphFeatures(ScheduleDAG *G,
GraphWriter<ScheduleDAG*> &GW) { GraphWriter<ScheduleDAG*> &GW) {
GW.emitSimpleNode(0, "plaintext=circle", "GraphRoot"); GW.emitSimpleNode(0, "plaintext=circle", "GraphRoot");
const SDNode *N = G->DAG.getRoot().Val; const SDNode *N = G->DAG.getRoot().getNode();
if (N && N->getNodeId() != -1) if (N && N->getNodeId() != -1)
GW.emitEdge(0, -1, &G->SUnits[N->getNodeId()], -1, GW.emitEdge(0, -1, &G->SUnits[N->getNodeId()], -1,
"color=blue,style=dashed"); "color=blue,style=dashed");

72
lib/CodeGen/SelectionDAG/TargetLowering.cpp
View File

@ -674,7 +674,7 @@ bool TargetLowering::SimplifyDemandedBits(SDValue Op,
KnownZero = KnownOne = APInt(BitWidth, 0); KnownZero = KnownOne = APInt(BitWidth, 0);
// Other users may use these bits. // Other users may use these bits.
if (!Op.Val->hasOneUse()) { if (!Op.getNode()->hasOneUse()) {
if (Depth != 0) { if (Depth != 0) {
// If not at the root, Just compute the KnownZero/KnownOne bits to // If not at the root, Just compute the KnownZero/KnownOne bits to
// simplify things downstream. // simplify things downstream.
@ -1131,7 +1131,7 @@ bool TargetLowering::SimplifyDemandedBits(SDValue Op,
// If the input is only used by this truncate, see if we can shrink it based // If the input is only used by this truncate, see if we can shrink it based
// on the known demanded bits. // on the known demanded bits.
if (Op.getOperand(0).Val->hasOneUse()) { if (Op.getOperand(0).getNode()->hasOneUse()) {
SDValue In = Op.getOperand(0); SDValue In = Op.getOperand(0);
unsigned InBitWidth = In.getValueSizeInBits(); unsigned InBitWidth = In.getValueSizeInBits();
switch (In.getOpcode()) { switch (In.getOpcode()) {
@ -1259,9 +1259,9 @@ TargetLowering::SimplifySetCC(MVT VT, SDValue N0, SDValue N1,
case ISD::SETTRUE2: return DAG.getConstant(1, VT); case ISD::SETTRUE2: return DAG.getConstant(1, VT);
} }
if (ConstantSDNode *N1C = dyn_cast<ConstantSDNode>(N1.Val)) { if (ConstantSDNode *N1C = dyn_cast<ConstantSDNode>(N1.getNode())) {
const APInt &C1 = N1C->getAPIntValue(); const APInt &C1 = N1C->getAPIntValue();
if (isa<ConstantSDNode>(N0.Val)) { if (isa<ConstantSDNode>(N0.getNode())) {
return DAG.FoldSetCC(VT, N0, N1, Cond); return DAG.FoldSetCC(VT, N0, N1, Cond);
} else { } else {
// If the LHS is '(srl (ctlz x), 5)', the RHS is 0/1, and this is an // If the LHS is '(srl (ctlz x), 5)', the RHS is 0/1, and this is an
@ -1356,7 +1356,7 @@ TargetLowering::SimplifySetCC(MVT VT, SDValue N0, SDValue N1,
DAG.getConstant(Imm, Op0Ty)); DAG.getConstant(Imm, Op0Ty));
} }
if (!DCI.isCalledByLegalizer()) if (!DCI.isCalledByLegalizer())
DCI.AddToWorklist(ZextOp.Val); DCI.AddToWorklist(ZextOp.getNode());
// Otherwise, make this a use of a zext. // Otherwise, make this a use of a zext.
return DAG.getSetCC(VT, ZextOp, return DAG.getSetCC(VT, ZextOp,
DAG.getConstant(C1 & APInt::getLowBitsSet( DAG.getConstant(C1 & APInt::getLowBitsSet(
@ -1493,16 +1493,16 @@ TargetLowering::SimplifySetCC(MVT VT, SDValue N0, SDValue N1,
} }
} }
} }
} else if (isa<ConstantSDNode>(N0.Val)) { } else if (isa<ConstantSDNode>(N0.getNode())) {
// Ensure that the constant occurs on the RHS. // Ensure that the constant occurs on the RHS.
return DAG.getSetCC(VT, N1, N0, ISD::getSetCCSwappedOperands(Cond)); return DAG.getSetCC(VT, N1, N0, ISD::getSetCCSwappedOperands(Cond));
} }
if (isa<ConstantFPSDNode>(N0.Val)) { if (isa<ConstantFPSDNode>(N0.getNode())) {
// Constant fold or commute setcc. // Constant fold or commute setcc.
SDValue O = DAG.FoldSetCC(VT, N0, N1, Cond); SDValue O = DAG.FoldSetCC(VT, N0, N1, Cond);
if (O.Val) return O; if (O.getNode()) return O;
} else if (ConstantFPSDNode *CFP = dyn_cast<ConstantFPSDNode>(N1.Val)) { } else if (ConstantFPSDNode *CFP = dyn_cast<ConstantFPSDNode>(N1.getNode())) {
// If the RHS of an FP comparison is a constant, simplify it away in // If the RHS of an FP comparison is a constant, simplify it away in
// some cases. // some cases.
if (CFP->getValueAPF().isNaN()) { if (CFP->getValueAPF().isNaN()) {
@ -1564,7 +1564,7 @@ TargetLowering::SimplifySetCC(MVT VT, SDValue N0, SDValue N1,
if (ConstantSDNode *RHSC = dyn_cast<ConstantSDNode>(N1)) { if (ConstantSDNode *RHSC = dyn_cast<ConstantSDNode>(N1)) {
if (ConstantSDNode *LHSR = dyn_cast<ConstantSDNode>(N0.getOperand(1))) { if (ConstantSDNode *LHSR = dyn_cast<ConstantSDNode>(N0.getOperand(1))) {
// Turn (X+C1) == C2 --> X == C2-C1 // Turn (X+C1) == C2 --> X == C2-C1
if (N0.getOpcode() == ISD::ADD && N0.Val->hasOneUse()) { if (N0.getOpcode() == ISD::ADD && N0.getNode()->hasOneUse()) {
return DAG.getSetCC(VT, N0.getOperand(0), return DAG.getSetCC(VT, N0.getOperand(0),
DAG.getConstant(RHSC->getValue()-LHSR->getValue(), DAG.getConstant(RHSC->getValue()-LHSR->getValue(),
N0.getValueType()), Cond); N0.getValueType()), Cond);
@ -1585,7 +1585,7 @@ TargetLowering::SimplifySetCC(MVT VT, SDValue N0, SDValue N1,
// Turn (C1-X) == C2 --> X == C1-C2 // Turn (C1-X) == C2 --> X == C1-C2
if (ConstantSDNode *SUBC = dyn_cast<ConstantSDNode>(N0.getOperand(0))) { if (ConstantSDNode *SUBC = dyn_cast<ConstantSDNode>(N0.getOperand(0))) {
if (N0.getOpcode() == ISD::SUB && N0.Val->hasOneUse()) { if (N0.getOpcode() == ISD::SUB && N0.getNode()->hasOneUse()) {
return return
DAG.getSetCC(VT, N0.getOperand(1), DAG.getSetCC(VT, N0.getOperand(1),
DAG.getConstant(SUBC->getAPIntValue() - DAG.getConstant(SUBC->getAPIntValue() -
@ -1604,14 +1604,14 @@ TargetLowering::SimplifySetCC(MVT VT, SDValue N0, SDValue N1,
if (DAG.isCommutativeBinOp(N0.getOpcode())) if (DAG.isCommutativeBinOp(N0.getOpcode()))
return DAG.getSetCC(VT, N0.getOperand(0), return DAG.getSetCC(VT, N0.getOperand(0),
DAG.getConstant(0, N0.getValueType()), Cond); DAG.getConstant(0, N0.getValueType()), Cond);
else if (N0.Val->hasOneUse()) { else if (N0.getNode()->hasOneUse()) {
assert(N0.getOpcode() == ISD::SUB && "Unexpected operation!"); assert(N0.getOpcode() == ISD::SUB && "Unexpected operation!");
// (Z-X) == X --> Z == X<<1 // (Z-X) == X --> Z == X<<1
SDValue SH = DAG.getNode(ISD::SHL, N1.getValueType(), SDValue SH = DAG.getNode(ISD::SHL, N1.getValueType(),
N1, N1,
DAG.getConstant(1, getShiftAmountTy())); DAG.getConstant(1, getShiftAmountTy()));
if (!DCI.isCalledByLegalizer()) if (!DCI.isCalledByLegalizer())
DCI.AddToWorklist(SH.Val); DCI.AddToWorklist(SH.getNode());
return DAG.getSetCC(VT, N0.getOperand(0), SH, Cond); return DAG.getSetCC(VT, N0.getOperand(0), SH, Cond);
} }
} }
@ -1627,13 +1627,13 @@ TargetLowering::SimplifySetCC(MVT VT, SDValue N0, SDValue N1,
if (DAG.isCommutativeBinOp(N1.getOpcode())) { if (DAG.isCommutativeBinOp(N1.getOpcode())) {
return DAG.getSetCC(VT, N1.getOperand(0), return DAG.getSetCC(VT, N1.getOperand(0),
DAG.getConstant(0, N1.getValueType()), Cond); DAG.getConstant(0, N1.getValueType()), Cond);
} else if (N1.Val->hasOneUse()) { } else if (N1.getNode()->hasOneUse()) {
assert(N1.getOpcode() == ISD::SUB && "Unexpected operation!"); assert(N1.getOpcode() == ISD::SUB && "Unexpected operation!");
// X == (Z-X) --> X<<1 == Z // X == (Z-X) --> X<<1 == Z
SDValue SH = DAG.getNode(ISD::SHL, N1.getValueType(), N0, SDValue SH = DAG.getNode(ISD::SHL, N1.getValueType(), N0,
DAG.getConstant(1, getShiftAmountTy())); DAG.getConstant(1, getShiftAmountTy()));
if (!DCI.isCalledByLegalizer()) if (!DCI.isCalledByLegalizer())
DCI.AddToWorklist(SH.Val); DCI.AddToWorklist(SH.getNode());
return DAG.getSetCC(VT, SH, N1.getOperand(0), Cond); return DAG.getSetCC(VT, SH, N1.getOperand(0), Cond);
} }
} }
@ -1649,7 +1649,7 @@ TargetLowering::SimplifySetCC(MVT VT, SDValue N0, SDValue N1,
Temp = DAG.getNode(ISD::XOR, MVT::i1, N0, N1); Temp = DAG.getNode(ISD::XOR, MVT::i1, N0, N1);
N0 = DAG.getNode(ISD::XOR, MVT::i1, Temp, DAG.getConstant(1, MVT::i1)); N0 = DAG.getNode(ISD::XOR, MVT::i1, Temp, DAG.getConstant(1, MVT::i1));
if (!DCI.isCalledByLegalizer()) if (!DCI.isCalledByLegalizer())
DCI.AddToWorklist(Temp.Val); DCI.AddToWorklist(Temp.getNode());
break; break;
case ISD::SETNE: // X != Y --> (X^Y) case ISD::SETNE: // X != Y --> (X^Y)
N0 = DAG.getNode(ISD::XOR, MVT::i1, N0, N1); N0 = DAG.getNode(ISD::XOR, MVT::i1, N0, N1);
@ -1659,21 +1659,21 @@ TargetLowering::SimplifySetCC(MVT VT, SDValue N0, SDValue N1,
Temp = DAG.getNode(ISD::XOR, MVT::i1, N0, DAG.getConstant(1, MVT::i1)); Temp = DAG.getNode(ISD::XOR, MVT::i1, N0, DAG.getConstant(1, MVT::i1));
N0 = DAG.getNode(ISD::AND, MVT::i1, N1, Temp); N0 = DAG.getNode(ISD::AND, MVT::i1, N1, Temp);
if (!DCI.isCalledByLegalizer()) if (!DCI.isCalledByLegalizer())
DCI.AddToWorklist(Temp.Val); DCI.AddToWorklist(Temp.getNode());
break; break;
case ISD::SETLT: // X <s Y --> X == 1 & Y == 0 --> Y^1 & X case ISD::SETLT: // X <s Y --> X == 1 & Y == 0 --> Y^1 & X
case ISD::SETUGT: // X >u Y --> X == 1 & Y == 0 --> Y^1 & X case ISD::SETUGT: // X >u Y --> X == 1 & Y == 0 --> Y^1 & X
Temp = DAG.getNode(ISD::XOR, MVT::i1, N1, DAG.getConstant(1, MVT::i1)); Temp = DAG.getNode(ISD::XOR, MVT::i1, N1, DAG.getConstant(1, MVT::i1));
N0 = DAG.getNode(ISD::AND, MVT::i1, N0, Temp); N0 = DAG.getNode(ISD::AND, MVT::i1, N0, Temp);
if (!DCI.isCalledByLegalizer()) if (!DCI.isCalledByLegalizer())
DCI.AddToWorklist(Temp.Val); DCI.AddToWorklist(Temp.getNode());
break; break;
case ISD::SETULE: // X <=u Y --> X == 0 | Y == 1 --> X^1 | Y case ISD::SETULE: // X <=u Y --> X == 0 | Y == 1 --> X^1 | Y
case ISD::SETGE: // X >=s Y --> X == 0 | Y == 1 --> X^1 | Y case ISD::SETGE: // X >=s Y --> X == 0 | Y == 1 --> X^1 | Y
Temp = DAG.getNode(ISD::XOR, MVT::i1, N0, DAG.getConstant(1, MVT::i1)); Temp = DAG.getNode(ISD::XOR, MVT::i1, N0, DAG.getConstant(1, MVT::i1));
N0 = DAG.getNode(ISD::OR, MVT::i1, N1, Temp); N0 = DAG.getNode(ISD::OR, MVT::i1, N1, Temp);
if (!DCI.isCalledByLegalizer()) if (!DCI.isCalledByLegalizer())
DCI.AddToWorklist(Temp.Val); DCI.AddToWorklist(Temp.getNode());
break; break;
case ISD::SETUGE: // X >=u Y --> X == 1 | Y == 0 --> Y^1 | X case ISD::SETUGE: // X >=u Y --> X == 1 | Y == 0 --> Y^1 | X
case ISD::SETLE: // X <=s Y --> X == 1 | Y == 0 --> Y^1 | X case ISD::SETLE: // X <=s Y --> X == 1 | Y == 0 --> Y^1 | X
@ -1683,7 +1683,7 @@ TargetLowering::SimplifySetCC(MVT VT, SDValue N0, SDValue N1,
} }
if (VT != MVT::i1) { if (VT != MVT::i1) {
if (!DCI.isCalledByLegalizer()) if (!DCI.isCalledByLegalizer())
DCI.AddToWorklist(N0.Val); DCI.AddToWorklist(N0.getNode());
// FIXME: If running after legalize, we probably can't do this. // FIXME: If running after legalize, we probably can't do this.
N0 = DAG.getNode(ISD::ZERO_EXTEND, VT, N0); N0 = DAG.getNode(ISD::ZERO_EXTEND, VT, N0);
} }
@ -1708,13 +1708,13 @@ bool TargetLowering::isGAPlusOffset(SDNode *N, GlobalValue* &GA,
if (N->getOpcode() == ISD::ADD) { if (N->getOpcode() == ISD::ADD) {
SDValue N1 = N->getOperand(0); SDValue N1 = N->getOperand(0);
SDValue N2 = N->getOperand(1); SDValue N2 = N->getOperand(1);
if (isGAPlusOffset(N1.Val, GA, Offset)) { if (isGAPlusOffset(N1.getNode(), GA, Offset)) {
ConstantSDNode *V = dyn_cast<ConstantSDNode>(N2); ConstantSDNode *V = dyn_cast<ConstantSDNode>(N2);
if (V) { if (V) {
Offset += V->getSignExtended(); Offset += V->getSignExtended();
return true; return true;
} }
} else if (isGAPlusOffset(N2.Val, GA, Offset)) { } else if (isGAPlusOffset(N2.getNode(), GA, Offset)) {
ConstantSDNode *V = dyn_cast<ConstantSDNode>(N1); ConstantSDNode *V = dyn_cast<ConstantSDNode>(N1);
if (V) { if (V) {
Offset += V->getSignExtended(); Offset += V->getSignExtended();
@ -1732,7 +1732,7 @@ bool TargetLowering::isGAPlusOffset(SDNode *N, GlobalValue* &GA,
bool TargetLowering::isConsecutiveLoad(SDNode *LD, SDNode *Base, bool TargetLowering::isConsecutiveLoad(SDNode *LD, SDNode *Base,
unsigned Bytes, int Dist, unsigned Bytes, int Dist,
const MachineFrameInfo *MFI) const { const MachineFrameInfo *MFI) const {
if (LD->getOperand(0).Val != Base->getOperand(0).Val) if (LD->getOperand(0).getNode() != Base->getOperand(0).getNode())
return false; return false;
MVT VT = LD->getValueType(0); MVT VT = LD->getValueType(0);
if (VT.getSizeInBits() / 8 != Bytes) if (VT.getSizeInBits() / 8 != Bytes)
@ -1755,8 +1755,8 @@ bool TargetLowering::isConsecutiveLoad(SDNode *LD, SDNode *Base,
GlobalValue *GV2 = NULL; GlobalValue *GV2 = NULL;
int64_t Offset1 = 0; int64_t Offset1 = 0;
int64_t Offset2 = 0; int64_t Offset2 = 0;
bool isGA1 = isGAPlusOffset(Loc.Val, GV1, Offset1); bool isGA1 = isGAPlusOffset(Loc.getNode(), GV1, Offset1);
bool isGA2 = isGAPlusOffset(BaseLoc.Val, GV2, Offset2); bool isGA2 = isGAPlusOffset(BaseLoc.getNode(), GV2, Offset2);
if (isGA1 && isGA2 && GV1 == GV2) if (isGA1 && isGA2 && GV1 == GV2)
return Offset1 == (Offset2 + Dist*Bytes); return Offset1 == (Offset2 + Dist*Bytes);
return false; return false;
@ -1979,7 +1979,7 @@ static void ChooseConstraint(TargetLowering::AsmOperandInfo &OpInfo,
// For example, on X86 we might have an 'rI' constraint. If the operand // For example, on X86 we might have an 'rI' constraint. If the operand
// is an integer in the range [0..31] we want to use I (saving a load // is an integer in the range [0..31] we want to use I (saving a load
// of a register), otherwise we must use 'r'. // of a register), otherwise we must use 'r'.
if (CType == TargetLowering::C_Other && Op.Val) { if (CType == TargetLowering::C_Other && Op.getNode()) {
assert(OpInfo.Codes[i].size() == 1 && assert(OpInfo.Codes[i].size() == 1 &&
"Unhandled multi-letter 'other' constraint"); "Unhandled multi-letter 'other' constraint");
std::vector<SDValue> ResultOps; std::vector<SDValue> ResultOps;
@ -2273,34 +2273,34 @@ SDValue TargetLowering::BuildSDIV(SDNode *N, SelectionDAG &DAG,
else if (isOperationLegal(ISD::SMUL_LOHI, VT)) else if (isOperationLegal(ISD::SMUL_LOHI, VT))
Q = SDValue(DAG.getNode(ISD::SMUL_LOHI, DAG.getVTList(VT, VT), Q = SDValue(DAG.getNode(ISD::SMUL_LOHI, DAG.getVTList(VT, VT),
N->getOperand(0), N->getOperand(0),
DAG.getConstant(magics.m, VT)).Val, 1); DAG.getConstant(magics.m, VT)).getNode(), 1);
else else
return SDValue(); // No mulhs or equvialent return SDValue(); // No mulhs or equvialent
// If d > 0 and m < 0, add the numerator // If d > 0 and m < 0, add the numerator
if (d > 0 && magics.m < 0) { if (d > 0 && magics.m < 0) {
Q = DAG.getNode(ISD::ADD, VT, Q, N->getOperand(0)); Q = DAG.getNode(ISD::ADD, VT, Q, N->getOperand(0));
if (Created) if (Created)
Created->push_back(Q.Val); Created->push_back(Q.getNode());
} }
// If d < 0 and m > 0, subtract the numerator. // If d < 0 and m > 0, subtract the numerator.
if (d < 0 && magics.m > 0) { if (d < 0 && magics.m > 0) {
Q = DAG.getNode(ISD::SUB, VT, Q, N->getOperand(0)); Q = DAG.getNode(ISD::SUB, VT, Q, N->getOperand(0));
if (Created) if (Created)
Created->push_back(Q.Val); Created->push_back(Q.getNode());
} }
// Shift right algebraic if shift value is nonzero // Shift right algebraic if shift value is nonzero
if (magics.s > 0) { if (magics.s > 0) {
Q = DAG.getNode(ISD::SRA, VT, Q, Q = DAG.getNode(ISD::SRA, VT, Q,
DAG.getConstant(magics.s, getShiftAmountTy())); DAG.getConstant(magics.s, getShiftAmountTy()));
if (Created) if (Created)
Created->push_back(Q.Val); Created->push_back(Q.getNode());
} }
// Extract the sign bit and add it to the quotient // Extract the sign bit and add it to the quotient
SDValue T = SDValue T =
DAG.getNode(ISD::SRL, VT, Q, DAG.getConstant(VT.getSizeInBits()-1, DAG.getNode(ISD::SRL, VT, Q, DAG.getConstant(VT.getSizeInBits()-1,
getShiftAmountTy())); getShiftAmountTy()));
if (Created) if (Created)
Created->push_back(T.Val); Created->push_back(T.getNode());
return DAG.getNode(ISD::ADD, VT, Q, T); return DAG.getNode(ISD::ADD, VT, Q, T);
} }
@ -2327,11 +2327,11 @@ SDValue TargetLowering::BuildUDIV(SDNode *N, SelectionDAG &DAG,
else if (isOperationLegal(ISD::UMUL_LOHI, VT)) else if (isOperationLegal(ISD::UMUL_LOHI, VT))
Q = SDValue(DAG.getNode(ISD::UMUL_LOHI, DAG.getVTList(VT, VT), Q = SDValue(DAG.getNode(ISD::UMUL_LOHI, DAG.getVTList(VT, VT),
N->getOperand(0), N->getOperand(0),
DAG.getConstant(magics.m, VT)).Val, 1); DAG.getConstant(magics.m, VT)).getNode(), 1);
else else
return SDValue(); // No mulhu or equvialent return SDValue(); // No mulhu or equvialent
if (Created) if (Created)
Created->push_back(Q.Val); Created->push_back(Q.getNode());
if (magics.a == 0) { if (magics.a == 0) {
return DAG.getNode(ISD::SRL, VT, Q, return DAG.getNode(ISD::SRL, VT, Q,
@ -2339,14 +2339,14 @@ SDValue TargetLowering::BuildUDIV(SDNode *N, SelectionDAG &DAG,
} else { } else {
SDValue NPQ = DAG.getNode(ISD::SUB, VT, N->getOperand(0), Q); SDValue NPQ = DAG.getNode(ISD::SUB, VT, N->getOperand(0), Q);
if (Created) if (Created)
Created->push_back(NPQ.Val); Created->push_back(NPQ.getNode());
NPQ = DAG.getNode(ISD::SRL, VT, NPQ, NPQ = DAG.getNode(ISD::SRL, VT, NPQ,
DAG.getConstant(1, getShiftAmountTy())); DAG.getConstant(1, getShiftAmountTy()));
if (Created) if (Created)
Created->push_back(NPQ.Val); Created->push_back(NPQ.getNode());
NPQ = DAG.getNode(ISD::ADD, VT, NPQ, Q); NPQ = DAG.getNode(ISD::ADD, VT, NPQ, Q);
if (Created) if (Created)
Created->push_back(NPQ.Val); Created->push_back(NPQ.getNode());
return DAG.getNode(ISD::SRL, VT, NPQ, return DAG.getNode(ISD::SRL, VT, NPQ,
DAG.getConstant(magics.s-1, getShiftAmountTy())); DAG.getConstant(magics.s-1, getShiftAmountTy()));
} }

20
lib/Target/ARM/ARMISelDAGToDAG.cpp
View File

@ -529,7 +529,7 @@ static inline SDValue getAL(SelectionDAG *CurDAG) {
SDNode *ARMDAGToDAGISel::Select(SDValue Op) { SDNode *ARMDAGToDAGISel::Select(SDValue Op) {
SDNode *N = Op.Val; SDNode *N = Op.getNode();
if (N->isMachineOpcode()) if (N->isMachineOpcode())
return NULL; // Already selected. return NULL; // Already selected.
@ -729,11 +729,11 @@ SDNode *ARMDAGToDAGISel::Select(SDValue Op) {
SDValue Ops[] = { N1, Tmp2, N3, Chain, InFlag }; SDValue Ops[] = { N1, Tmp2, N3, Chain, InFlag };
SDNode *ResNode = CurDAG->getTargetNode(Opc, MVT::Other, MVT::Flag, Ops, 5); SDNode *ResNode = CurDAG->getTargetNode(Opc, MVT::Other, MVT::Flag, Ops, 5);
Chain = SDValue(ResNode, 0); Chain = SDValue(ResNode, 0);
if (Op.Val->getNumValues() == 2) { if (Op.getNode()->getNumValues() == 2) {
InFlag = SDValue(ResNode, 1); InFlag = SDValue(ResNode, 1);
ReplaceUses(SDValue(Op.Val, 1), InFlag); ReplaceUses(SDValue(Op.getNode(), 1), InFlag);
} }
ReplaceUses(SDValue(Op.Val, 0), SDValue(Chain.Val, Chain.getResNo())); ReplaceUses(SDValue(Op.getNode(), 0), SDValue(Chain.getNode(), Chain.getResNo()));
return NULL; return NULL;
} }
case ARMISD::CMOV: { case ARMISD::CMOV: {
@ -763,7 +763,7 @@ SDNode *ARMDAGToDAGISel::Select(SDValue Op) {
SDValue Tmp2 = CurDAG->getTargetConstant(((unsigned) SDValue Tmp2 = CurDAG->getTargetConstant(((unsigned)
cast<ConstantSDNode>(N2)->getValue()), MVT::i32); cast<ConstantSDNode>(N2)->getValue()), MVT::i32);
SDValue Ops[] = { N0, CPTmp0, CPTmp1, CPTmp2, Tmp2, N3, InFlag }; SDValue Ops[] = { N0, CPTmp0, CPTmp1, CPTmp2, Tmp2, N3, InFlag };
return CurDAG->SelectNodeTo(Op.Val, ARM::MOVCCs, MVT::i32, Ops, 7); return CurDAG->SelectNodeTo(Op.getNode(), ARM::MOVCCs, MVT::i32, Ops, 7);
} }
// Pattern: (ARMcmov:i32 GPR:i32:$false, // Pattern: (ARMcmov:i32 GPR:i32:$false,
@ -774,16 +774,16 @@ SDNode *ARMDAGToDAGISel::Select(SDValue Op) {
// Pattern complexity = 10 cost = 1 size = 0 // Pattern complexity = 10 cost = 1 size = 0
if (VT == MVT::i32 && if (VT == MVT::i32 &&
N3.getOpcode() == ISD::Constant && N3.getOpcode() == ISD::Constant &&
Predicate_so_imm(N3.Val)) { Predicate_so_imm(N3.getNode())) {
AddToISelQueue(N0); AddToISelQueue(N0);
AddToISelQueue(InFlag); AddToISelQueue(InFlag);
SDValue Tmp1 = CurDAG->getTargetConstant(((unsigned) SDValue Tmp1 = CurDAG->getTargetConstant(((unsigned)
cast<ConstantSDNode>(N1)->getValue()), MVT::i32); cast<ConstantSDNode>(N1)->getValue()), MVT::i32);
Tmp1 = Transform_so_imm_XFORM(Tmp1.Val); Tmp1 = Transform_so_imm_XFORM(Tmp1.getNode());
SDValue Tmp2 = CurDAG->getTargetConstant(((unsigned) SDValue Tmp2 = CurDAG->getTargetConstant(((unsigned)
cast<ConstantSDNode>(N2)->getValue()), MVT::i32); cast<ConstantSDNode>(N2)->getValue()), MVT::i32);
SDValue Ops[] = { N0, Tmp1, Tmp2, N3, InFlag }; SDValue Ops[] = { N0, Tmp1, Tmp2, N3, InFlag };
return CurDAG->SelectNodeTo(Op.Val, ARM::MOVCCi, MVT::i32, Ops, 5); return CurDAG->SelectNodeTo(Op.getNode(), ARM::MOVCCi, MVT::i32, Ops, 5);
} }
// Pattern: (ARMcmov:i32 GPR:i32:$false, GPR:i32:$true, (imm:i32):$cc) // Pattern: (ARMcmov:i32 GPR:i32:$false, GPR:i32:$true, (imm:i32):$cc)
@ -815,7 +815,7 @@ SDNode *ARMDAGToDAGISel::Select(SDValue Op) {
Opc = ARM::FCPYDcc; Opc = ARM::FCPYDcc;
break; break;
} }
return CurDAG->SelectNodeTo(Op.Val, Opc, VT, Ops, 5); return CurDAG->SelectNodeTo(Op.getNode(), Opc, VT, Ops, 5);
} }
case ARMISD::CNEG: { case ARMISD::CNEG: {
MVT VT = Op.getValueType(); MVT VT = Op.getValueType();
@ -844,7 +844,7 @@ SDNode *ARMDAGToDAGISel::Select(SDValue Op) {
Opc = ARM::FNEGDcc; Opc = ARM::FNEGDcc;
break; break;
} }
return CurDAG->SelectNodeTo(Op.Val, Opc, VT, Ops, 5); return CurDAG->SelectNodeTo(Op.getNode(), Opc, VT, Ops, 5);
} }
} }
return SelectCode(Op); return SelectCode(Op);

24
lib/Target/ARM/ARMISelLowering.cpp
View File

@ -400,7 +400,7 @@ HowToPassArgument(MVT ObjectVT, unsigned NumGPRs,
/// ARMISD:CALL <- callseq_end chain. Also add input and output parameter /// ARMISD:CALL <- callseq_end chain. Also add input and output parameter
/// nodes. /// nodes.
SDValue ARMTargetLowering::LowerCALL(SDValue Op, SelectionDAG &DAG) { SDValue ARMTargetLowering::LowerCALL(SDValue Op, SelectionDAG &DAG) {
MVT RetVT= Op.Val->getValueType(0); MVT RetVT= Op.getNode()->getValueType(0);
SDValue Chain = Op.getOperand(0); SDValue Chain = Op.getOperand(0);
unsigned CallConv = cast<ConstantSDNode>(Op.getOperand(1))->getValue(); unsigned CallConv = cast<ConstantSDNode>(Op.getOperand(1))->getValue();
assert((CallConv == CallingConv::C || assert((CallConv == CallingConv::C ||
@ -597,7 +597,7 @@ SDValue ARMTargetLowering::LowerCALL(SDValue Op, SelectionDAG &DAG) {
Ops.push_back(DAG.getRegister(RegsToPass[i].first, Ops.push_back(DAG.getRegister(RegsToPass[i].first,
RegsToPass[i].second.getValueType())); RegsToPass[i].second.getValueType()));
if (InFlag.Val) if (InFlag.getNode())
Ops.push_back(InFlag); Ops.push_back(InFlag);
// Returns a chain and a flag for retval copy to use. // Returns a chain and a flag for retval copy to use.
Chain = DAG.getNode(CallOpc, DAG.getVTList(MVT::Other, MVT::Flag), Chain = DAG.getNode(CallOpc, DAG.getVTList(MVT::Other, MVT::Flag),
@ -621,7 +621,7 @@ SDValue ARMTargetLowering::LowerCALL(SDValue Op, SelectionDAG &DAG) {
case MVT::i32: case MVT::i32:
Chain = DAG.getCopyFromReg(Chain, ARM::R0, MVT::i32, InFlag).getValue(1); Chain = DAG.getCopyFromReg(Chain, ARM::R0, MVT::i32, InFlag).getValue(1);
ResultVals.push_back(Chain.getValue(0)); ResultVals.push_back(Chain.getValue(0));
if (Op.Val->getValueType(1) == MVT::i32) { if (Op.getNode()->getValueType(1) == MVT::i32) {
// Returns a i64 value. // Returns a i64 value.
Chain = DAG.getCopyFromReg(Chain, ARM::R1, MVT::i32, Chain = DAG.getCopyFromReg(Chain, ARM::R1, MVT::i32,
Chain.getValue(2)).getValue(1); Chain.getValue(2)).getValue(1);
@ -981,7 +981,7 @@ ARMTargetLowering::LowerFORMAL_ARGUMENTS(SDValue Op, SelectionDAG &DAG) {
unsigned ArgOffset = 0; // Frame mechanisms handle retaddr slot unsigned ArgOffset = 0; // Frame mechanisms handle retaddr slot
unsigned NumGPRs = 0; // GPRs used for parameter passing. unsigned NumGPRs = 0; // GPRs used for parameter passing.
unsigned NumArgs = Op.Val->getNumValues()-1; unsigned NumArgs = Op.getNode()->getNumValues()-1;
for (unsigned ArgNo = 0; ArgNo < NumArgs; ++ArgNo) for (unsigned ArgNo = 0; ArgNo < NumArgs; ++ArgNo)
ArgValues.push_back(LowerFORMAL_ARGUMENT(Op, DAG, ArgNo, ArgValues.push_back(LowerFORMAL_ARGUMENT(Op, DAG, ArgNo,
NumGPRs, ArgOffset)); NumGPRs, ArgOffset));
@ -1029,7 +1029,7 @@ ARMTargetLowering::LowerFORMAL_ARGUMENTS(SDValue Op, SelectionDAG &DAG) {
ArgValues.push_back(Root); ArgValues.push_back(Root);
// Return the new list of results. // Return the new list of results.
return DAG.getMergeValues(Op.Val->getVTList(), &ArgValues[0], return DAG.getMergeValues(Op.getNode()->getVTList(), &ArgValues[0],
ArgValues.size()); ArgValues.size());
} }
@ -1037,7 +1037,7 @@ ARMTargetLowering::LowerFORMAL_ARGUMENTS(SDValue Op, SelectionDAG &DAG) {
static bool isFloatingPointZero(SDValue Op) { static bool isFloatingPointZero(SDValue Op) {
if (ConstantFPSDNode *CFP = dyn_cast<ConstantFPSDNode>(Op)) if (ConstantFPSDNode *CFP = dyn_cast<ConstantFPSDNode>(Op))
return CFP->getValueAPF().isPosZero(); return CFP->getValueAPF().isPosZero();
else if (ISD::isEXTLoad(Op.Val) || ISD::isNON_EXTLoad(Op.Val)) { else if (ISD::isEXTLoad(Op.getNode()) || ISD::isNON_EXTLoad(Op.getNode())) {
// Maybe this has already been legalized into the constant pool? // Maybe this has already been legalized into the constant pool?
if (Op.getOperand(1).getOpcode() == ARMISD::Wrapper) { if (Op.getOperand(1).getOpcode() == ARMISD::Wrapper) {
SDValue WrapperOp = Op.getOperand(1).getOperand(0); SDValue WrapperOp = Op.getOperand(1).getOperand(0);
@ -1058,7 +1058,7 @@ static bool isLegalCmpImmediate(unsigned C, bool isThumb) {
/// the given operands. /// the given operands.
static SDValue getARMCmp(SDValue LHS, SDValue RHS, ISD::CondCode CC, static SDValue getARMCmp(SDValue LHS, SDValue RHS, ISD::CondCode CC,
SDValue &ARMCC, SelectionDAG &DAG, bool isThumb) { SDValue &ARMCC, SelectionDAG &DAG, bool isThumb) {
if (ConstantSDNode *RHSC = dyn_cast<ConstantSDNode>(RHS.Val)) { if (ConstantSDNode *RHSC = dyn_cast<ConstantSDNode>(RHS.getNode())) {
unsigned C = RHSC->getValue(); unsigned C = RHSC->getValue();
if (!isLegalCmpImmediate(C, isThumb)) { if (!isLegalCmpImmediate(C, isThumb)) {
// Constant does not fit, try adjusting it by one? // Constant does not fit, try adjusting it by one?
@ -1362,7 +1362,7 @@ static SDNode *ExpandBIT_CONVERT(SDNode *N, SelectionDAG &DAG) {
&Op, 1); &Op, 1);
// Merge the pieces into a single i64 value. // Merge the pieces into a single i64 value.
return DAG.getNode(ISD::BUILD_PAIR, MVT::i64, Cvt, Cvt.getValue(1)).Val; return DAG.getNode(ISD::BUILD_PAIR, MVT::i64, Cvt, Cvt.getValue(1)).getNode();
} }
static SDNode *ExpandSRx(SDNode *N, SelectionDAG &DAG, const ARMSubtarget *ST) { static SDNode *ExpandSRx(SDNode *N, SelectionDAG &DAG, const ARMSubtarget *ST) {
@ -1393,7 +1393,7 @@ static SDNode *ExpandSRx(SDNode *N, SelectionDAG &DAG, const ARMSubtarget *ST) {
Lo = DAG.getNode(ARMISD::RRX, MVT::i32, Lo, Hi.getValue(1)); Lo = DAG.getNode(ARMISD::RRX, MVT::i32, Lo, Hi.getValue(1));
// Merge the pieces into a single i64 value. // Merge the pieces into a single i64 value.
return DAG.getNode(ISD::BUILD_PAIR, MVT::i64, Lo, Hi).Val; return DAG.getNode(ISD::BUILD_PAIR, MVT::i64, Lo, Hi).getNode();
} }
@ -1424,9 +1424,9 @@ SDValue ARMTargetLowering::LowerOperation(SDValue Op, SelectionDAG &DAG) {
// FIXME: Remove these when LegalizeDAGTypes lands. // FIXME: Remove these when LegalizeDAGTypes lands.
case ISD::BIT_CONVERT: return SDValue(ExpandBIT_CONVERT(Op.Val, DAG), 0); case ISD::BIT_CONVERT: return SDValue(ExpandBIT_CONVERT(Op.getNode(), DAG), 0);
case ISD::SRL: case ISD::SRL:
case ISD::SRA: return SDValue(ExpandSRx(Op.Val, DAG,Subtarget),0); case ISD::SRA: return SDValue(ExpandSRx(Op.getNode(), DAG,Subtarget),0);
} }
return SDValue(); return SDValue();
} }
@ -1734,7 +1734,7 @@ ARMTargetLowering::getPreIndexedAddressParts(SDNode *N, SDValue &Base,
return false; return false;
bool isInc; bool isInc;
bool isLegal = getIndexedAddressParts(Ptr.Val, VT, isSEXTLoad, Base, Offset, bool isLegal = getIndexedAddressParts(Ptr.getNode(), VT, isSEXTLoad, Base, Offset,
isInc, DAG); isInc, DAG);
if (isLegal) { if (isLegal) {
AM = isInc ? ISD::PRE_INC : ISD::PRE_DEC; AM = isInc ? ISD::PRE_INC : ISD::PRE_DEC;

8
lib/Target/Alpha/AlphaISelDAGToDAG.cpp
View File

@ -75,7 +75,7 @@ namespace {
Result |= 1 << i; Result |= 1 << i;
if (((Constant >> 8*i) & 0xFF) == 0xFF) { if (((Constant >> 8*i) & 0xFF) == 0xFF) {
// If the entire byte is set, zapnot the byte. // If the entire byte is set, zapnot the byte.
} else if (LHS.Val == 0) { } else if (LHS.getNode() == 0) {
// Otherwise, if the mask was previously validated, we know its okay // Otherwise, if the mask was previously validated, we know its okay
// to zapnot this entire byte even though all the bits aren't set. // to zapnot this entire byte even though all the bits aren't set.
} else { } else {
@ -242,7 +242,7 @@ void AlphaDAGToDAGISel::InstructionSelect() {
// Select - Convert the specified operand from a target-independent to a // Select - Convert the specified operand from a target-independent to a
// target-specific node if it hasn't already been changed. // target-specific node if it hasn't already been changed.
SDNode *AlphaDAGToDAGISel::Select(SDValue Op) { SDNode *AlphaDAGToDAGISel::Select(SDValue Op) {
SDNode *N = Op.Val; SDNode *N = Op.getNode();
if (N->isMachineOpcode()) { if (N->isMachineOpcode()) {
return NULL; // Already selected. return NULL; // Already selected.
} }
@ -345,7 +345,7 @@ SDNode *AlphaDAGToDAGISel::Select(SDValue Op) {
} }
case ISD::SETCC: case ISD::SETCC:
if (N->getOperand(0).Val->getValueType(0).isFloatingPoint()) { if (N->getOperand(0).getNode()->getValueType(0).isFloatingPoint()) {
ISD::CondCode CC = cast<CondCodeSDNode>(N->getOperand(2))->get(); ISD::CondCode CC = cast<CondCodeSDNode>(N->getOperand(2))->get();
unsigned Opc = Alpha::WTF; unsigned Opc = Alpha::WTF;
@ -460,7 +460,7 @@ SDNode *AlphaDAGToDAGISel::Select(SDValue Op) {
void AlphaDAGToDAGISel::SelectCALL(SDValue Op) { void AlphaDAGToDAGISel::SelectCALL(SDValue Op) {
//TODO: add flag stuff to prevent nondeturministic breakage! //TODO: add flag stuff to prevent nondeturministic breakage!
SDNode *N = Op.Val; SDNode *N = Op.getNode();
SDValue Chain = N->getOperand(0); SDValue Chain = N->getOperand(0);
SDValue Addr = N->getOperand(1); SDValue Addr = N->getOperand(1);
SDValue InFlag(0,0); // Null incoming flag value. SDValue InFlag(0,0); // Null incoming flag value.

22
lib/Target/Alpha/AlphaISelLowering.cpp
View File

@ -215,7 +215,7 @@ static SDValue LowerFORMAL_ARGUMENTS(SDValue Op, SelectionDAG &DAG,
unsigned args_float[] = { unsigned args_float[] = {
Alpha::F16, Alpha::F17, Alpha::F18, Alpha::F19, Alpha::F20, Alpha::F21}; Alpha::F16, Alpha::F17, Alpha::F18, Alpha::F19, Alpha::F20, Alpha::F21};
for (unsigned ArgNo = 0, e = Op.Val->getNumValues()-1; ArgNo != e; ++ArgNo) { for (unsigned ArgNo = 0, e = Op.getNode()->getNumValues()-1; ArgNo != e; ++ArgNo) {
SDValue argt; SDValue argt;
MVT ObjectVT = Op.getValue(ArgNo).getValueType(); MVT ObjectVT = Op.getValue(ArgNo).getValueType();
SDValue ArgVal; SDValue ArgVal;
@ -255,7 +255,7 @@ static SDValue LowerFORMAL_ARGUMENTS(SDValue Op, SelectionDAG &DAG,
// If the functions takes variable number of arguments, copy all regs to stack // If the functions takes variable number of arguments, copy all regs to stack
bool isVarArg = cast<ConstantSDNode>(Op.getOperand(2))->getValue() != 0; bool isVarArg = cast<ConstantSDNode>(Op.getOperand(2))->getValue() != 0;
if (isVarArg) { if (isVarArg) {
VarArgsOffset = (Op.Val->getNumValues()-1) * 8; VarArgsOffset = (Op.getNode()->getNumValues()-1) * 8;
std::vector<SDValue> LS; std::vector<SDValue> LS;
for (int i = 0; i < 6; ++i) { for (int i = 0; i < 6; ++i) {
if (TargetRegisterInfo::isPhysicalRegister(args_int[i])) if (TargetRegisterInfo::isPhysicalRegister(args_int[i]))
@ -281,7 +281,7 @@ static SDValue LowerFORMAL_ARGUMENTS(SDValue Op, SelectionDAG &DAG,
ArgValues.push_back(Root); ArgValues.push_back(Root);
// Return the new list of results. // Return the new list of results.
return DAG.getMergeValues(Op.Val->getVTList(), &ArgValues[0], return DAG.getMergeValues(Op.getNode()->getVTList(), &ArgValues[0],
ArgValues.size()); ArgValues.size());
} }
@ -491,10 +491,10 @@ SDValue AlphaTargetLowering::LowerOperation(SDValue Op, SelectionDAG &DAG) {
case ISD::SREM: case ISD::SREM:
//Expand only on constant case //Expand only on constant case
if (Op.getOperand(1).getOpcode() == ISD::Constant) { if (Op.getOperand(1).getOpcode() == ISD::Constant) {
MVT VT = Op.Val->getValueType(0); MVT VT = Op.getNode()->getValueType(0);
SDValue Tmp1 = Op.Val->getOpcode() == ISD::UREM ? SDValue Tmp1 = Op.getNode()->getOpcode() == ISD::UREM ?
BuildUDIV(Op.Val, DAG, NULL) : BuildUDIV(Op.getNode(), DAG, NULL) :
BuildSDIV(Op.Val, DAG, NULL); BuildSDIV(Op.getNode(), DAG, NULL);
Tmp1 = DAG.getNode(ISD::MUL, VT, Tmp1, Op.getOperand(1)); Tmp1 = DAG.getNode(ISD::MUL, VT, Tmp1, Op.getOperand(1));
Tmp1 = DAG.getNode(ISD::SUB, VT, Op.getOperand(0), Tmp1); Tmp1 = DAG.getNode(ISD::SUB, VT, Op.getOperand(0), Tmp1);
return Tmp1; return Tmp1;
@ -504,8 +504,8 @@ SDValue AlphaTargetLowering::LowerOperation(SDValue Op, SelectionDAG &DAG) {
case ISD::UDIV: case ISD::UDIV:
if (Op.getValueType().isInteger()) { if (Op.getValueType().isInteger()) {
if (Op.getOperand(1).getOpcode() == ISD::Constant) if (Op.getOperand(1).getOpcode() == ISD::Constant)
return Op.getOpcode() == ISD::SDIV ? BuildSDIV(Op.Val, DAG, NULL) return Op.getOpcode() == ISD::SDIV ? BuildSDIV(Op.getNode(), DAG, NULL)
: BuildUDIV(Op.Val, DAG, NULL); : BuildUDIV(Op.getNode(), DAG, NULL);
const char* opstr = 0; const char* opstr = 0;
switch (Op.getOpcode()) { switch (Op.getOpcode()) {
case ISD::UREM: opstr = "__remqu"; break; case ISD::UREM: opstr = "__remqu"; break;
@ -522,7 +522,7 @@ SDValue AlphaTargetLowering::LowerOperation(SDValue Op, SelectionDAG &DAG) {
case ISD::VAARG: { case ISD::VAARG: {
SDValue Chain, DataPtr; SDValue Chain, DataPtr;
LowerVAARG(Op.Val, Chain, DataPtr, DAG); LowerVAARG(Op.getNode(), Chain, DataPtr, DAG);
SDValue Result; SDValue Result;
if (Op.getValueType() == MVT::i32) if (Op.getValueType() == MVT::i32)
@ -578,7 +578,7 @@ SDNode *AlphaTargetLowering::ReplaceNodeResults(SDNode *N,
SDValue Chain, DataPtr; SDValue Chain, DataPtr;
LowerVAARG(N, Chain, DataPtr, DAG); LowerVAARG(N, Chain, DataPtr, DAG);
return DAG.getLoad(N->getValueType(0), Chain, DataPtr, NULL, 0).Val; return DAG.getLoad(N->getValueType(0), Chain, DataPtr, NULL, 0).getNode();
} }

6
lib/Target/CellSPU/SPUISelDAGToDAG.cpp
View File

@ -579,7 +579,7 @@ SPUDAGToDAGISel::SelectXFormAddr(SDValue Op, SDValue N, SDValue &Base,
*/ */
SDNode * SDNode *
SPUDAGToDAGISel::Select(SDValue Op) { SPUDAGToDAGISel::Select(SDValue Op) {
SDNode *N = Op.Val; SDNode *N = Op.getNode();
unsigned Opc = N->getOpcode(); unsigned Opc = N->getOpcode();
int n_ops = -1; int n_ops = -1;
unsigned NewOpc; unsigned NewOpc;
@ -669,9 +669,9 @@ SPUDAGToDAGISel::Select(SDValue Op) {
MVT VT = Op.getValueType(); MVT VT = Op.getValueType();
DEBUG(cerr << "CellSPU: IndirectAddr(LDRESULT, imm):\nOp0 = "); DEBUG(cerr << "CellSPU: IndirectAddr(LDRESULT, imm):\nOp0 = ");
DEBUG(Op.getOperand(0).Val->dump(CurDAG)); DEBUG(Op.getOperand(0).getNode()->dump(CurDAG));
DEBUG(cerr << "\nOp1 = "); DEBUG(cerr << "\nOp1 = ");
DEBUG(Op.getOperand(1).Val->dump(CurDAG)); DEBUG(Op.getOperand(1).getNode()->dump(CurDAG));
DEBUG(cerr << "\n"); DEBUG(cerr << "\n");
if (Op1.getOpcode() == ISD::Constant) { if (Op1.getOpcode() == ISD::Constant) {

70
lib/Target/CellSPU/SPUISelLowering.cpp
View File

@ -503,7 +503,7 @@ AlignedLoad(SDValue Op, SelectionDAG &DAG, const SPUSubtarget *ST,
SDValue chain = LSN->getChain(); SDValue chain = LSN->getChain();
if (basePtr.getOpcode() == ISD::ADD) { if (basePtr.getOpcode() == ISD::ADD) {
SDValue Op1 = basePtr.Val->getOperand(1); SDValue Op1 = basePtr.getNode()->getOperand(1);
if (Op1.getOpcode() == ISD::Constant || Op1.getOpcode() == ISD::TargetConstant) { if (Op1.getOpcode() == ISD::Constant || Op1.getOpcode() == ISD::TargetConstant) {
const ConstantSDNode *CN = cast<ConstantSDNode>(basePtr.getOperand(1)); const ConstantSDNode *CN = cast<ConstantSDNode>(basePtr.getOperand(1));
@ -579,7 +579,7 @@ LowerLOAD(SDValue Op, SelectionDAG &DAG, const SPUSubtarget *ST) {
LoadSDNode *LN = cast<LoadSDNode>(Op); LoadSDNode *LN = cast<LoadSDNode>(Op);
SDValue the_chain = LN->getChain(); SDValue the_chain = LN->getChain();
MVT VT = LN->getMemoryVT(); MVT VT = LN->getMemoryVT();
MVT OpVT = Op.Val->getValueType(0); MVT OpVT = Op.getNode()->getValueType(0);
ISD::LoadExtType ExtType = LN->getExtensionType(); ISD::LoadExtType ExtType = LN->getExtensionType();
unsigned alignment = LN->getAlignment(); unsigned alignment = LN->getAlignment();
SDValue Ops[8]; SDValue Ops[8];
@ -591,7 +591,7 @@ LowerLOAD(SDValue Op, SelectionDAG &DAG, const SPUSubtarget *ST) {
SDValue result = SDValue result =
AlignedLoad(Op, DAG, ST, LN,alignment, offset, rotamt, VT, was16aligned); AlignedLoad(Op, DAG, ST, LN,alignment, offset, rotamt, VT, was16aligned);
if (result.Val == 0) if (result.getNode() == 0)
return result; return result;
the_chain = result.getValue(1); the_chain = result.getValue(1);
@ -708,7 +708,7 @@ LowerSTORE(SDValue Op, SelectionDAG &DAG, const SPUSubtarget *ST) {
AlignedLoad(Op, DAG, ST, SN, alignment, AlignedLoad(Op, DAG, ST, SN, alignment,
chunk_offset, slot_offset, VT, was16aligned); chunk_offset, slot_offset, VT, was16aligned);
if (alignLoadVec.Val == 0) if (alignLoadVec.getNode() == 0)
return alignLoadVec; return alignLoadVec;
LoadSDNode *LN = cast<LoadSDNode>(alignLoadVec); LoadSDNode *LN = cast<LoadSDNode>(alignLoadVec);
@ -736,7 +736,7 @@ LowerSTORE(SDValue Op, SelectionDAG &DAG, const SPUSubtarget *ST) {
// Otherwise generate a D-form address with the slot offset relative // Otherwise generate a D-form address with the slot offset relative
// to the stack pointer, which is always aligned. // to the stack pointer, which is always aligned.
DEBUG(cerr << "CellSPU LowerSTORE: basePtr = "); DEBUG(cerr << "CellSPU LowerSTORE: basePtr = ");
DEBUG(basePtr.Val->dump(&DAG)); DEBUG(basePtr.getNode()->dump(&DAG));
DEBUG(cerr << "\n"); DEBUG(cerr << "\n");
if (basePtr.getOpcode() == SPUISD::IndirectAddr || if (basePtr.getOpcode() == SPUISD::IndirectAddr ||
@ -859,7 +859,7 @@ LowerGlobalAddress(SDValue Op, SelectionDAG &DAG, const SPUSubtarget *ST) {
static SDValue static SDValue
LowerConstant(SDValue Op, SelectionDAG &DAG) { LowerConstant(SDValue Op, SelectionDAG &DAG) {
MVT VT = Op.getValueType(); MVT VT = Op.getValueType();
ConstantSDNode *CN = cast<ConstantSDNode>(Op.Val); ConstantSDNode *CN = cast<ConstantSDNode>(Op.getNode());
if (VT == MVT::i64) { if (VT == MVT::i64) {
SDValue T = DAG.getConstant(CN->getValue(), MVT::i64); SDValue T = DAG.getConstant(CN->getValue(), MVT::i64);
@ -880,7 +880,7 @@ LowerConstant(SDValue Op, SelectionDAG &DAG) {
static SDValue static SDValue
LowerConstantFP(SDValue Op, SelectionDAG &DAG) { LowerConstantFP(SDValue Op, SelectionDAG &DAG) {
MVT VT = Op.getValueType(); MVT VT = Op.getValueType();
ConstantFPSDNode *FP = cast<ConstantFPSDNode>(Op.Val); ConstantFPSDNode *FP = cast<ConstantFPSDNode>(Op.getNode());
assert((FP != 0) && assert((FP != 0) &&
"LowerConstantFP: Node is not ConstantFPSDNode"); "LowerConstantFP: Node is not ConstantFPSDNode");
@ -932,7 +932,7 @@ LowerFORMAL_ARGUMENTS(SDValue Op, SelectionDAG &DAG, int &VarArgsFrameIndex)
MVT PtrVT = DAG.getTargetLoweringInfo().getPointerTy(); MVT PtrVT = DAG.getTargetLoweringInfo().getPointerTy();
// Add DAG nodes to load the arguments or copy them out of registers. // Add DAG nodes to load the arguments or copy them out of registers.
for (unsigned ArgNo = 0, e = Op.Val->getNumValues()-1; ArgNo != e; ++ArgNo) { for (unsigned ArgNo = 0, e = Op.getNode()->getNumValues()-1; ArgNo != e; ++ArgNo) {
SDValue ArgVal; SDValue ArgVal;
bool needsLoad = false; bool needsLoad = false;
MVT ObjectVT = Op.getValue(ArgNo).getValueType(); MVT ObjectVT = Op.getValue(ArgNo).getValueType();
@ -1061,7 +1061,7 @@ LowerFORMAL_ARGUMENTS(SDValue Op, SelectionDAG &DAG, int &VarArgsFrameIndex)
ArgValues.push_back(Root); ArgValues.push_back(Root);
// Return the new list of results. // Return the new list of results.
return DAG.getMergeValues(Op.Val->getVTList(), &ArgValues[0], return DAG.getMergeValues(Op.getNode()->getVTList(), &ArgValues[0],
ArgValues.size()); ArgValues.size());
} }
@ -1076,7 +1076,7 @@ static SDNode *isLSAAddress(SDValue Op, SelectionDAG &DAG) {
(Addr << 14 >> 14) != Addr) (Addr << 14 >> 14) != Addr)
return 0; // Top 14 bits have to be sext of immediate. return 0; // Top 14 bits have to be sext of immediate.
return DAG.getConstant((int)C->getValue() >> 2, MVT::i32).Val; return DAG.getConstant((int)C->getValue() >> 2, MVT::i32).getNode();
} }
static static
@ -1226,7 +1226,7 @@ LowerCALL(SDValue Op, SelectionDAG &DAG, const SPUSubtarget *ST) {
Ops.push_back(DAG.getRegister(RegsToPass[i].first, Ops.push_back(DAG.getRegister(RegsToPass[i].first,
RegsToPass[i].second.getValueType())); RegsToPass[i].second.getValueType()));
if (InFlag.Val) if (InFlag.getNode())
Ops.push_back(InFlag); Ops.push_back(InFlag);
// Returns a chain and a flag for retval copy to use. // Returns a chain and a flag for retval copy to use.
Chain = DAG.getNode(CallOpc, DAG.getVTList(MVT::Other, MVT::Flag), Chain = DAG.getNode(CallOpc, DAG.getVTList(MVT::Other, MVT::Flag),
@ -1237,18 +1237,18 @@ LowerCALL(SDValue Op, SelectionDAG &DAG, const SPUSubtarget *ST) {
DAG.getConstant(NumStackBytes, PtrVT), DAG.getConstant(NumStackBytes, PtrVT),
DAG.getConstant(0, PtrVT), DAG.getConstant(0, PtrVT),
InFlag); InFlag);
if (Op.Val->getValueType(0) != MVT::Other) if (Op.getNode()->getValueType(0) != MVT::Other)
InFlag = Chain.getValue(1); InFlag = Chain.getValue(1);
SDValue ResultVals[3]; SDValue ResultVals[3];
unsigned NumResults = 0; unsigned NumResults = 0;
// If the call has results, copy the values out of the ret val registers. // If the call has results, copy the values out of the ret val registers.
switch (Op.Val->getValueType(0).getSimpleVT()) { switch (Op.getNode()->getValueType(0).getSimpleVT()) {
default: assert(0 && "Unexpected ret value!"); default: assert(0 && "Unexpected ret value!");
case MVT::Other: break; case MVT::Other: break;
case MVT::i32: case MVT::i32:
if (Op.Val->getValueType(1) == MVT::i32) { if (Op.getNode()->getValueType(1) == MVT::i32) {
Chain = DAG.getCopyFromReg(Chain, SPU::R4, MVT::i32, InFlag).getValue(1); Chain = DAG.getCopyFromReg(Chain, SPU::R4, MVT::i32, InFlag).getValue(1);
ResultVals[0] = Chain.getValue(0); ResultVals[0] = Chain.getValue(0);
Chain = DAG.getCopyFromReg(Chain, SPU::R3, MVT::i32, Chain = DAG.getCopyFromReg(Chain, SPU::R3, MVT::i32,
@ -1268,7 +1268,7 @@ LowerCALL(SDValue Op, SelectionDAG &DAG, const SPUSubtarget *ST) {
break; break;
case MVT::f32: case MVT::f32:
case MVT::f64: case MVT::f64:
Chain = DAG.getCopyFromReg(Chain, SPU::R3, Op.Val->getValueType(0), Chain = DAG.getCopyFromReg(Chain, SPU::R3, Op.getNode()->getValueType(0),
InFlag).getValue(1); InFlag).getValue(1);
ResultVals[0] = Chain.getValue(0); ResultVals[0] = Chain.getValue(0);
NumResults = 1; NumResults = 1;
@ -1278,7 +1278,7 @@ LowerCALL(SDValue Op, SelectionDAG &DAG, const SPUSubtarget *ST) {
case MVT::v4i32: case MVT::v4i32:
case MVT::v8i16: case MVT::v8i16:
case MVT::v16i8: case MVT::v16i8:
Chain = DAG.getCopyFromReg(Chain, SPU::R3, Op.Val->getValueType(0), Chain = DAG.getCopyFromReg(Chain, SPU::R3, Op.getNode()->getValueType(0),
InFlag).getValue(1); InFlag).getValue(1);
ResultVals[0] = Chain.getValue(0); ResultVals[0] = Chain.getValue(0);
NumResults = 1; NumResults = 1;
@ -1301,7 +1301,7 @@ LowerRET(SDValue Op, SelectionDAG &DAG, TargetMachine &TM) {
unsigned CC = DAG.getMachineFunction().getFunction()->getCallingConv(); unsigned CC = DAG.getMachineFunction().getFunction()->getCallingConv();
bool isVarArg = DAG.getMachineFunction().getFunction()->isVarArg(); bool isVarArg = DAG.getMachineFunction().getFunction()->isVarArg();
CCState CCInfo(CC, isVarArg, TM, RVLocs); CCState CCInfo(CC, isVarArg, TM, RVLocs);
CCInfo.AnalyzeReturn(Op.Val, RetCC_SPU); CCInfo.AnalyzeReturn(Op.getNode(), RetCC_SPU);
// If this is the first return lowered for this function, add the regs to the // If this is the first return lowered for this function, add the regs to the
// liveout set for the function. // liveout set for the function.
@ -1321,7 +1321,7 @@ LowerRET(SDValue Op, SelectionDAG &DAG, TargetMachine &TM) {
Flag = Chain.getValue(1); Flag = Chain.getValue(1);
} }
if (Flag.Val) if (Flag.getNode())
return DAG.getNode(SPUISD::RET_FLAG, MVT::Other, Chain, Flag); return DAG.getNode(SPUISD::RET_FLAG, MVT::Other, Chain, Flag);
else else
return DAG.getNode(SPUISD::RET_FLAG, MVT::Other, Chain); return DAG.getNode(SPUISD::RET_FLAG, MVT::Other, Chain);
@ -1339,13 +1339,13 @@ getVecImm(SDNode *N) {
// Check to see if this buildvec has a single non-undef value in its elements. // Check to see if this buildvec has a single non-undef value in its elements.
for (unsigned i = 0, e = N->getNumOperands(); i != e; ++i) { for (unsigned i = 0, e = N->getNumOperands(); i != e; ++i) {
if (N->getOperand(i).getOpcode() == ISD::UNDEF) continue; if (N->getOperand(i).getOpcode() == ISD::UNDEF) continue;
if (OpVal.Val == 0) if (OpVal.getNode() == 0)
OpVal = N->getOperand(i); OpVal = N->getOperand(i);
else if (OpVal != N->getOperand(i)) else if (OpVal != N->getOperand(i))
return 0; return 0;
} }
if (OpVal.Val != 0) { if (OpVal.getNode() != 0) {
if (ConstantSDNode *CN = dyn_cast<ConstantSDNode>(OpVal)) { if (ConstantSDNode *CN = dyn_cast<ConstantSDNode>(OpVal)) {
return CN; return CN;
} }
@ -1599,7 +1599,7 @@ static SDValue LowerBUILD_VECTOR(SDValue Op, SelectionDAG &DAG) {
uint64_t UndefBits[2]; uint64_t UndefBits[2];
uint64_t SplatBits, SplatUndef; uint64_t SplatBits, SplatUndef;
int SplatSize; int SplatSize;
if (GetConstantBuildVectorBits(Op.Val, VectorBits, UndefBits) if (GetConstantBuildVectorBits(Op.getNode(), VectorBits, UndefBits)
|| !isConstantSplat(VectorBits, UndefBits, || !isConstantSplat(VectorBits, UndefBits,
VT.getVectorElementType().getSizeInBits(), VT.getVectorElementType().getSizeInBits(),
SplatBits, SplatUndef, SplatSize)) SplatBits, SplatUndef, SplatSize))
@ -1842,11 +1842,11 @@ static SDValue LowerVECTOR_SHUFFLE(SDValue Op, SelectionDAG &DAG) {
static SDValue LowerSCALAR_TO_VECTOR(SDValue Op, SelectionDAG &DAG) { static SDValue LowerSCALAR_TO_VECTOR(SDValue Op, SelectionDAG &DAG) {
SDValue Op0 = Op.getOperand(0); // Op0 = the scalar SDValue Op0 = Op.getOperand(0); // Op0 = the scalar
if (Op0.Val->getOpcode() == ISD::Constant) { if (Op0.getNode()->getOpcode() == ISD::Constant) {
// For a constant, build the appropriate constant vector, which will // For a constant, build the appropriate constant vector, which will
// eventually simplify to a vector register load. // eventually simplify to a vector register load.
ConstantSDNode *CN = cast<ConstantSDNode>(Op0.Val); ConstantSDNode *CN = cast<ConstantSDNode>(Op0.getNode());
SmallVector<SDValue, 16> ConstVecValues; SmallVector<SDValue, 16> ConstVecValues;
MVT VT; MVT VT;
size_t n_copies; size_t n_copies;
@ -2447,25 +2447,25 @@ LowerByteImmed(SDValue Op, SelectionDAG &DAG) {
ConstVec = Op.getOperand(0); ConstVec = Op.getOperand(0);
Arg = Op.getOperand(1); Arg = Op.getOperand(1);
if (ConstVec.Val->getOpcode() != ISD::BUILD_VECTOR) { if (ConstVec.getNode()->getOpcode() != ISD::BUILD_VECTOR) {
if (ConstVec.Val->getOpcode() == ISD::BIT_CONVERT) { if (ConstVec.getNode()->getOpcode() == ISD::BIT_CONVERT) {
ConstVec = ConstVec.getOperand(0); ConstVec = ConstVec.getOperand(0);
} else { } else {
ConstVec = Op.getOperand(1); ConstVec = Op.getOperand(1);
Arg = Op.getOperand(0); Arg = Op.getOperand(0);
if (ConstVec.Val->getOpcode() == ISD::BIT_CONVERT) { if (ConstVec.getNode()->getOpcode() == ISD::BIT_CONVERT) {
ConstVec = ConstVec.getOperand(0); ConstVec = ConstVec.getOperand(0);
} }
} }
} }
if (ConstVec.Val->getOpcode() == ISD::BUILD_VECTOR) { if (ConstVec.getNode()->getOpcode() == ISD::BUILD_VECTOR) {
uint64_t VectorBits[2]; uint64_t VectorBits[2];
uint64_t UndefBits[2]; uint64_t UndefBits[2];
uint64_t SplatBits, SplatUndef; uint64_t SplatBits, SplatUndef;
int SplatSize; int SplatSize;
if (!GetConstantBuildVectorBits(ConstVec.Val, VectorBits, UndefBits) if (!GetConstantBuildVectorBits(ConstVec.getNode(), VectorBits, UndefBits)
&& isConstantSplat(VectorBits, UndefBits, && isConstantSplat(VectorBits, UndefBits,
VT.getVectorElementType().getSizeInBits(), VT.getVectorElementType().getSizeInBits(),
SplatBits, SplatUndef, SplatSize)) { SplatBits, SplatUndef, SplatSize)) {
@ -2477,7 +2477,7 @@ LowerByteImmed(SDValue Op, SelectionDAG &DAG) {
for (size_t i = 0; i < tcVecSize; ++i) for (size_t i = 0; i < tcVecSize; ++i)
tcVec[i] = tc; tcVec[i] = tc;
return DAG.getNode(Op.Val->getOpcode(), VT, Arg, return DAG.getNode(Op.getNode()->getOpcode(), VT, Arg,
DAG.getNode(ISD::BUILD_VECTOR, VT, tcVec, tcVecSize)); DAG.getNode(ISD::BUILD_VECTOR, VT, tcVec, tcVecSize));
} }
} }
@ -2632,8 +2632,8 @@ SPUTargetLowering::LowerOperation(SDValue Op, SelectionDAG &DAG)
default: { default: {
cerr << "SPUTargetLowering::LowerOperation(): need to lower this!\n"; cerr << "SPUTargetLowering::LowerOperation(): need to lower this!\n";
cerr << "Op.getOpcode() = " << Opc << "\n"; cerr << "Op.getOpcode() = " << Opc << "\n";
cerr << "*Op.Val:\n"; cerr << "*Op.getNode():\n";
Op.Val->dump(); Op.getNode()->dump();
abort(); abort();
} }
case ISD::LOAD: case ISD::LOAD:
@ -2796,7 +2796,7 @@ SPUTargetLowering::PerformDAGCombine(SDNode *N, DAGCombinerInfo &DCI) const
DEBUG(cerr << "Replace: "); DEBUG(cerr << "Replace: ");
DEBUG(N->dump(&DAG)); DEBUG(N->dump(&DAG));
DEBUG(cerr << "\nWith: "); DEBUG(cerr << "\nWith: ");
DEBUG(Op0.Val->dump(&DAG)); DEBUG(Op0.getNode()->dump(&DAG));
DEBUG(cerr << "\n"); DEBUG(cerr << "\n");
return Op0; return Op0;
@ -2813,7 +2813,7 @@ SPUTargetLowering::PerformDAGCombine(SDNode *N, DAGCombinerInfo &DCI) const
DEBUG(cerr << "Replace: "); DEBUG(cerr << "Replace: ");
DEBUG(N->dump(&DAG)); DEBUG(N->dump(&DAG));
DEBUG(cerr << "\nWith: "); DEBUG(cerr << "\nWith: ");
DEBUG(Op0.Val->dump(&DAG)); DEBUG(Op0.getNode()->dump(&DAG));
DEBUG(cerr << "\n"); DEBUG(cerr << "\n");
return Op0; return Op0;
@ -2871,11 +2871,11 @@ SPUTargetLowering::PerformDAGCombine(SDNode *N, DAGCombinerInfo &DCI) const
} }
// Otherwise, return unchanged. // Otherwise, return unchanged.
#if 1 #if 1
if (Result.Val) { if (Result.getNode()) {
DEBUG(cerr << "\nReplace.SPU: "); DEBUG(cerr << "\nReplace.SPU: ");
DEBUG(N->dump(&DAG)); DEBUG(N->dump(&DAG));
DEBUG(cerr << "\nWith: "); DEBUG(cerr << "\nWith: ");
DEBUG(Result.Val->dump(&DAG)); DEBUG(Result.getNode()->dump(&DAG));
DEBUG(cerr << "\n"); DEBUG(cerr << "\n");
} }
#endif #endif

46
lib/Target/CellSPU/SPUOperands.td
View File

@ -24,13 +24,13 @@ def LO16_vec : SDNodeXForm<scalar_to_vector, [{
&& "LO16_vec got something other than a BUILD_VECTOR"); && "LO16_vec got something other than a BUILD_VECTOR");
// Get first constant operand... // Get first constant operand...
for (unsigned i = 0, e = N->getNumOperands(); OpVal.Val == 0 && i != e; ++i) { for (unsigned i = 0, e = N->getNumOperands(); OpVal.getNode() == 0 && i != e; ++i) {
if (N->getOperand(i).getOpcode() == ISD::UNDEF) continue; if (N->getOperand(i).getOpcode() == ISD::UNDEF) continue;
if (OpVal.Val == 0) if (OpVal.getNode() == 0)
OpVal = N->getOperand(i); OpVal = N->getOperand(i);
} }
assert(OpVal.Val != 0 && "LO16_vec did not locate a <defined> node"); assert(OpVal.getNode() != 0 && "LO16_vec did not locate a <defined> node");
ConstantSDNode *CN = cast<ConstantSDNode>(OpVal); ConstantSDNode *CN = cast<ConstantSDNode>(OpVal);
return getI32Imm((unsigned)CN->getValue() & 0xffff); return getI32Imm((unsigned)CN->getValue() & 0xffff);
}]>; }]>;
@ -49,13 +49,13 @@ def HI16_vec : SDNodeXForm<scalar_to_vector, [{
&& "HI16_vec got something other than a BUILD_VECTOR"); && "HI16_vec got something other than a BUILD_VECTOR");
// Get first constant operand... // Get first constant operand...
for (unsigned i = 0, e = N->getNumOperands(); OpVal.Val == 0 && i != e; ++i) { for (unsigned i = 0, e = N->getNumOperands(); OpVal.getNode() == 0 && i != e; ++i) {
if (N->getOperand(i).getOpcode() == ISD::UNDEF) continue; if (N->getOperand(i).getOpcode() == ISD::UNDEF) continue;
if (OpVal.Val == 0) if (OpVal.getNode() == 0)
OpVal = N->getOperand(i); OpVal = N->getOperand(i);
} }
assert(OpVal.Val != 0 && "HI16_vec did not locate a <defined> node"); assert(OpVal.getNode() != 0 && "HI16_vec did not locate a <defined> node");
ConstantSDNode *CN = cast<ConstantSDNode>(OpVal); ConstantSDNode *CN = cast<ConstantSDNode>(OpVal);
return getI32Imm((unsigned)CN->getValue() >> 16); return getI32Imm((unsigned)CN->getValue() >> 16);
}]>; }]>;
@ -244,7 +244,7 @@ def v16i8SExt8Imm_xform: SDNodeXForm<build_vector, [{
// incoming constant being a 16-bit quantity, where the upper and lower bytes // incoming constant being a 16-bit quantity, where the upper and lower bytes
// are EXACTLY the same (e.g., 0x2a2a) // are EXACTLY the same (e.g., 0x2a2a)
def v16i8SExt8Imm: PatLeaf<(build_vector), [{ def v16i8SExt8Imm: PatLeaf<(build_vector), [{
return SPU::get_vec_i8imm(N, *CurDAG, MVT::i8).Val != 0; return SPU::get_vec_i8imm(N, *CurDAG, MVT::i8).getNode() != 0;
}], v16i8SExt8Imm_xform>; }], v16i8SExt8Imm_xform>;
// v16i8U8Imm_xform function: convert build_vector to unsigned 8-bit // v16i8U8Imm_xform function: convert build_vector to unsigned 8-bit
@ -259,7 +259,7 @@ def v16i8U8Imm_xform: SDNodeXForm<build_vector, [{
// incoming constant being a 16-bit quantity, where the upper and lower bytes // incoming constant being a 16-bit quantity, where the upper and lower bytes
// are EXACTLY the same (e.g., 0x2a2a) // are EXACTLY the same (e.g., 0x2a2a)
def v16i8U8Imm: PatLeaf<(build_vector), [{ def v16i8U8Imm: PatLeaf<(build_vector), [{
return SPU::get_vec_i8imm(N, *CurDAG, MVT::i8).Val != 0; return SPU::get_vec_i8imm(N, *CurDAG, MVT::i8).getNode() != 0;
}], v16i8U8Imm_xform>; }], v16i8U8Imm_xform>;
// v8i16SExt8Imm_xform function: convert build_vector to 8-bit sign extended // v8i16SExt8Imm_xform function: convert build_vector to 8-bit sign extended
@ -271,7 +271,7 @@ def v8i16SExt8Imm_xform: SDNodeXForm<build_vector, [{
// v8i16SExt8Imm: Predicate test for 8-bit sign extended immediate constant // v8i16SExt8Imm: Predicate test for 8-bit sign extended immediate constant
// load, works in conjunction with its transform function. // load, works in conjunction with its transform function.
def v8i16SExt8Imm: PatLeaf<(build_vector), [{ def v8i16SExt8Imm: PatLeaf<(build_vector), [{
return SPU::get_vec_i8imm(N, *CurDAG, MVT::i16).Val != 0; return SPU::get_vec_i8imm(N, *CurDAG, MVT::i16).getNode() != 0;
}], v8i16SExt8Imm_xform>; }], v8i16SExt8Imm_xform>;
// v8i16SExt10Imm_xform function: convert build_vector to 16-bit sign extended // v8i16SExt10Imm_xform function: convert build_vector to 16-bit sign extended
@ -283,7 +283,7 @@ def v8i16SExt10Imm_xform: SDNodeXForm<build_vector, [{
// v8i16SExt10Imm: Predicate test for 16-bit sign extended immediate constant // v8i16SExt10Imm: Predicate test for 16-bit sign extended immediate constant
// load, works in conjunction with its transform function. // load, works in conjunction with its transform function.
def v8i16SExt10Imm: PatLeaf<(build_vector), [{ def v8i16SExt10Imm: PatLeaf<(build_vector), [{
return SPU::get_vec_i10imm(N, *CurDAG, MVT::i16).Val != 0; return SPU::get_vec_i10imm(N, *CurDAG, MVT::i16).getNode() != 0;
}], v8i16SExt10Imm_xform>; }], v8i16SExt10Imm_xform>;
// v8i16Uns10Imm_xform function: convert build_vector to 16-bit unsigned // v8i16Uns10Imm_xform function: convert build_vector to 16-bit unsigned
@ -295,7 +295,7 @@ def v8i16Uns10Imm_xform: SDNodeXForm<build_vector, [{
// v8i16Uns10Imm: Predicate test for 16-bit unsigned immediate constant // v8i16Uns10Imm: Predicate test for 16-bit unsigned immediate constant
// load, works in conjunction with its transform function. // load, works in conjunction with its transform function.
def v8i16Uns10Imm: PatLeaf<(build_vector), [{ def v8i16Uns10Imm: PatLeaf<(build_vector), [{
return SPU::get_vec_i10imm(N, *CurDAG, MVT::i16).Val != 0; return SPU::get_vec_i10imm(N, *CurDAG, MVT::i16).getNode() != 0;
}], v8i16Uns10Imm_xform>; }], v8i16Uns10Imm_xform>;
// v8i16SExt16Imm_xform function: convert build_vector to 16-bit sign extended // v8i16SExt16Imm_xform function: convert build_vector to 16-bit sign extended
@ -307,7 +307,7 @@ def v8i16Uns16Imm_xform: SDNodeXForm<build_vector, [{
// v8i16SExt16Imm: Predicate test for 16-bit sign extended immediate constant // v8i16SExt16Imm: Predicate test for 16-bit sign extended immediate constant
// load, works in conjunction with its transform function. // load, works in conjunction with its transform function.
def v8i16SExt16Imm: PatLeaf<(build_vector), [{ def v8i16SExt16Imm: PatLeaf<(build_vector), [{
return SPU::get_vec_i16imm(N, *CurDAG, MVT::i16).Val != 0; return SPU::get_vec_i16imm(N, *CurDAG, MVT::i16).getNode() != 0;
}], v8i16Uns16Imm_xform>; }], v8i16Uns16Imm_xform>;
// v4i32SExt10Imm_xform function: convert build_vector to 10-bit sign extended // v4i32SExt10Imm_xform function: convert build_vector to 10-bit sign extended
@ -319,7 +319,7 @@ def v4i32SExt10Imm_xform: SDNodeXForm<build_vector, [{
// v4i32SExt10Imm: Predicate test for 10-bit sign extended immediate constant // v4i32SExt10Imm: Predicate test for 10-bit sign extended immediate constant
// load, works in conjunction with its transform function. // load, works in conjunction with its transform function.
def v4i32SExt10Imm: PatLeaf<(build_vector), [{ def v4i32SExt10Imm: PatLeaf<(build_vector), [{
return SPU::get_vec_i10imm(N, *CurDAG, MVT::i32).Val != 0; return SPU::get_vec_i10imm(N, *CurDAG, MVT::i32).getNode() != 0;
}], v4i32SExt10Imm_xform>; }], v4i32SExt10Imm_xform>;
// v4i32Uns10Imm_xform function: convert build_vector to 10-bit unsigned // v4i32Uns10Imm_xform function: convert build_vector to 10-bit unsigned
@ -331,7 +331,7 @@ def v4i32Uns10Imm_xform: SDNodeXForm<build_vector, [{
// v4i32Uns10Imm: Predicate test for 10-bit unsigned immediate constant // v4i32Uns10Imm: Predicate test for 10-bit unsigned immediate constant
// load, works in conjunction with its transform function. // load, works in conjunction with its transform function.
def v4i32Uns10Imm: PatLeaf<(build_vector), [{ def v4i32Uns10Imm: PatLeaf<(build_vector), [{
return SPU::get_vec_i10imm(N, *CurDAG, MVT::i32).Val != 0; return SPU::get_vec_i10imm(N, *CurDAG, MVT::i32).getNode() != 0;
}], v4i32Uns10Imm_xform>; }], v4i32Uns10Imm_xform>;
// v4i32SExt16Imm_xform function: convert build_vector to 16-bit sign extended // v4i32SExt16Imm_xform function: convert build_vector to 16-bit sign extended
@ -343,7 +343,7 @@ def v4i32SExt16Imm_xform: SDNodeXForm<build_vector, [{
// v4i32SExt16Imm: Predicate test for 16-bit sign extended immediate constant // v4i32SExt16Imm: Predicate test for 16-bit sign extended immediate constant
// load, works in conjunction with its transform function. // load, works in conjunction with its transform function.
def v4i32SExt16Imm: PatLeaf<(build_vector), [{ def v4i32SExt16Imm: PatLeaf<(build_vector), [{
return SPU::get_vec_i16imm(N, *CurDAG, MVT::i32).Val != 0; return SPU::get_vec_i16imm(N, *CurDAG, MVT::i32).getNode() != 0;
}], v4i32SExt16Imm_xform>; }], v4i32SExt16Imm_xform>;
// v4i32Uns18Imm_xform function: convert build_vector to 18-bit unsigned // v4i32Uns18Imm_xform function: convert build_vector to 18-bit unsigned
@ -355,7 +355,7 @@ def v4i32Uns18Imm_xform: SDNodeXForm<build_vector, [{
// v4i32Uns18Imm: Predicate test for 18-bit unsigned immediate constant load, // v4i32Uns18Imm: Predicate test for 18-bit unsigned immediate constant load,
// works in conjunction with its transform function. // works in conjunction with its transform function.
def v4i32Uns18Imm: PatLeaf<(build_vector), [{ def v4i32Uns18Imm: PatLeaf<(build_vector), [{
return SPU::get_vec_u18imm(N, *CurDAG, MVT::i32).Val != 0; return SPU::get_vec_u18imm(N, *CurDAG, MVT::i32).getNode() != 0;
}], v4i32Uns18Imm_xform>; }], v4i32Uns18Imm_xform>;
// ILHUvec_get_imm xform function: convert build_vector to ILHUvec imm constant // ILHUvec_get_imm xform function: convert build_vector to ILHUvec imm constant
@ -366,7 +366,7 @@ def ILHUvec_get_imm: SDNodeXForm<build_vector, [{
/// immILHUvec: Predicate test for a ILHU constant vector. /// immILHUvec: Predicate test for a ILHU constant vector.
def immILHUvec: PatLeaf<(build_vector), [{ def immILHUvec: PatLeaf<(build_vector), [{
return SPU::get_ILHUvec_imm(N, *CurDAG, MVT::i32).Val != 0; return SPU::get_ILHUvec_imm(N, *CurDAG, MVT::i32).getNode() != 0;
}], ILHUvec_get_imm>; }], ILHUvec_get_imm>;
// Catch-all for any other i32 vector constants // Catch-all for any other i32 vector constants
@ -375,7 +375,7 @@ def v4i32_get_imm: SDNodeXForm<build_vector, [{
}]>; }]>;
def v4i32Imm: PatLeaf<(build_vector), [{ def v4i32Imm: PatLeaf<(build_vector), [{
return SPU::get_v4i32_imm(N, *CurDAG).Val != 0; return SPU::get_v4i32_imm(N, *CurDAG).getNode() != 0;
}], v4i32_get_imm>; }], v4i32_get_imm>;
// v2i64SExt10Imm_xform function: convert build_vector to 10-bit sign extended // v2i64SExt10Imm_xform function: convert build_vector to 10-bit sign extended
@ -387,7 +387,7 @@ def v2i64SExt10Imm_xform: SDNodeXForm<build_vector, [{
// v2i64SExt10Imm: Predicate test for 10-bit sign extended immediate constant // v2i64SExt10Imm: Predicate test for 10-bit sign extended immediate constant
// load, works in conjunction with its transform function. // load, works in conjunction with its transform function.
def v2i64SExt10Imm: PatLeaf<(build_vector), [{ def v2i64SExt10Imm: PatLeaf<(build_vector), [{
return SPU::get_vec_i10imm(N, *CurDAG, MVT::i64).Val != 0; return SPU::get_vec_i10imm(N, *CurDAG, MVT::i64).getNode() != 0;
}], v2i64SExt10Imm_xform>; }], v2i64SExt10Imm_xform>;
// v2i64SExt16Imm_xform function: convert build_vector to 16-bit sign extended // v2i64SExt16Imm_xform function: convert build_vector to 16-bit sign extended
@ -399,7 +399,7 @@ def v2i64SExt16Imm_xform: SDNodeXForm<build_vector, [{
// v2i64SExt16Imm: Predicate test for 16-bit sign extended immediate constant // v2i64SExt16Imm: Predicate test for 16-bit sign extended immediate constant
// load, works in conjunction with its transform function. // load, works in conjunction with its transform function.
def v2i64SExt16Imm: PatLeaf<(build_vector), [{ def v2i64SExt16Imm: PatLeaf<(build_vector), [{
return SPU::get_vec_i16imm(N, *CurDAG, MVT::i64).Val != 0; return SPU::get_vec_i16imm(N, *CurDAG, MVT::i64).getNode() != 0;
}], v2i64SExt16Imm_xform>; }], v2i64SExt16Imm_xform>;
// v2i64Uns18Imm_xform function: convert build_vector to 18-bit unsigned // v2i64Uns18Imm_xform function: convert build_vector to 18-bit unsigned
@ -411,12 +411,12 @@ def v2i64Uns18Imm_xform: SDNodeXForm<build_vector, [{
// v2i64Uns18Imm: Predicate test for 18-bit unsigned immediate constant load, // v2i64Uns18Imm: Predicate test for 18-bit unsigned immediate constant load,
// works in conjunction with its transform function. // works in conjunction with its transform function.
def v2i64Uns18Imm: PatLeaf<(build_vector), [{ def v2i64Uns18Imm: PatLeaf<(build_vector), [{
return SPU::get_vec_u18imm(N, *CurDAG, MVT::i64).Val != 0; return SPU::get_vec_u18imm(N, *CurDAG, MVT::i64).getNode() != 0;
}], v2i64Uns18Imm_xform>; }], v2i64Uns18Imm_xform>;
/// immILHUvec: Predicate test for a ILHU constant vector. /// immILHUvec: Predicate test for a ILHU constant vector.
def immILHUvec_i64: PatLeaf<(build_vector), [{ def immILHUvec_i64: PatLeaf<(build_vector), [{
return SPU::get_ILHUvec_imm(N, *CurDAG, MVT::i64).Val != 0; return SPU::get_ILHUvec_imm(N, *CurDAG, MVT::i64).getNode() != 0;
}], ILHUvec_get_imm>; }], ILHUvec_get_imm>;
// Catch-all for any other i32 vector constants // Catch-all for any other i32 vector constants
@ -425,7 +425,7 @@ def v2i64_get_imm: SDNodeXForm<build_vector, [{
}]>; }]>;
def v2i64Imm: PatLeaf<(build_vector), [{ def v2i64Imm: PatLeaf<(build_vector), [{
return SPU::get_v2i64_imm(N, *CurDAG).Val != 0; return SPU::get_v2i64_imm(N, *CurDAG).getNode() != 0;
}], v2i64_get_imm>; }], v2i64_get_imm>;
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//

6
lib/Target/IA64/IA64ISelDAGToDAG.cpp
View File

@ -105,7 +105,7 @@ void IA64DAGToDAGISel::InstructionSelect() {
} }
SDNode *IA64DAGToDAGISel::SelectDIV(SDValue Op) { SDNode *IA64DAGToDAGISel::SelectDIV(SDValue Op) {
SDNode *N = Op.Val; SDNode *N = Op.getNode();
SDValue Chain = N->getOperand(0); SDValue Chain = N->getOperand(0);
SDValue Tmp1 = N->getOperand(0); SDValue Tmp1 = N->getOperand(0);
SDValue Tmp2 = N->getOperand(1); SDValue Tmp2 = N->getOperand(1);
@ -304,7 +304,7 @@ SDNode *IA64DAGToDAGISel::SelectDIV(SDValue Op) {
// Select - Convert the specified operand from a target-independent to a // Select - Convert the specified operand from a target-independent to a
// target-specific node if it hasn't already been changed. // target-specific node if it hasn't already been changed.
SDNode *IA64DAGToDAGISel::Select(SDValue Op) { SDNode *IA64DAGToDAGISel::Select(SDValue Op) {
SDNode *N = Op.Val; SDNode *N = Op.getNode();
if (N->isMachineOpcode()) if (N->isMachineOpcode())
return NULL; // Already selected. return NULL; // Already selected.
@ -367,7 +367,7 @@ SDNode *IA64DAGToDAGISel::Select(SDValue Op) {
} }
// Finally, once everything is setup, emit the call itself // Finally, once everything is setup, emit the call itself
if(InFlag.Val) if (InFlag.getNode())
Chain = SDValue(CurDAG->getTargetNode(CallOpcode, MVT::Other, MVT::Flag, Chain = SDValue(CurDAG->getTargetNode(CallOpcode, MVT::Other, MVT::Flag,
CallOperand, InFlag), 0); CallOperand, InFlag), 0);
else // there might be no arguments else // there might be no arguments

8
lib/Target/IA64/IA64ISelLowering.cpp
View File

@ -387,8 +387,8 @@ IA64TargetLowering::LowerCallTo(SDValue Chain, const Type *RetTy,
break; break;
} }
if(ValToStore.Val) { if(ValToStore.getNode()) {
if(!StackPtr.Val) { if(!StackPtr.getNode()) {
StackPtr = DAG.getRegister(IA64::r12, MVT::i64); StackPtr = DAG.getRegister(IA64::r12, MVT::i64);
} }
SDValue PtrOff = DAG.getConstant(ArgOffset, getPointerTy()); SDValue PtrOff = DAG.getConstant(ArgOffset, getPointerTy());
@ -397,7 +397,7 @@ IA64TargetLowering::LowerCallTo(SDValue Chain, const Type *RetTy,
ArgOffset += ObjSize; ArgOffset += ObjSize;
} }
if(ValToConvert.Val) { if(ValToConvert.getNode()) {
Converts.push_back(DAG.getNode(IA64ISD::GETFD, MVT::i64, ValToConvert)); Converts.push_back(DAG.getNode(IA64ISD::GETFD, MVT::i64, ValToConvert));
} }
} }
@ -471,7 +471,7 @@ IA64TargetLowering::LowerCallTo(SDValue Chain, const Type *RetTy,
CallOperands.push_back(Callee); CallOperands.push_back(Callee);
// emit the call itself // emit the call itself
if (InFlag.Val) if (InFlag.getNode())
CallOperands.push_back(InFlag); CallOperands.push_back(InFlag);
else else
assert(0 && "this should never happen!\n"); assert(0 && "this should never happen!\n");

8
lib/Target/Mips/MipsISelDAGToDAG.cpp
View File

@ -193,7 +193,7 @@ SelectAddr(SDValue Op, SDValue Addr, SDValue &Offset, SDValue &Base)
SDNode* MipsDAGToDAGISel:: SDNode* MipsDAGToDAGISel::
Select(SDValue N) Select(SDValue N)
{ {
SDNode *Node = N.Val; SDNode *Node = N.getNode();
unsigned Opcode = Node->getOpcode(); unsigned Opcode = Node->getOpcode();
// Dump information about the Node being selected // Dump information about the Node being selected
@ -252,7 +252,7 @@ Select(SDValue N)
SDNode *AddCarry = CurDAG->getTargetNode(Mips::ADDu, VT, SDNode *AddCarry = CurDAG->getTargetNode(Mips::ADDu, VT,
SDValue(Carry,0), RHS); SDValue(Carry,0), RHS);
return CurDAG->SelectNodeTo(N.Val, MOp, VT, MVT::Flag, return CurDAG->SelectNodeTo(N.getNode(), MOp, VT, MVT::Flag,
LHS, SDValue(AddCarry,0)); LHS, SDValue(AddCarry,0));
} }
@ -391,8 +391,8 @@ Select(SDValue N)
#ifndef NDEBUG #ifndef NDEBUG
DOUT << std::string(Indent-2, ' ') << "=> "; DOUT << std::string(Indent-2, ' ') << "=> ";
if (ResNode == NULL || ResNode == N.Val) if (ResNode == NULL || ResNode == N.getNode())
DEBUG(N.Val->dump(CurDAG)); DEBUG(N.getNode()->dump(CurDAG));
else else
DEBUG(ResNode->dump(CurDAG)); DEBUG(ResNode->dump(CurDAG));
DOUT << "\n"; DOUT << "\n";

18
lib/Target/Mips/MipsISelLowering.cpp
View File

@ -602,7 +602,7 @@ LowerCALL(SDValue Op, SelectionDAG &DAG)
MFI->CreateFixedObject(VTsize, (VTsize*3)); MFI->CreateFixedObject(VTsize, (VTsize*3));
} }
CCInfo.AnalyzeCallOperands(Op.Val, CC_Mips); CCInfo.AnalyzeCallOperands(Op.getNode(), CC_Mips);
// Get a count of how many bytes are to be pushed on the stack. // Get a count of how many bytes are to be pushed on the stack.
unsigned NumBytes = CCInfo.getNextStackOffset(); unsigned NumBytes = CCInfo.getNextStackOffset();
@ -706,7 +706,7 @@ LowerCALL(SDValue Op, SelectionDAG &DAG)
Ops.push_back(DAG.getRegister(RegsToPass[i].first, Ops.push_back(DAG.getRegister(RegsToPass[i].first,
RegsToPass[i].second.getValueType())); RegsToPass[i].second.getValueType()));
if (InFlag.Val) if (InFlag.getNode())
Ops.push_back(InFlag); Ops.push_back(InFlag);
Chain = DAG.getNode(MipsISD::JmpLink, NodeTys, &Ops[0], Ops.size()); Chain = DAG.getNode(MipsISD::JmpLink, NodeTys, &Ops[0], Ops.size());
@ -750,7 +750,7 @@ LowerCALL(SDValue Op, SelectionDAG &DAG)
// Handle result values, copying them out of physregs into vregs that we // Handle result values, copying them out of physregs into vregs that we
// return. // return.
return SDValue(LowerCallResult(Chain, InFlag, Op.Val, CC, DAG), Op.getResNo()); return SDValue(LowerCallResult(Chain, InFlag, Op.getNode(), CC, DAG), Op.getResNo());
} }
/// LowerCallResult - Lower the result values of an ISD::CALL into the /// LowerCallResult - Lower the result values of an ISD::CALL into the
@ -783,7 +783,7 @@ LowerCallResult(SDValue Chain, SDValue InFlag, SDNode *TheCall,
// Merge everything together with a MERGE_VALUES node. // Merge everything together with a MERGE_VALUES node.
return DAG.getMergeValues(TheCall->getVTList(), &ResultVals[0], return DAG.getMergeValues(TheCall->getVTList(), &ResultVals[0],
ResultVals.size()).Val; ResultVals.size()).getNode();
} }
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
@ -814,7 +814,7 @@ LowerFORMAL_ARGUMENTS(SDValue Op, SelectionDAG &DAG)
SmallVector<CCValAssign, 16> ArgLocs; SmallVector<CCValAssign, 16> ArgLocs;
CCState CCInfo(CC, isVarArg, getTargetMachine(), ArgLocs); CCState CCInfo(CC, isVarArg, getTargetMachine(), ArgLocs);
CCInfo.AnalyzeFormalArguments(Op.Val, CC_Mips); CCInfo.AnalyzeFormalArguments(Op.getNode(), CC_Mips);
SmallVector<SDValue, 16> ArgValues; SmallVector<SDValue, 16> ArgValues;
SDValue StackPtr; SDValue StackPtr;
@ -865,7 +865,7 @@ LowerFORMAL_ARGUMENTS(SDValue Op, SelectionDAG &DAG)
// To meet ABI, when VARARGS are passed on registers, the registers // To meet ABI, when VARARGS are passed on registers, the registers
// must have their values written to the caller stack frame. // must have their values written to the caller stack frame.
if ((isVarArg) && (Subtarget->isABI_O32())) { if ((isVarArg) && (Subtarget->isABI_O32())) {
if (StackPtr.Val == 0) if (StackPtr.getNode() == 0)
StackPtr = DAG.getRegister(StackReg, getPointerTy()); StackPtr = DAG.getRegister(StackReg, getPointerTy());
// The stack pointer offset is relative to the caller stack frame. // The stack pointer offset is relative to the caller stack frame.
@ -925,7 +925,7 @@ LowerFORMAL_ARGUMENTS(SDValue Op, SelectionDAG &DAG)
ArgValues.push_back(Root); ArgValues.push_back(Root);
// Return the new list of results. // Return the new list of results.
return DAG.getMergeValues(Op.Val->getVTList(), &ArgValues[0], return DAG.getMergeValues(Op.getNode()->getVTList(), &ArgValues[0],
ArgValues.size()).getValue(Op.getResNo()); ArgValues.size()).getValue(Op.getResNo());
} }
@ -946,7 +946,7 @@ LowerRET(SDValue Op, SelectionDAG &DAG)
CCState CCInfo(CC, isVarArg, getTargetMachine(), RVLocs); CCState CCInfo(CC, isVarArg, getTargetMachine(), RVLocs);
// Analize return values of ISD::RET // Analize return values of ISD::RET
CCInfo.AnalyzeReturn(Op.Val, RetCC_Mips); CCInfo.AnalyzeReturn(Op.getNode(), RetCC_Mips);
// If this is the first return lowered for this function, add // If this is the first return lowered for this function, add
// the regs to the liveout set for the function. // the regs to the liveout set for the function.
@ -992,7 +992,7 @@ LowerRET(SDValue Op, SelectionDAG &DAG)
} }
// Return on Mips is always a "jr $ra" // Return on Mips is always a "jr $ra"
if (Flag.Val) if (Flag.getNode())
return DAG.getNode(MipsISD::Ret, MVT::Other, return DAG.getNode(MipsISD::Ret, MVT::Other,
Chain, DAG.getRegister(Mips::RA, MVT::i32), Flag); Chain, DAG.getRegister(Mips::RA, MVT::i32), Flag);
else // Return Void else // Return Void

12
lib/Target/PIC16/PIC16ISelDAGToDAG.cpp
View File

@ -168,11 +168,11 @@ StoreInDirectAM (SDValue Op, SDValue N, SDValue &fsr)
if (LD) { if (LD) {
fsr = LD->getBasePtr(); fsr = LD->getBasePtr();
} }
else if (isa<RegisterSDNode>(N.Val)) { else if (isa<RegisterSDNode>(N.getNode())) {
//FIXME an attempt to retrieve the register number //FIXME an attempt to retrieve the register number
//but does not work //but does not work
DOUT << "this is a register\n"; DOUT << "this is a register\n";
Reg = dyn_cast<RegisterSDNode>(N.Val); Reg = dyn_cast<RegisterSDNode>(N.getNode());
fsr = CurDAG->getRegister(Reg->getReg(),MVT::i16); fsr = CurDAG->getRegister(Reg->getReg(),MVT::i16);
} }
else { else {
@ -198,7 +198,7 @@ LoadFSR (SDValue Op, SDValue N, SDValue &Base, SDValue &Offset)
return true; return true;
} }
else if (N.getOpcode() == PIC16ISD::Package) { else if (N.getOpcode() == PIC16ISD::Package) {
CurDAG->setGraphColor(Op.Val, "blue"); CurDAG->setGraphColor(Op.getNode(), "blue");
CurDAG->viewGraph(); CurDAG->viewGraph();
} }
@ -227,7 +227,7 @@ LoadNothing (SDValue Op, SDValue N, SDValue &Base, SDValue &Offset)
/// expanded, promoted and normal instructions. /// expanded, promoted and normal instructions.
SDNode* PIC16DAGToDAGISel::Select(SDValue N) SDNode* PIC16DAGToDAGISel::Select(SDValue N)
{ {
SDNode *Node = N.Val; SDNode *Node = N.getNode();
unsigned Opcode = Node->getOpcode(); unsigned Opcode = Node->getOpcode();
// Dump information about the Node being selected // Dump information about the Node being selected
@ -262,8 +262,8 @@ SDNode* PIC16DAGToDAGISel::Select(SDValue N)
#ifndef NDEBUG #ifndef NDEBUG
DOUT << std::string(Indent-2, ' ') << "=> "; DOUT << std::string(Indent-2, ' ') << "=> ";
if (ResNode == NULL || ResNode == N.Val) if (ResNode == NULL || ResNode == N.getNode())
DEBUG(N.Val->dump(CurDAG)); DEBUG(N.getNode()->dump(CurDAG));
else else
DEBUG(ResNode->dump(CurDAG)); DEBUG(ResNode->dump(CurDAG));
DOUT << "\n"; DOUT << "\n";

16
lib/Target/PIC16/PIC16ISelLowering.cpp
View File

@ -334,7 +334,7 @@ PIC16TargetLowering::LowerLOAD(SDNode *N,
LoadSDNode *LD = cast<LoadSDNode>(N); LoadSDNode *LD = cast<LoadSDNode>(N);
SDValue Ptr = LD->getBasePtr(); SDValue Ptr = LD->getBasePtr();
if (LD->getExtensionType() == ISD::NON_EXTLOAD) { if (LD->getExtensionType() == ISD::NON_EXTLOAD) {
if (ISD::isNON_TRUNCStore(Chain.Val)) { if (ISD::isNON_TRUNCStore(Chain.getNode())) {
StoreSDNode *PrevST = cast<StoreSDNode>(Chain); StoreSDNode *PrevST = cast<StoreSDNode>(Chain);
if (PrevST->getBasePtr() == Ptr && if (PrevST->getBasePtr() == Ptr &&
PrevST->getValue().getValueType() == N->getValueType(0)) PrevST->getValue().getValueType() == N->getValueType(0))
@ -352,7 +352,7 @@ PIC16TargetLowering::LowerLOAD(SDNode *N,
Outs[1] = DAG.getLoad(MVT::i8, Chain, toWorklist, NULL, 0); Outs[1] = DAG.getLoad(MVT::i8, Chain, toWorklist, NULL, 0);
// FIXME: Add to worklist may not be needed. // FIXME: Add to worklist may not be needed.
// It is meant to merge sequences of add with constant into one. // It is meant to merge sequences of add with constant into one.
DCI.AddToWorklist(toWorklist.Val); DCI.AddToWorklist(toWorklist.getNode());
// Create the tokenfactors and carry it on to the build_pair node // Create the tokenfactors and carry it on to the build_pair node
OutChains[0] = Outs[0].getValue(1); OutChains[0] = Outs[0].getValue(1);
@ -443,7 +443,7 @@ PIC16TargetLowering::LowerADDSUB(SDNode *N, SelectionDAG &DAG,
changed = true; changed = true;
// LowerLOAD returns a Package node or it may combine and return // LowerLOAD returns a Package node or it may combine and return
// anything else. // anything else.
SDValue lowered = LowerLOAD(InOp[i].Val, DAG, DCI); SDValue lowered = LowerLOAD(InOp[i].getNode(), DAG, DCI);
// So If LowerLOAD returns something other than Package, // So If LowerLOAD returns something other than Package,
// then just call ADD again. // then just call ADD again.
@ -462,7 +462,7 @@ PIC16TargetLowering::LowerADDSUB(SDNode *N, SelectionDAG &DAG,
changed = true; changed = true;
// Must call LowerADDSUB recursively here, // Must call LowerADDSUB recursively here,
// LowerADDSUB returns a Package node. // LowerADDSUB returns a Package node.
SDValue lowered = LowerADDSUB(InOp[i].Val, DAG, DCI); SDValue lowered = LowerADDSUB(InOp[i].getNode(), DAG, DCI);
LoOps[i] = lowered.getOperand(0); LoOps[i] = lowered.getOperand(0);
HiOps[i] = lowered.getOperand(1); HiOps[i] = lowered.getOperand(1);
@ -543,7 +543,7 @@ LowerFORMAL_ARGUMENTS(SDValue Op, SelectionDAG &DAG)
// FIXME: Just copy right now. // FIXME: Just copy right now.
ArgValues.push_back(Root); ArgValues.push_back(Root);
return DAG.getMergeValues(Op.Val->getVTList(), &ArgValues[0], return DAG.getMergeValues(Op.getNode()->getVTList(), &ArgValues[0],
ArgValues.size()).getValue(Op.getResNo()); ArgValues.size()).getValue(Op.getResNo());
} }
@ -622,7 +622,7 @@ SDValue PIC16TargetLowering::PerformDAGCombine(SDNode *N,
if ((Src.getOpcode() == ISD::ANY_EXTEND) || if ((Src.getOpcode() == ISD::ANY_EXTEND) ||
(Src.getOpcode() == ISD::SIGN_EXTEND) || (Src.getOpcode() == ISD::SIGN_EXTEND) ||
(Src.getOpcode() == ISD::ZERO_EXTEND)) { (Src.getOpcode() == ISD::ZERO_EXTEND)) {
Src = Src.Val->getOperand(0); Src = Src.getNode()->getOperand(0);
Stores[0] = DAG.getStore(Chain, Src, Dest, NULL,0); Stores[0] = DAG.getStore(Chain, Src, Dest, NULL,0);
return Stores[0]; return Stores[0];
} }
@ -721,10 +721,10 @@ SDValue PIC16TargetLowering::PerformDAGCombine(SDNode *N,
// We want to merge sequence of add with constant to one add and a // We want to merge sequence of add with constant to one add and a
// constant, so add the ADD node to worklist to have llvm do that // constant, so add the ADD node to worklist to have llvm do that
// automatically. // automatically.
DCI.AddToWorklist(toWorkList.Val); DCI.AddToWorklist(toWorkList.getNode());
// We don't need the Package so add to worklist so llvm deletes it // We don't need the Package so add to worklist so llvm deletes it
DCI.AddToWorklist(Src.Val); DCI.AddToWorklist(Src.getNode());
retVal = DAG.getNode(ISD::TokenFactor, MVT::Other, &Stores[0], 2); retVal = DAG.getNode(ISD::TokenFactor, MVT::Other, &Stores[0], 2);
} }

24
lib/Target/PowerPC/PPCISelDAGToDAG.cpp
View File

@ -294,7 +294,7 @@ SDNode *PPCDAGToDAGISel::getGlobalBaseReg() {
BuildMI(FirstMBB, MBBI, TII.get(PPC::MFLR8), GlobalBaseReg); BuildMI(FirstMBB, MBBI, TII.get(PPC::MFLR8), GlobalBaseReg);
} }
} }
return CurDAG->getRegister(GlobalBaseReg, PPCLowering.getPointerTy()).Val; return CurDAG->getRegister(GlobalBaseReg, PPCLowering.getPointerTy()).getNode();
} }
/// isIntS16Immediate - This method tests to see if the node is either a 32-bit /// isIntS16Immediate - This method tests to see if the node is either a 32-bit
@ -313,7 +313,7 @@ static bool isIntS16Immediate(SDNode *N, short &Imm) {
} }
static bool isIntS16Immediate(SDValue Op, short &Imm) { static bool isIntS16Immediate(SDValue Op, short &Imm) {
return isIntS16Immediate(Op.Val, Imm); return isIntS16Immediate(Op.getNode(), Imm);
} }
@ -340,7 +340,7 @@ static bool isInt64Immediate(SDNode *N, uint64_t &Imm) {
// isInt32Immediate - This method tests to see if a constant operand. // isInt32Immediate - This method tests to see if a constant operand.
// If so Imm will receive the 32 bit value. // If so Imm will receive the 32 bit value.
static bool isInt32Immediate(SDValue N, unsigned &Imm) { static bool isInt32Immediate(SDValue N, unsigned &Imm) {
return isInt32Immediate(N.Val, Imm); return isInt32Immediate(N.getNode(), Imm);
} }
@ -348,7 +348,7 @@ static bool isInt32Immediate(SDValue N, unsigned &Imm) {
// opcode and that it has a immediate integer right operand. // opcode and that it has a immediate integer right operand.
// If so Imm will receive the 32 bit value. // If so Imm will receive the 32 bit value.
static bool isOpcWithIntImmediate(SDNode *N, unsigned Opc, unsigned& Imm) { static bool isOpcWithIntImmediate(SDNode *N, unsigned Opc, unsigned& Imm) {
return N->getOpcode() == Opc && isInt32Immediate(N->getOperand(1).Val, Imm); return N->getOpcode() == Opc && isInt32Immediate(N->getOperand(1).getNode(), Imm);
} }
bool PPCDAGToDAGISel::isRunOfOnes(unsigned Val, unsigned &MB, unsigned &ME) { bool PPCDAGToDAGISel::isRunOfOnes(unsigned Val, unsigned &MB, unsigned &ME) {
@ -384,7 +384,7 @@ bool PPCDAGToDAGISel::isRotateAndMask(SDNode *N, unsigned Mask,
unsigned Indeterminant = ~0; // bit mask marking indeterminant results unsigned Indeterminant = ~0; // bit mask marking indeterminant results
unsigned Opcode = N->getOpcode(); unsigned Opcode = N->getOpcode();
if (N->getNumOperands() != 2 || if (N->getNumOperands() != 2 ||
!isInt32Immediate(N->getOperand(1).Val, Shift) || (Shift > 31)) !isInt32Immediate(N->getOperand(1).getNode(), Shift) || (Shift > 31))
return false; return false;
if (Opcode == ISD::SHL) { if (Opcode == ISD::SHL) {
@ -540,7 +540,7 @@ SDValue PPCDAGToDAGISel::SelectCC(SDValue LHS, SDValue RHS,
} else if (LHS.getValueType() == MVT::i64) { } else if (LHS.getValueType() == MVT::i64) {
uint64_t Imm; uint64_t Imm;
if (CC == ISD::SETEQ || CC == ISD::SETNE) { if (CC == ISD::SETEQ || CC == ISD::SETNE) {
if (isInt64Immediate(RHS.Val, Imm)) { if (isInt64Immediate(RHS.getNode(), Imm)) {
// SETEQ/SETNE comparison with 16-bit immediate, fold it. // SETEQ/SETNE comparison with 16-bit immediate, fold it.
if (isUInt16(Imm)) if (isUInt16(Imm))
return SDValue(CurDAG->getTargetNode(PPC::CMPLDI, MVT::i64, LHS, return SDValue(CurDAG->getTargetNode(PPC::CMPLDI, MVT::i64, LHS,
@ -568,7 +568,7 @@ SDValue PPCDAGToDAGISel::SelectCC(SDValue LHS, SDValue RHS,
} }
Opc = PPC::CMPLD; Opc = PPC::CMPLD;
} else if (ISD::isUnsignedIntSetCC(CC)) { } else if (ISD::isUnsignedIntSetCC(CC)) {
if (isInt64Immediate(RHS.Val, Imm) && isUInt16(Imm)) if (isInt64Immediate(RHS.getNode(), Imm) && isUInt16(Imm))
return SDValue(CurDAG->getTargetNode(PPC::CMPLDI, MVT::i64, LHS, return SDValue(CurDAG->getTargetNode(PPC::CMPLDI, MVT::i64, LHS,
getI64Imm(Imm & 0xFFFF)), 0); getI64Imm(Imm & 0xFFFF)), 0);
Opc = PPC::CMPLD; Opc = PPC::CMPLD;
@ -653,7 +653,7 @@ static unsigned getCRIdxForSetCC(ISD::CondCode CC, bool &Invert, int &Other) {
} }
SDNode *PPCDAGToDAGISel::SelectSETCC(SDValue Op) { SDNode *PPCDAGToDAGISel::SelectSETCC(SDValue Op) {
SDNode *N = Op.Val; SDNode *N = Op.getNode();
unsigned Imm; unsigned Imm;
ISD::CondCode CC = cast<CondCodeSDNode>(N->getOperand(2))->get(); ISD::CondCode CC = cast<CondCodeSDNode>(N->getOperand(2))->get();
if (isInt32Immediate(N->getOperand(1), Imm)) { if (isInt32Immediate(N->getOperand(1), Imm)) {
@ -773,7 +773,7 @@ SDNode *PPCDAGToDAGISel::SelectSETCC(SDValue Op) {
// Select - Convert the specified operand from a target-independent to a // Select - Convert the specified operand from a target-independent to a
// target-specific node if it hasn't already been changed. // target-specific node if it hasn't already been changed.
SDNode *PPCDAGToDAGISel::Select(SDValue Op) { SDNode *PPCDAGToDAGISel::Select(SDValue Op) {
SDNode *N = Op.Val; SDNode *N = Op.getNode();
if (N->isMachineOpcode()) if (N->isMachineOpcode())
return NULL; // Already selected. return NULL; // Already selected.
@ -974,7 +974,7 @@ SDNode *PPCDAGToDAGISel::Select(SDValue Op) {
// If this is an and of a value rotated between 0 and 31 bits and then and'd // If this is an and of a value rotated between 0 and 31 bits and then and'd
// with a mask, emit rlwinm // with a mask, emit rlwinm
if (isInt32Immediate(N->getOperand(1), Imm) && if (isInt32Immediate(N->getOperand(1), Imm) &&
isRotateAndMask(N->getOperand(0).Val, Imm, false, SH, MB, ME)) { isRotateAndMask(N->getOperand(0).getNode(), Imm, false, SH, MB, ME)) {
SDValue Val = N->getOperand(0).getOperand(0); SDValue Val = N->getOperand(0).getOperand(0);
AddToISelQueue(Val); AddToISelQueue(Val);
SDValue Ops[] = { Val, getI32Imm(SH), getI32Imm(MB), getI32Imm(ME) }; SDValue Ops[] = { Val, getI32Imm(SH), getI32Imm(MB), getI32Imm(ME) };
@ -1025,7 +1025,7 @@ SDNode *PPCDAGToDAGISel::Select(SDValue Op) {
break; break;
case ISD::SHL: { case ISD::SHL: {
unsigned Imm, SH, MB, ME; unsigned Imm, SH, MB, ME;
if (isOpcWithIntImmediate(N->getOperand(0).Val, ISD::AND, Imm) && if (isOpcWithIntImmediate(N->getOperand(0).getNode(), ISD::AND, Imm) &&
isRotateAndMask(N, Imm, true, SH, MB, ME)) { isRotateAndMask(N, Imm, true, SH, MB, ME)) {
AddToISelQueue(N->getOperand(0).getOperand(0)); AddToISelQueue(N->getOperand(0).getOperand(0));
SDValue Ops[] = { N->getOperand(0).getOperand(0), SDValue Ops[] = { N->getOperand(0).getOperand(0),
@ -1038,7 +1038,7 @@ SDNode *PPCDAGToDAGISel::Select(SDValue Op) {
} }
case ISD::SRL: { case ISD::SRL: {
unsigned Imm, SH, MB, ME; unsigned Imm, SH, MB, ME;
if (isOpcWithIntImmediate(N->getOperand(0).Val, ISD::AND, Imm) && if (isOpcWithIntImmediate(N->getOperand(0).getNode(), ISD::AND, Imm) &&
isRotateAndMask(N, Imm, true, SH, MB, ME)) { isRotateAndMask(N, Imm, true, SH, MB, ME)) {
AddToISelQueue(N->getOperand(0).getOperand(0)); AddToISelQueue(N->getOperand(0).getOperand(0));
SDValue Ops[] = { N->getOperand(0).getOperand(0), SDValue Ops[] = { N->getOperand(0).getOperand(0),

144
lib/Target/PowerPC/PPCISelLowering.cpp
View File

@ -423,7 +423,7 @@ MVT PPCTargetLowering::getSetCCResultType(const SDValue &) const {
static bool isFloatingPointZero(SDValue Op) { static bool isFloatingPointZero(SDValue Op) {
if (ConstantFPSDNode *CFP = dyn_cast<ConstantFPSDNode>(Op)) if (ConstantFPSDNode *CFP = dyn_cast<ConstantFPSDNode>(Op))
return CFP->getValueAPF().isZero(); return CFP->getValueAPF().isZero();
else if (ISD::isEXTLoad(Op.Val) || ISD::isNON_EXTLoad(Op.Val)) { else if (ISD::isEXTLoad(Op.getNode()) || ISD::isNON_EXTLoad(Op.getNode())) {
// Maybe this has already been legalized into the constant pool? // Maybe this has already been legalized into the constant pool?
if (ConstantPoolSDNode *CP = dyn_cast<ConstantPoolSDNode>(Op.getOperand(1))) if (ConstantPoolSDNode *CP = dyn_cast<ConstantPoolSDNode>(Op.getOperand(1)))
if (ConstantFP *CFP = dyn_cast<ConstantFP>(CP->getConstVal())) if (ConstantFP *CFP = dyn_cast<ConstantFP>(CP->getConstVal()))
@ -625,7 +625,7 @@ SDValue PPC::get_VSPLTI_elt(SDNode *N, unsigned ByteSize, SelectionDAG &DAG) {
if (!isa<ConstantSDNode>(N->getOperand(i))) return SDValue(); if (!isa<ConstantSDNode>(N->getOperand(i))) return SDValue();
if (UniquedVals[i&(Multiple-1)].Val == 0) if (UniquedVals[i&(Multiple-1)].getNode() == 0)
UniquedVals[i&(Multiple-1)] = N->getOperand(i); UniquedVals[i&(Multiple-1)] = N->getOperand(i);
else if (UniquedVals[i&(Multiple-1)] != N->getOperand(i)) else if (UniquedVals[i&(Multiple-1)] != N->getOperand(i))
return SDValue(); // no match. return SDValue(); // no match.
@ -640,21 +640,21 @@ SDValue PPC::get_VSPLTI_elt(SDNode *N, unsigned ByteSize, SelectionDAG &DAG) {
bool LeadingZero = true; bool LeadingZero = true;
bool LeadingOnes = true; bool LeadingOnes = true;
for (unsigned i = 0; i != Multiple-1; ++i) { for (unsigned i = 0; i != Multiple-1; ++i) {
if (UniquedVals[i].Val == 0) continue; // Must have been undefs. if (UniquedVals[i].getNode() == 0) continue; // Must have been undefs.
LeadingZero &= cast<ConstantSDNode>(UniquedVals[i])->isNullValue(); LeadingZero &= cast<ConstantSDNode>(UniquedVals[i])->isNullValue();
LeadingOnes &= cast<ConstantSDNode>(UniquedVals[i])->isAllOnesValue(); LeadingOnes &= cast<ConstantSDNode>(UniquedVals[i])->isAllOnesValue();
} }
// Finally, check the least significant entry. // Finally, check the least significant entry.
if (LeadingZero) { if (LeadingZero) {
if (UniquedVals[Multiple-1].Val == 0) if (UniquedVals[Multiple-1].getNode() == 0)
return DAG.getTargetConstant(0, MVT::i32); // 0,0,0,undef return DAG.getTargetConstant(0, MVT::i32); // 0,0,0,undef
int Val = cast<ConstantSDNode>(UniquedVals[Multiple-1])->getValue(); int Val = cast<ConstantSDNode>(UniquedVals[Multiple-1])->getValue();
if (Val < 16) if (Val < 16)
return DAG.getTargetConstant(Val, MVT::i32); // 0,0,0,4 -> vspltisw(4) return DAG.getTargetConstant(Val, MVT::i32); // 0,0,0,4 -> vspltisw(4)
} }
if (LeadingOnes) { if (LeadingOnes) {
if (UniquedVals[Multiple-1].Val == 0) if (UniquedVals[Multiple-1].getNode() == 0)
return DAG.getTargetConstant(~0U, MVT::i32); // -1,-1,-1,undef return DAG.getTargetConstant(~0U, MVT::i32); // -1,-1,-1,undef
int Val =cast<ConstantSDNode>(UniquedVals[Multiple-1])->getSignExtended(); int Val =cast<ConstantSDNode>(UniquedVals[Multiple-1])->getSignExtended();
if (Val >= -16) // -1,-1,-1,-2 -> vspltisw(-2) if (Val >= -16) // -1,-1,-1,-2 -> vspltisw(-2)
@ -667,13 +667,13 @@ SDValue PPC::get_VSPLTI_elt(SDNode *N, unsigned ByteSize, SelectionDAG &DAG) {
// Check to see if this buildvec has a single non-undef value in its elements. // Check to see if this buildvec has a single non-undef value in its elements.
for (unsigned i = 0, e = N->getNumOperands(); i != e; ++i) { for (unsigned i = 0, e = N->getNumOperands(); i != e; ++i) {
if (N->getOperand(i).getOpcode() == ISD::UNDEF) continue; if (N->getOperand(i).getOpcode() == ISD::UNDEF) continue;
if (OpVal.Val == 0) if (OpVal.getNode() == 0)
OpVal = N->getOperand(i); OpVal = N->getOperand(i);
else if (OpVal != N->getOperand(i)) else if (OpVal != N->getOperand(i))
return SDValue(); return SDValue();
} }
if (OpVal.Val == 0) return SDValue(); // All UNDEF: use implicit def. if (OpVal.getNode() == 0) return SDValue(); // All UNDEF: use implicit def.
unsigned ValSizeInBytes = 0; unsigned ValSizeInBytes = 0;
uint64_t Value = 0; uint64_t Value = 0;
@ -735,7 +735,7 @@ static bool isIntS16Immediate(SDNode *N, short &Imm) {
return Imm == (int64_t)cast<ConstantSDNode>(N)->getValue(); return Imm == (int64_t)cast<ConstantSDNode>(N)->getValue();
} }
static bool isIntS16Immediate(SDValue Op, short &Imm) { static bool isIntS16Immediate(SDValue Op, short &Imm) {
return isIntS16Immediate(Op.Val, Imm); return isIntS16Immediate(Op.getNode(), Imm);
} }
@ -1389,7 +1389,7 @@ PPCTargetLowering::LowerFORMAL_ARGUMENTS(SDValue Op,
// to handle Elf here. // to handle Elf here.
unsigned VecArgOffset = ArgOffset; unsigned VecArgOffset = ArgOffset;
if (!isVarArg && !isPPC64) { if (!isVarArg && !isPPC64) {
for (unsigned ArgNo = 0, e = Op.Val->getNumValues()-1; ArgNo != e; for (unsigned ArgNo = 0, e = Op.getNode()->getNumValues()-1; ArgNo != e;
++ArgNo) { ++ArgNo) {
MVT ObjectVT = Op.getValue(ArgNo).getValueType(); MVT ObjectVT = Op.getValue(ArgNo).getValueType();
unsigned ObjSize = ObjectVT.getSizeInBits()/8; unsigned ObjSize = ObjectVT.getSizeInBits()/8;
@ -1439,7 +1439,7 @@ PPCTargetLowering::LowerFORMAL_ARGUMENTS(SDValue Op,
SmallVector<SDValue, 8> MemOps; SmallVector<SDValue, 8> MemOps;
unsigned nAltivecParamsAtEnd = 0; unsigned nAltivecParamsAtEnd = 0;
for (unsigned ArgNo = 0, e = Op.Val->getNumValues()-1; ArgNo != e; ++ArgNo) { for (unsigned ArgNo = 0, e = Op.getNode()->getNumValues()-1; ArgNo != e; ++ArgNo) {
SDValue ArgVal; SDValue ArgVal;
bool needsLoad = false; bool needsLoad = false;
MVT ObjectVT = Op.getValue(ArgNo).getValueType(); MVT ObjectVT = Op.getValue(ArgNo).getValueType();
@ -1765,7 +1765,7 @@ PPCTargetLowering::LowerFORMAL_ARGUMENTS(SDValue Op,
ArgValues.push_back(Root); ArgValues.push_back(Root);
// Return the new list of results. // Return the new list of results.
return DAG.getMergeValues(Op.Val->getVTList(), &ArgValues[0], return DAG.getMergeValues(Op.getNode()->getVTList(), &ArgValues[0],
ArgValues.size()); ArgValues.size());
} }
@ -1906,7 +1906,7 @@ static SDNode *isBLACompatibleAddress(SDValue Op, SelectionDAG &DAG) {
return 0; // Top 6 bits have to be sext of immediate. return 0; // Top 6 bits have to be sext of immediate.
return DAG.getConstant((int)C->getValue() >> 2, return DAG.getConstant((int)C->getValue() >> 2,
DAG.getTargetLoweringInfo().getPointerTy()).Val; DAG.getTargetLoweringInfo().getPointerTy()).getNode();
} }
namespace { namespace {
@ -2001,10 +2001,10 @@ SDValue PPCTargetLowering::EmitTailCallLoadFPAndRetAddr(SelectionDAG & DAG,
MVT VT = PPCSubTarget.isPPC64() ? MVT::i64 : MVT::i32; MVT VT = PPCSubTarget.isPPC64() ? MVT::i64 : MVT::i32;
LROpOut = getReturnAddrFrameIndex(DAG); LROpOut = getReturnAddrFrameIndex(DAG);
LROpOut = DAG.getLoad(VT, Chain, LROpOut, NULL, 0); LROpOut = DAG.getLoad(VT, Chain, LROpOut, NULL, 0);
Chain = SDValue(LROpOut.Val, 1); Chain = SDValue(LROpOut.getNode(), 1);
FPOpOut = getFramePointerFrameIndex(DAG); FPOpOut = getFramePointerFrameIndex(DAG);
FPOpOut = DAG.getLoad(VT, Chain, FPOpOut, NULL, 0); FPOpOut = DAG.getLoad(VT, Chain, FPOpOut, NULL, 0);
Chain = SDValue(FPOpOut.Val, 1); Chain = SDValue(FPOpOut.getNode(), 1);
} }
return Chain; return Chain;
} }
@ -2193,12 +2193,12 @@ SDValue PPCTargetLowering::LowerCALL(SDValue Op, SelectionDAG &DAG,
SDValue Const = DAG.getConstant(4 - Size, PtrOff.getValueType()); SDValue Const = DAG.getConstant(4 - Size, PtrOff.getValueType());
SDValue AddPtr = DAG.getNode(ISD::ADD, PtrVT, PtrOff, Const); SDValue AddPtr = DAG.getNode(ISD::ADD, PtrVT, PtrOff, Const);
SDValue MemcpyCall = CreateCopyOfByValArgument(Arg, AddPtr, SDValue MemcpyCall = CreateCopyOfByValArgument(Arg, AddPtr,
CallSeqStart.Val->getOperand(0), CallSeqStart.getNode()->getOperand(0),
Flags, DAG, Size); Flags, DAG, Size);
// This must go outside the CALLSEQ_START..END. // This must go outside the CALLSEQ_START..END.
SDValue NewCallSeqStart = DAG.getCALLSEQ_START(MemcpyCall, SDValue NewCallSeqStart = DAG.getCALLSEQ_START(MemcpyCall,
CallSeqStart.Val->getOperand(1)); CallSeqStart.getNode()->getOperand(1));
DAG.ReplaceAllUsesWith(CallSeqStart.Val, NewCallSeqStart.Val); DAG.ReplaceAllUsesWith(CallSeqStart.getNode(), NewCallSeqStart.getNode());
Chain = CallSeqStart = NewCallSeqStart; Chain = CallSeqStart = NewCallSeqStart;
ArgOffset += PtrByteSize; ArgOffset += PtrByteSize;
} }
@ -2208,12 +2208,12 @@ SDValue PPCTargetLowering::LowerCALL(SDValue Op, SelectionDAG &DAG,
// code assumes it is there, even if it could be put entirely into // code assumes it is there, even if it could be put entirely into
// registers. (This is not what the doc says.) // registers. (This is not what the doc says.)
SDValue MemcpyCall = CreateCopyOfByValArgument(Arg, PtrOff, SDValue MemcpyCall = CreateCopyOfByValArgument(Arg, PtrOff,
CallSeqStart.Val->getOperand(0), CallSeqStart.getNode()->getOperand(0),
Flags, DAG, Size); Flags, DAG, Size);
// This must go outside the CALLSEQ_START..END. // This must go outside the CALLSEQ_START..END.
SDValue NewCallSeqStart = DAG.getCALLSEQ_START(MemcpyCall, SDValue NewCallSeqStart = DAG.getCALLSEQ_START(MemcpyCall,
CallSeqStart.Val->getOperand(1)); CallSeqStart.getNode()->getOperand(1));
DAG.ReplaceAllUsesWith(CallSeqStart.Val, NewCallSeqStart.Val); DAG.ReplaceAllUsesWith(CallSeqStart.getNode(), NewCallSeqStart.getNode());
Chain = CallSeqStart = NewCallSeqStart; Chain = CallSeqStart = NewCallSeqStart;
// And copy the pieces of it that fit into registers. // And copy the pieces of it that fit into registers.
for (unsigned j=0; j<Size; j+=PtrByteSize) { for (unsigned j=0; j<Size; j+=PtrByteSize) {
@ -2432,7 +2432,7 @@ SDValue PPCTargetLowering::LowerCALL(SDValue Op, SelectionDAG &DAG,
CallSeqOps.push_back(Chain); CallSeqOps.push_back(Chain);
CallSeqOps.push_back(DAG.getIntPtrConstant(NumBytes)); CallSeqOps.push_back(DAG.getIntPtrConstant(NumBytes));
CallSeqOps.push_back(DAG.getIntPtrConstant(0)); CallSeqOps.push_back(DAG.getIntPtrConstant(0));
if (InFlag.Val) if (InFlag.getNode())
CallSeqOps.push_back(InFlag); CallSeqOps.push_back(InFlag);
Chain = DAG.getNode(ISD::CALLSEQ_END, CallSeqNodeTys, &CallSeqOps[0], Chain = DAG.getNode(ISD::CALLSEQ_END, CallSeqNodeTys, &CallSeqOps[0],
CallSeqOps.size()); CallSeqOps.size());
@ -2460,7 +2460,7 @@ SDValue PPCTargetLowering::LowerCALL(SDValue Op, SelectionDAG &DAG,
// Otherwise, this is an indirect call. We have to use a MTCTR/BCTRL pair // Otherwise, this is an indirect call. We have to use a MTCTR/BCTRL pair
// to do the call, we can't use PPCISD::CALL. // to do the call, we can't use PPCISD::CALL.
SDValue MTCTROps[] = {Chain, Callee, InFlag}; SDValue MTCTROps[] = {Chain, Callee, InFlag};
Chain = DAG.getNode(PPCISD::MTCTR, NodeTys, MTCTROps, 2+(InFlag.Val!=0)); Chain = DAG.getNode(PPCISD::MTCTR, NodeTys, MTCTROps, 2+(InFlag.getNode()!=0));
InFlag = Chain.getValue(1); InFlag = Chain.getValue(1);
// Copy the callee address into R12/X12 on darwin. // Copy the callee address into R12/X12 on darwin.
@ -2475,14 +2475,14 @@ SDValue PPCTargetLowering::LowerCALL(SDValue Op, SelectionDAG &DAG,
NodeTys.push_back(MVT::Flag); NodeTys.push_back(MVT::Flag);
Ops.push_back(Chain); Ops.push_back(Chain);
CallOpc = isMachoABI ? PPCISD::BCTRL_Macho : PPCISD::BCTRL_ELF; CallOpc = isMachoABI ? PPCISD::BCTRL_Macho : PPCISD::BCTRL_ELF;
Callee.Val = 0; Callee.setNode(0);
// Add CTR register as callee so a bctr can be emitted later. // Add CTR register as callee so a bctr can be emitted later.
if (isTailCall) if (isTailCall)
Ops.push_back(DAG.getRegister(PPC::CTR, getPointerTy())); Ops.push_back(DAG.getRegister(PPC::CTR, getPointerTy()));
} }
// If this is a direct call, pass the chain and the callee. // If this is a direct call, pass the chain and the callee.
if (Callee.Val) { if (Callee.getNode()) {
Ops.push_back(Chain); Ops.push_back(Chain);
Ops.push_back(Callee); Ops.push_back(Callee);
} }
@ -2502,16 +2502,16 @@ SDValue PPCTargetLowering::LowerCALL(SDValue Op, SelectionDAG &DAG,
int BytesCalleePops = int BytesCalleePops =
(CC==CallingConv::Fast && PerformTailCallOpt) ? NumBytes : 0; (CC==CallingConv::Fast && PerformTailCallOpt) ? NumBytes : 0;
if (InFlag.Val) if (InFlag.getNode())
Ops.push_back(InFlag); Ops.push_back(InFlag);
// Emit tail call. // Emit tail call.
if (isTailCall) { if (isTailCall) {
assert(InFlag.Val && assert(InFlag.getNode() &&
"Flag must be set. Depend on flag being set in LowerRET"); "Flag must be set. Depend on flag being set in LowerRET");
Chain = DAG.getNode(PPCISD::TAILCALL, Chain = DAG.getNode(PPCISD::TAILCALL,
Op.Val->getVTList(), &Ops[0], Ops.size()); Op.getNode()->getVTList(), &Ops[0], Ops.size());
return SDValue(Chain.Val, Op.getResNo()); return SDValue(Chain.getNode(), Op.getResNo());
} }
Chain = DAG.getNode(CallOpc, NodeTys, &Ops[0], Ops.size()); Chain = DAG.getNode(CallOpc, NodeTys, &Ops[0], Ops.size());
@ -2521,14 +2521,14 @@ SDValue PPCTargetLowering::LowerCALL(SDValue Op, SelectionDAG &DAG,
DAG.getConstant(NumBytes, PtrVT), DAG.getConstant(NumBytes, PtrVT),
DAG.getConstant(BytesCalleePops, PtrVT), DAG.getConstant(BytesCalleePops, PtrVT),
InFlag); InFlag);
if (Op.Val->getValueType(0) != MVT::Other) if (Op.getNode()->getValueType(0) != MVT::Other)
InFlag = Chain.getValue(1); InFlag = Chain.getValue(1);
SmallVector<SDValue, 16> ResultVals; SmallVector<SDValue, 16> ResultVals;
SmallVector<CCValAssign, 16> RVLocs; SmallVector<CCValAssign, 16> RVLocs;
unsigned CallerCC = DAG.getMachineFunction().getFunction()->getCallingConv(); unsigned CallerCC = DAG.getMachineFunction().getFunction()->getCallingConv();
CCState CCInfo(CallerCC, isVarArg, TM, RVLocs); CCState CCInfo(CallerCC, isVarArg, TM, RVLocs);
CCInfo.AnalyzeCallResult(Op.Val, RetCC_PPC); CCInfo.AnalyzeCallResult(Op.getNode(), RetCC_PPC);
// Copy all of the result registers out of their specified physreg. // Copy all of the result registers out of their specified physreg.
for (unsigned i = 0, e = RVLocs.size(); i != e; ++i) { for (unsigned i = 0, e = RVLocs.size(); i != e; ++i) {
@ -2546,7 +2546,7 @@ SDValue PPCTargetLowering::LowerCALL(SDValue Op, SelectionDAG &DAG,
// Otherwise, merge everything together with a MERGE_VALUES node. // Otherwise, merge everything together with a MERGE_VALUES node.
ResultVals.push_back(Chain); ResultVals.push_back(Chain);
SDValue Res = DAG.getMergeValues(Op.Val->getVTList(), &ResultVals[0], SDValue Res = DAG.getMergeValues(Op.getNode()->getVTList(), &ResultVals[0],
ResultVals.size()); ResultVals.size());
return Res.getValue(Op.getResNo()); return Res.getValue(Op.getResNo());
} }
@ -2557,7 +2557,7 @@ SDValue PPCTargetLowering::LowerRET(SDValue Op, SelectionDAG &DAG,
unsigned CC = DAG.getMachineFunction().getFunction()->getCallingConv(); unsigned CC = DAG.getMachineFunction().getFunction()->getCallingConv();
bool isVarArg = DAG.getMachineFunction().getFunction()->isVarArg(); bool isVarArg = DAG.getMachineFunction().getFunction()->isVarArg();
CCState CCInfo(CC, isVarArg, TM, RVLocs); CCState CCInfo(CC, isVarArg, TM, RVLocs);
CCInfo.AnalyzeReturn(Op.Val, RetCC_PPC); CCInfo.AnalyzeReturn(Op.getNode(), RetCC_PPC);
// If this is the first return lowered for this function, add the regs to the // If this is the first return lowered for this function, add the regs to the
// liveout set for the function. // liveout set for the function.
@ -2607,7 +2607,7 @@ SDValue PPCTargetLowering::LowerRET(SDValue Op, SelectionDAG &DAG,
Flag = Chain.getValue(1); Flag = Chain.getValue(1);
} }
if (Flag.Val) if (Flag.getNode())
return DAG.getNode(PPCISD::RET_FLAG, MVT::Other, Chain, Flag); return DAG.getNode(PPCISD::RET_FLAG, MVT::Other, Chain, Flag);
else else
return DAG.getNode(PPCISD::RET_FLAG, MVT::Other, Chain); return DAG.getNode(PPCISD::RET_FLAG, MVT::Other, Chain);
@ -2818,11 +2818,11 @@ SDValue PPCTargetLowering::LowerFP_TO_SINT(SDValue Op, SelectionDAG &DAG) {
SDValue PPCTargetLowering::LowerFP_ROUND_INREG(SDValue Op, SDValue PPCTargetLowering::LowerFP_ROUND_INREG(SDValue Op,
SelectionDAG &DAG) { SelectionDAG &DAG) {
assert(Op.getValueType() == MVT::ppcf128); assert(Op.getValueType() == MVT::ppcf128);
SDNode *Node = Op.Val; SDNode *Node = Op.getNode();
assert(Node->getOperand(0).getValueType() == MVT::ppcf128); assert(Node->getOperand(0).getValueType() == MVT::ppcf128);
assert(Node->getOperand(0).Val->getOpcode() == ISD::BUILD_PAIR); assert(Node->getOperand(0).getNode()->getOpcode() == ISD::BUILD_PAIR);
SDValue Lo = Node->getOperand(0).Val->getOperand(0); SDValue Lo = Node->getOperand(0).getNode()->getOperand(0);
SDValue Hi = Node->getOperand(0).Val->getOperand(1); SDValue Hi = Node->getOperand(0).getNode()->getOperand(1);
// This sequence changes FPSCR to do round-to-zero, adds the two halves // This sequence changes FPSCR to do round-to-zero, adds the two halves
// of the long double, and puts FPSCR back the way it was. We do not // of the long double, and puts FPSCR back the way it was. We do not
@ -3237,7 +3237,7 @@ SDValue PPCTargetLowering::LowerBUILD_VECTOR(SDValue Op,
// zero. // zero.
uint64_t VectorBits[2]; uint64_t VectorBits[2];
uint64_t UndefBits[2]; uint64_t UndefBits[2];
if (GetConstantBuildVectorBits(Op.Val, VectorBits, UndefBits)) if (GetConstantBuildVectorBits(Op.getNode(), VectorBits, UndefBits))
return SDValue(); // Not a constant vector. return SDValue(); // Not a constant vector.
// If this is a splat (repetition) of a value across the whole vector, return // If this is a splat (repetition) of a value across the whole vector, return
@ -3483,18 +3483,18 @@ SDValue PPCTargetLowering::LowerVECTOR_SHUFFLE(SDValue Op,
// (such as vsplt*) should be left as VECTOR_SHUFFLE nodes so they can be // (such as vsplt*) should be left as VECTOR_SHUFFLE nodes so they can be
// selected by the instruction selector. // selected by the instruction selector.
if (V2.getOpcode() == ISD::UNDEF) { if (V2.getOpcode() == ISD::UNDEF) {
if (PPC::isSplatShuffleMask(PermMask.Val, 1) || if (PPC::isSplatShuffleMask(PermMask.getNode(), 1) ||
PPC::isSplatShuffleMask(PermMask.Val, 2) || PPC::isSplatShuffleMask(PermMask.getNode(), 2) ||
PPC::isSplatShuffleMask(PermMask.Val, 4) || PPC::isSplatShuffleMask(PermMask.getNode(), 4) ||
PPC::isVPKUWUMShuffleMask(PermMask.Val, true) || PPC::isVPKUWUMShuffleMask(PermMask.getNode(), true) ||
PPC::isVPKUHUMShuffleMask(PermMask.Val, true) || PPC::isVPKUHUMShuffleMask(PermMask.getNode(), true) ||
PPC::isVSLDOIShuffleMask(PermMask.Val, true) != -1 || PPC::isVSLDOIShuffleMask(PermMask.getNode(), true) != -1 ||
PPC::isVMRGLShuffleMask(PermMask.Val, 1, true) || PPC::isVMRGLShuffleMask(PermMask.getNode(), 1, true) ||
PPC::isVMRGLShuffleMask(PermMask.Val, 2, true) || PPC::isVMRGLShuffleMask(PermMask.getNode(), 2, true) ||
PPC::isVMRGLShuffleMask(PermMask.Val, 4, true) || PPC::isVMRGLShuffleMask(PermMask.getNode(), 4, true) ||
PPC::isVMRGHShuffleMask(PermMask.Val, 1, true) || PPC::isVMRGHShuffleMask(PermMask.getNode(), 1, true) ||
PPC::isVMRGHShuffleMask(PermMask.Val, 2, true) || PPC::isVMRGHShuffleMask(PermMask.getNode(), 2, true) ||
PPC::isVMRGHShuffleMask(PermMask.Val, 4, true)) { PPC::isVMRGHShuffleMask(PermMask.getNode(), 4, true)) {
return Op; return Op;
} }
} }
@ -3502,15 +3502,15 @@ SDValue PPCTargetLowering::LowerVECTOR_SHUFFLE(SDValue Op,
// Altivec has a variety of "shuffle immediates" that take two vector inputs // Altivec has a variety of "shuffle immediates" that take two vector inputs
// and produce a fixed permutation. If any of these match, do not lower to // and produce a fixed permutation. If any of these match, do not lower to
// VPERM. // VPERM.
if (PPC::isVPKUWUMShuffleMask(PermMask.Val, false) || if (PPC::isVPKUWUMShuffleMask(PermMask.getNode(), false) ||
PPC::isVPKUHUMShuffleMask(PermMask.Val, false) || PPC::isVPKUHUMShuffleMask(PermMask.getNode(), false) ||
PPC::isVSLDOIShuffleMask(PermMask.Val, false) != -1 || PPC::isVSLDOIShuffleMask(PermMask.getNode(), false) != -1 ||
PPC::isVMRGLShuffleMask(PermMask.Val, 1, false) || PPC::isVMRGLShuffleMask(PermMask.getNode(), 1, false) ||
PPC::isVMRGLShuffleMask(PermMask.Val, 2, false) || PPC::isVMRGLShuffleMask(PermMask.getNode(), 2, false) ||
PPC::isVMRGLShuffleMask(PermMask.Val, 4, false) || PPC::isVMRGLShuffleMask(PermMask.getNode(), 4, false) ||
PPC::isVMRGHShuffleMask(PermMask.Val, 1, false) || PPC::isVMRGHShuffleMask(PermMask.getNode(), 1, false) ||
PPC::isVMRGHShuffleMask(PermMask.Val, 2, false) || PPC::isVMRGHShuffleMask(PermMask.getNode(), 2, false) ||
PPC::isVMRGHShuffleMask(PermMask.Val, 4, false)) PPC::isVMRGHShuffleMask(PermMask.getNode(), 4, false))
return Op; return Op;
// Check to see if this is a shuffle of 4-byte values. If so, we can use our // Check to see if this is a shuffle of 4-byte values. If so, we can use our
@ -3842,7 +3842,7 @@ SDNode *PPCTargetLowering::ReplaceNodeResults(SDNode *N, SelectionDAG &DAG) {
// Use MERGE_VALUES to drop the chain result value and get a node with one // Use MERGE_VALUES to drop the chain result value and get a node with one
// result. This requires turning off getMergeValues simplification, since // result. This requires turning off getMergeValues simplification, since
// otherwise it will give us Res back. // otherwise it will give us Res back.
return DAG.getMergeValues(&Res, 1, false).Val; return DAG.getMergeValues(&Res, 1, false).getNode();
} }
} }
} }
@ -4292,17 +4292,17 @@ SDValue PPCTargetLowering::PerformDAGCombine(SDNode *N,
SDValue Val = N->getOperand(0).getOperand(0); SDValue Val = N->getOperand(0).getOperand(0);
if (Val.getValueType() == MVT::f32) { if (Val.getValueType() == MVT::f32) {
Val = DAG.getNode(ISD::FP_EXTEND, MVT::f64, Val); Val = DAG.getNode(ISD::FP_EXTEND, MVT::f64, Val);
DCI.AddToWorklist(Val.Val); DCI.AddToWorklist(Val.getNode());
} }
Val = DAG.getNode(PPCISD::FCTIDZ, MVT::f64, Val); Val = DAG.getNode(PPCISD::FCTIDZ, MVT::f64, Val);
DCI.AddToWorklist(Val.Val); DCI.AddToWorklist(Val.getNode());
Val = DAG.getNode(PPCISD::FCFID, MVT::f64, Val); Val = DAG.getNode(PPCISD::FCFID, MVT::f64, Val);
DCI.AddToWorklist(Val.Val); DCI.AddToWorklist(Val.getNode());
if (N->getValueType(0) == MVT::f32) { if (N->getValueType(0) == MVT::f32) {
Val = DAG.getNode(ISD::FP_ROUND, MVT::f32, Val, Val = DAG.getNode(ISD::FP_ROUND, MVT::f32, Val,
DAG.getIntPtrConstant(0)); DAG.getIntPtrConstant(0));
DCI.AddToWorklist(Val.Val); DCI.AddToWorklist(Val.getNode());
} }
return Val; return Val;
} else if (N->getOperand(0).getValueType() == MVT::i32) { } else if (N->getOperand(0).getValueType() == MVT::i32) {
@ -4322,20 +4322,20 @@ SDValue PPCTargetLowering::PerformDAGCombine(SDNode *N,
SDValue Val = N->getOperand(1).getOperand(0); SDValue Val = N->getOperand(1).getOperand(0);
if (Val.getValueType() == MVT::f32) { if (Val.getValueType() == MVT::f32) {
Val = DAG.getNode(ISD::FP_EXTEND, MVT::f64, Val); Val = DAG.getNode(ISD::FP_EXTEND, MVT::f64, Val);
DCI.AddToWorklist(Val.Val); DCI.AddToWorklist(Val.getNode());
} }
Val = DAG.getNode(PPCISD::FCTIWZ, MVT::f64, Val); Val = DAG.getNode(PPCISD::FCTIWZ, MVT::f64, Val);
DCI.AddToWorklist(Val.Val); DCI.AddToWorklist(Val.getNode());
Val = DAG.getNode(PPCISD::STFIWX, MVT::Other, N->getOperand(0), Val, Val = DAG.getNode(PPCISD::STFIWX, MVT::Other, N->getOperand(0), Val,
N->getOperand(2), N->getOperand(3)); N->getOperand(2), N->getOperand(3));
DCI.AddToWorklist(Val.Val); DCI.AddToWorklist(Val.getNode());
return Val; return Val;
} }
// Turn STORE (BSWAP) -> sthbrx/stwbrx. // Turn STORE (BSWAP) -> sthbrx/stwbrx.
if (N->getOperand(1).getOpcode() == ISD::BSWAP && if (N->getOperand(1).getOpcode() == ISD::BSWAP &&
N->getOperand(1).Val->hasOneUse() && N->getOperand(1).getNode()->hasOneUse() &&
(N->getOperand(1).getValueType() == MVT::i32 || (N->getOperand(1).getValueType() == MVT::i32 ||
N->getOperand(1).getValueType() == MVT::i16)) { N->getOperand(1).getValueType() == MVT::i16)) {
SDValue BSwapOp = N->getOperand(1).getOperand(0); SDValue BSwapOp = N->getOperand(1).getOperand(0);
@ -4350,7 +4350,7 @@ SDValue PPCTargetLowering::PerformDAGCombine(SDNode *N,
break; break;
case ISD::BSWAP: case ISD::BSWAP:
// Turn BSWAP (LOAD) -> lhbrx/lwbrx. // Turn BSWAP (LOAD) -> lhbrx/lwbrx.
if (ISD::isNON_EXTLoad(N->getOperand(0).Val) && if (ISD::isNON_EXTLoad(N->getOperand(0).getNode()) &&
N->getOperand(0).hasOneUse() && N->getOperand(0).hasOneUse() &&
(N->getValueType(0) == MVT::i32 || N->getValueType(0) == MVT::i16)) { (N->getValueType(0) == MVT::i32 || N->getValueType(0) == MVT::i16)) {
SDValue Load = N->getOperand(0); SDValue Load = N->getOperand(0);
@ -4379,7 +4379,7 @@ SDValue PPCTargetLowering::PerformDAGCombine(SDNode *N,
// Next, combine the load away, we give it a bogus result value but a real // Next, combine the load away, we give it a bogus result value but a real
// chain result. The result value is dead because the bswap is dead. // chain result. The result value is dead because the bswap is dead.
DCI.CombineTo(Load.Val, ResVal, BSLoad.getValue(1)); DCI.CombineTo(Load.getNode(), ResVal, BSLoad.getValue(1));
// Return N so it doesn't get rechecked! // Return N so it doesn't get rechecked!
return SDValue(N, 0); return SDValue(N, 0);
@ -4398,7 +4398,7 @@ SDValue PPCTargetLowering::PerformDAGCombine(SDNode *N,
// Scan all of the users of the LHS, looking for VCMPo's that match. // Scan all of the users of the LHS, looking for VCMPo's that match.
SDNode *VCMPoNode = 0; SDNode *VCMPoNode = 0;
SDNode *LHSN = N->getOperand(0).Val; SDNode *LHSN = N->getOperand(0).getNode();
for (SDNode::use_iterator UI = LHSN->use_begin(), E = LHSN->use_end(); for (SDNode::use_iterator UI = LHSN->use_begin(), E = LHSN->use_end();
UI != E; ++UI) UI != E; ++UI)
if (UI->getOpcode() == PPCISD::VCMPo && if (UI->getOpcode() == PPCISD::VCMPo &&
@ -4650,7 +4650,7 @@ void PPCTargetLowering::LowerAsmOperandForConstraint(SDValue Op, char Letter,
} }
} }
if (Result.Val) { if (Result.getNode()) {
Ops.push_back(Result); Ops.push_back(Result);
return; return;
} }

6
lib/Target/PowerPC/PPCInstrAltivec.td
View File

@ -113,7 +113,7 @@ def VSPLTISB_get_imm : SDNodeXForm<build_vector, [{
return PPC::get_VSPLTI_elt(N, 1, *CurDAG); return PPC::get_VSPLTI_elt(N, 1, *CurDAG);
}]>; }]>;
def vecspltisb : PatLeaf<(build_vector), [{ def vecspltisb : PatLeaf<(build_vector), [{
return PPC::get_VSPLTI_elt(N, 1, *CurDAG).Val != 0; return PPC::get_VSPLTI_elt(N, 1, *CurDAG).getNode() != 0;
}], VSPLTISB_get_imm>; }], VSPLTISB_get_imm>;
// VSPLTISH_get_imm xform function: convert build_vector to VSPLTISH imm. // VSPLTISH_get_imm xform function: convert build_vector to VSPLTISH imm.
@ -121,7 +121,7 @@ def VSPLTISH_get_imm : SDNodeXForm<build_vector, [{
return PPC::get_VSPLTI_elt(N, 2, *CurDAG); return PPC::get_VSPLTI_elt(N, 2, *CurDAG);
}]>; }]>;
def vecspltish : PatLeaf<(build_vector), [{ def vecspltish : PatLeaf<(build_vector), [{
return PPC::get_VSPLTI_elt(N, 2, *CurDAG).Val != 0; return PPC::get_VSPLTI_elt(N, 2, *CurDAG).getNode() != 0;
}], VSPLTISH_get_imm>; }], VSPLTISH_get_imm>;
// VSPLTISW_get_imm xform function: convert build_vector to VSPLTISW imm. // VSPLTISW_get_imm xform function: convert build_vector to VSPLTISW imm.
@ -129,7 +129,7 @@ def VSPLTISW_get_imm : SDNodeXForm<build_vector, [{
return PPC::get_VSPLTI_elt(N, 4, *CurDAG); return PPC::get_VSPLTI_elt(N, 4, *CurDAG);
}]>; }]>;
def vecspltisw : PatLeaf<(build_vector), [{ def vecspltisw : PatLeaf<(build_vector), [{
return PPC::get_VSPLTI_elt(N, 4, *CurDAG).Val != 0; return PPC::get_VSPLTI_elt(N, 4, *CurDAG).getNode() != 0;
}], VSPLTISW_get_imm>; }], VSPLTISW_get_imm>;
def V_immneg0 : PatLeaf<(build_vector), [{ def V_immneg0 : PatLeaf<(build_vector), [{

4
lib/Target/Sparc/SparcISelDAGToDAG.cpp
View File

@ -120,7 +120,7 @@ bool SparcDAGToDAGISel::SelectADDRrr(SDValue Op, SDValue Addr,
if (Addr.getOpcode() == ISD::ADD) { if (Addr.getOpcode() == ISD::ADD) {
if (isa<ConstantSDNode>(Addr.getOperand(1)) && if (isa<ConstantSDNode>(Addr.getOperand(1)) &&
Predicate_simm13(Addr.getOperand(1).Val)) Predicate_simm13(Addr.getOperand(1).getNode()))
return false; // Let the reg+imm pattern catch this! return false; // Let the reg+imm pattern catch this!
if (Addr.getOperand(0).getOpcode() == SPISD::Lo || if (Addr.getOperand(0).getOpcode() == SPISD::Lo ||
Addr.getOperand(1).getOpcode() == SPISD::Lo) Addr.getOperand(1).getOpcode() == SPISD::Lo)
@ -136,7 +136,7 @@ bool SparcDAGToDAGISel::SelectADDRrr(SDValue Op, SDValue Addr,
} }
SDNode *SparcDAGToDAGISel::Select(SDValue Op) { SDNode *SparcDAGToDAGISel::Select(SDValue Op) {
SDNode *N = Op.Val; SDNode *N = Op.getNode();
if (N->isMachineOpcode()) if (N->isMachineOpcode())
return NULL; // Already selected. return NULL; // Already selected.

16
lib/Target/Sparc/SparcISelLowering.cpp
View File

@ -40,7 +40,7 @@ static SDValue LowerRET(SDValue Op, SelectionDAG &DAG) {
CCState CCInfo(CC, isVarArg, DAG.getTarget(), RVLocs); CCState CCInfo(CC, isVarArg, DAG.getTarget(), RVLocs);
// Analize return values of ISD::RET // Analize return values of ISD::RET
CCInfo.AnalyzeReturn(Op.Val, RetCC_Sparc32); CCInfo.AnalyzeReturn(Op.getNode(), RetCC_Sparc32);
// If this is the first return lowered for this function, add the regs to the // If this is the first return lowered for this function, add the regs to the
// liveout set for the function. // liveout set for the function.
@ -66,7 +66,7 @@ static SDValue LowerRET(SDValue Op, SelectionDAG &DAG) {
Flag = Chain.getValue(1); Flag = Chain.getValue(1);
} }
if (Flag.Val) if (Flag.getNode())
return DAG.getNode(SPISD::RET_FLAG, MVT::Other, Chain, Flag); return DAG.getNode(SPISD::RET_FLAG, MVT::Other, Chain, Flag);
return DAG.getNode(SPISD::RET_FLAG, MVT::Other, Chain); return DAG.getNode(SPISD::RET_FLAG, MVT::Other, Chain);
} }
@ -233,7 +233,7 @@ static SDValue LowerCALL(SDValue Op, SelectionDAG &DAG) {
// Analyze operands of the call, assigning locations to each operand. // Analyze operands of the call, assigning locations to each operand.
SmallVector<CCValAssign, 16> ArgLocs; SmallVector<CCValAssign, 16> ArgLocs;
CCState CCInfo(CallingConv, isVarArg, DAG.getTarget(), ArgLocs); CCState CCInfo(CallingConv, isVarArg, DAG.getTarget(), ArgLocs);
CCInfo.AnalyzeCallOperands(Op.Val, CC_Sparc32); CCInfo.AnalyzeCallOperands(Op.getNode(), CC_Sparc32);
// Get the size of the outgoing arguments stack space requirement. // Get the size of the outgoing arguments stack space requirement.
unsigned ArgsSize = CCInfo.getNextStackOffset(); unsigned ArgsSize = CCInfo.getNextStackOffset();
@ -374,7 +374,7 @@ static SDValue LowerCALL(SDValue Op, SelectionDAG &DAG) {
break; break;
} }
if (ValToStore.Val) { if (ValToStore.getNode()) {
SDValue StackPtr = DAG.getRegister(SP::O6, MVT::i32); SDValue StackPtr = DAG.getRegister(SP::O6, MVT::i32);
SDValue PtrOff = DAG.getConstant(ArgOffset, MVT::i32); SDValue PtrOff = DAG.getConstant(ArgOffset, MVT::i32);
PtrOff = DAG.getNode(ISD::ADD, MVT::i32, StackPtr, PtrOff); PtrOff = DAG.getNode(ISD::ADD, MVT::i32, StackPtr, PtrOff);
@ -416,7 +416,7 @@ static SDValue LowerCALL(SDValue Op, SelectionDAG &DAG) {
NodeTys.push_back(MVT::Other); // Returns a chain NodeTys.push_back(MVT::Other); // Returns a chain
NodeTys.push_back(MVT::Flag); // Returns a flag for retval copy to use. NodeTys.push_back(MVT::Flag); // Returns a flag for retval copy to use.
SDValue Ops[] = { Chain, Callee, InFlag }; SDValue Ops[] = { Chain, Callee, InFlag };
Chain = DAG.getNode(SPISD::CALL, NodeTys, Ops, InFlag.Val ? 3 : 2); Chain = DAG.getNode(SPISD::CALL, NodeTys, Ops, InFlag.getNode() ? 3 : 2);
InFlag = Chain.getValue(1); InFlag = Chain.getValue(1);
Chain = DAG.getCALLSEQ_END(Chain, Chain = DAG.getCALLSEQ_END(Chain,
@ -428,7 +428,7 @@ static SDValue LowerCALL(SDValue Op, SelectionDAG &DAG) {
SmallVector<CCValAssign, 16> RVLocs; SmallVector<CCValAssign, 16> RVLocs;
CCState RVInfo(CallingConv, isVarArg, DAG.getTarget(), RVLocs); CCState RVInfo(CallingConv, isVarArg, DAG.getTarget(), RVLocs);
RVInfo.AnalyzeCallResult(Op.Val, RetCC_Sparc32); RVInfo.AnalyzeCallResult(Op.getNode(), RetCC_Sparc32);
SmallVector<SDValue, 8> ResultVals; SmallVector<SDValue, 8> ResultVals;
// Copy all of the result registers out of their specified physreg. // Copy all of the result registers out of their specified physreg.
@ -448,7 +448,7 @@ static SDValue LowerCALL(SDValue Op, SelectionDAG &DAG) {
ResultVals.push_back(Chain); ResultVals.push_back(Chain);
// Merge everything together with a MERGE_VALUES node. // Merge everything together with a MERGE_VALUES node.
return DAG.getMergeValues(Op.Val->getVTList(), &ResultVals[0], return DAG.getMergeValues(Op.getNode()->getVTList(), &ResultVals[0],
ResultVals.size()); ResultVals.size());
} }
@ -803,7 +803,7 @@ static SDValue LowerVASTART(SDValue Op, SelectionDAG &DAG,
} }
static SDValue LowerVAARG(SDValue Op, SelectionDAG &DAG) { static SDValue LowerVAARG(SDValue Op, SelectionDAG &DAG) {
SDNode *Node = Op.Val; SDNode *Node = Op.getNode();
MVT VT = Node->getValueType(0); MVT VT = Node->getValueType(0);
SDValue InChain = Node->getOperand(0); SDValue InChain = Node->getOperand(0);
SDValue VAListPtr = Node->getOperand(1); SDValue VAListPtr = Node->getOperand(1);

144
lib/Target/X86/X86ISelDAGToDAG.cpp
View File

@ -80,11 +80,11 @@ namespace {
} }
void dump() { void dump() {
cerr << "X86ISelAddressMode " << this << "\n"; cerr << "X86ISelAddressMode " << this << "\n";
cerr << "Base.Reg "; if (Base.Reg.Val!=0) Base.Reg.Val->dump(); cerr << "Base.Reg "; if (Base.Reg.getNode()!=0) Base.Reg.getNode()->dump();
else cerr << "nul"; else cerr << "nul";
cerr << " Base.FrameIndex " << Base.FrameIndex << "\n"; cerr << " Base.FrameIndex " << Base.FrameIndex << "\n";
cerr << "isRIPRel " << isRIPRel << " Scale" << Scale << "\n"; cerr << "isRIPRel " << isRIPRel << " Scale" << Scale << "\n";
cerr << "IndexReg "; if (IndexReg.Val!=0) IndexReg.Val->dump(); cerr << "IndexReg "; if (IndexReg.getNode()!=0) IndexReg.getNode()->dump();
else cerr << "nul"; else cerr << "nul";
cerr << " Disp " << Disp << "\n"; cerr << " Disp " << Disp << "\n";
cerr << "GV "; if (GV) GV->dump(); cerr << "GV "; if (GV) GV->dump();
@ -253,7 +253,7 @@ static SDNode *findFlagUse(SDNode *N) {
SDNode *User = *I; SDNode *User = *I;
for (unsigned i = 0, e = User->getNumOperands(); i != e; ++i) { for (unsigned i = 0, e = User->getNumOperands(); i != e; ++i) {
SDValue Op = User->getOperand(i); SDValue Op = User->getOperand(i);
if (Op.Val == N && Op.getResNo() == FlagResNo) if (Op.getNode() == N && Op.getResNo() == FlagResNo)
return User; return User;
} }
} }
@ -272,7 +272,7 @@ static void findNonImmUse(SDNode *Use, SDNode* Def, SDNode *ImmedUse,
return; return;
for (unsigned i = 0, e = Use->getNumOperands(); !found && i != e; ++i) { for (unsigned i = 0, e = Use->getNumOperands(); !found && i != e; ++i) {
SDNode *N = Use->getOperand(i).Val; SDNode *N = Use->getOperand(i).getNode();
if (N == Skip) if (N == Skip)
continue; continue;
if (N == Def) { if (N == Def) {
@ -374,8 +374,8 @@ bool X86DAGToDAGISel::CanBeFoldedBy(SDNode *N, SDNode *U, SDNode *Root) const {
static void MoveBelowTokenFactor(SelectionDAG *CurDAG, SDValue Load, static void MoveBelowTokenFactor(SelectionDAG *CurDAG, SDValue Load,
SDValue Store, SDValue TF) { SDValue Store, SDValue TF) {
SmallVector<SDValue, 4> Ops; SmallVector<SDValue, 4> Ops;
for (unsigned i = 0, e = TF.Val->getNumOperands(); i != e; ++i) for (unsigned i = 0, e = TF.getNode()->getNumOperands(); i != e; ++i)
if (Load.Val == TF.getOperand(i).Val) if (Load.getNode() == TF.getOperand(i).getNode())
Ops.push_back(Load.getOperand(0)); Ops.push_back(Load.getOperand(0));
else else
Ops.push_back(TF.getOperand(i)); Ops.push_back(TF.getOperand(i));
@ -404,7 +404,7 @@ static bool isRMWLoad(SDValue N, SDValue Chain, SDValue Address,
if (N.hasOneUse() && if (N.hasOneUse() &&
N.getOperand(1) == Address && N.getOperand(1) == Address &&
N.Val->isOperandOf(Chain.Val)) { N.getNode()->isOperandOf(Chain.getNode())) {
Load = N; Load = N;
return true; return true;
} }
@ -416,8 +416,8 @@ static bool isRMWLoad(SDValue N, SDValue Chain, SDValue Address,
static void MoveBelowCallSeqStart(SelectionDAG *CurDAG, SDValue Load, static void MoveBelowCallSeqStart(SelectionDAG *CurDAG, SDValue Load,
SDValue Call, SDValue Chain) { SDValue Call, SDValue Chain) {
SmallVector<SDValue, 8> Ops; SmallVector<SDValue, 8> Ops;
for (unsigned i = 0, e = Chain.Val->getNumOperands(); i != e; ++i) for (unsigned i = 0, e = Chain.getNode()->getNumOperands(); i != e; ++i)
if (Load.Val == Chain.getOperand(i).Val) if (Load.getNode() == Chain.getOperand(i).getNode())
Ops.push_back(Load.getOperand(0)); Ops.push_back(Load.getOperand(0));
else else
Ops.push_back(Chain.getOperand(i)); Ops.push_back(Chain.getOperand(i));
@ -425,8 +425,8 @@ static void MoveBelowCallSeqStart(SelectionDAG *CurDAG, SDValue Load,
CurDAG->UpdateNodeOperands(Load, Call.getOperand(0), CurDAG->UpdateNodeOperands(Load, Call.getOperand(0),
Load.getOperand(1), Load.getOperand(2)); Load.getOperand(1), Load.getOperand(2));
Ops.clear(); Ops.clear();
Ops.push_back(SDValue(Load.Val, 1)); Ops.push_back(SDValue(Load.getNode(), 1));
for (unsigned i = 1, e = Call.Val->getNumOperands(); i != e; ++i) for (unsigned i = 1, e = Call.getNode()->getNumOperands(); i != e; ++i)
Ops.push_back(Call.getOperand(i)); Ops.push_back(Call.getOperand(i));
CurDAG->UpdateNodeOperands(Call, &Ops[0], Ops.size()); CurDAG->UpdateNodeOperands(Call, &Ops[0], Ops.size());
} }
@ -435,9 +435,9 @@ static void MoveBelowCallSeqStart(SelectionDAG *CurDAG, SDValue Load,
/// moved below CALLSEQ_START and the chains leading up to the call. /// moved below CALLSEQ_START and the chains leading up to the call.
/// Return the CALLSEQ_START by reference as a second output. /// Return the CALLSEQ_START by reference as a second output.
static bool isCalleeLoad(SDValue Callee, SDValue &Chain) { static bool isCalleeLoad(SDValue Callee, SDValue &Chain) {
if (Callee.Val == Chain.Val || !Callee.hasOneUse()) if (Callee.getNode() == Chain.getNode() || !Callee.hasOneUse())
return false; return false;
LoadSDNode *LD = dyn_cast<LoadSDNode>(Callee.Val); LoadSDNode *LD = dyn_cast<LoadSDNode>(Callee.getNode());
if (!LD || if (!LD ||
LD->isVolatile() || LD->isVolatile() ||
LD->getAddressingMode() != ISD::UNINDEXED || LD->getAddressingMode() != ISD::UNINDEXED ||
@ -450,7 +450,7 @@ static bool isCalleeLoad(SDValue Callee, SDValue &Chain) {
return false; return false;
Chain = Chain.getOperand(0); Chain = Chain.getOperand(0);
} }
return Chain.getOperand(0).Val == Callee.Val; return Chain.getOperand(0).getNode() == Callee.getNode();
} }
@ -530,7 +530,7 @@ void X86DAGToDAGISel::PreprocessForRMW() {
continue; continue;
SDValue Chain = I->getOperand(0); SDValue Chain = I->getOperand(0);
if (Chain.Val->getOpcode() != ISD::TokenFactor) if (Chain.getNode()->getOpcode() != ISD::TokenFactor)
continue; continue;
SDValue N1 = I->getOperand(1); SDValue N1 = I->getOperand(1);
@ -542,7 +542,7 @@ void X86DAGToDAGISel::PreprocessForRMW() {
bool RModW = false; bool RModW = false;
SDValue Load; SDValue Load;
unsigned Opcode = N1.Val->getOpcode(); unsigned Opcode = N1.getNode()->getOpcode();
switch (Opcode) { switch (Opcode) {
case ISD::ADD: case ISD::ADD:
case ISD::MUL: case ISD::MUL:
@ -786,7 +786,7 @@ DOUT << "MatchAddress: "; DEBUG(AM.dump());
return true; return true;
} }
int id = N.Val->getNodeId(); int id = N.getNode()->getNodeId();
bool AlreadySelected = isSelected(id); // Already selected, not yet replaced. bool AlreadySelected = isSelected(id); // Already selected, not yet replaced.
switch (N.getOpcode()) { switch (N.getOpcode()) {
@ -808,14 +808,14 @@ DOUT << "AlreadySelected " << AlreadySelected << "\n";
// Under X86-64 non-small code model, GV (and friends) are 64-bits. // Under X86-64 non-small code model, GV (and friends) are 64-bits.
// Also, base and index reg must be 0 in order to use rip as base. // Also, base and index reg must be 0 in order to use rip as base.
if (is64Bit && (TM.getCodeModel() != CodeModel::Small || if (is64Bit && (TM.getCodeModel() != CodeModel::Small ||
AM.Base.Reg.Val || AM.IndexReg.Val)) AM.Base.Reg.getNode() || AM.IndexReg.getNode()))
break; break;
if (AM.GV != 0 || AM.CP != 0 || AM.ES != 0 || AM.JT != -1) if (AM.GV != 0 || AM.CP != 0 || AM.ES != 0 || AM.JT != -1)
break; break;
// If value is available in a register both base and index components have // If value is available in a register both base and index components have
// been picked, we can't fit the result available in the register in the // been picked, we can't fit the result available in the register in the
// addressing mode. Duplicate GlobalAddress or ConstantPool as displacement. // addressing mode. Duplicate GlobalAddress or ConstantPool as displacement.
if (!AlreadySelected || (AM.Base.Reg.Val && AM.IndexReg.Val)) { if (!AlreadySelected || (AM.Base.Reg.getNode() && AM.IndexReg.getNode())) {
SDValue N0 = N.getOperand(0); SDValue N0 = N.getOperand(0);
if (GlobalAddressSDNode *G = dyn_cast<GlobalAddressSDNode>(N0)) { if (GlobalAddressSDNode *G = dyn_cast<GlobalAddressSDNode>(N0)) {
GlobalValue *GV = G->getGlobal(); GlobalValue *GV = G->getGlobal();
@ -847,7 +847,7 @@ DOUT << "AlreadySelected " << AlreadySelected << "\n";
} }
case ISD::FrameIndex: case ISD::FrameIndex:
if (AM.BaseType == X86ISelAddressMode::RegBase && AM.Base.Reg.Val == 0) { if (AM.BaseType == X86ISelAddressMode::RegBase && AM.Base.Reg.getNode() == 0) {
AM.BaseType = X86ISelAddressMode::FrameIndexBase; AM.BaseType = X86ISelAddressMode::FrameIndexBase;
AM.Base.FrameIndex = cast<FrameIndexSDNode>(N)->getIndex(); AM.Base.FrameIndex = cast<FrameIndexSDNode>(N)->getIndex();
return false; return false;
@ -855,23 +855,23 @@ DOUT << "AlreadySelected " << AlreadySelected << "\n";
break; break;
case ISD::SHL: case ISD::SHL:
if (AlreadySelected || AM.IndexReg.Val != 0 || AM.Scale != 1 || AM.isRIPRel) if (AlreadySelected || AM.IndexReg.getNode() != 0 || AM.Scale != 1 || AM.isRIPRel)
break; break;
if (ConstantSDNode *CN = dyn_cast<ConstantSDNode>(N.Val->getOperand(1))) { if (ConstantSDNode *CN = dyn_cast<ConstantSDNode>(N.getNode()->getOperand(1))) {
unsigned Val = CN->getValue(); unsigned Val = CN->getValue();
if (Val == 1 || Val == 2 || Val == 3) { if (Val == 1 || Val == 2 || Val == 3) {
AM.Scale = 1 << Val; AM.Scale = 1 << Val;
SDValue ShVal = N.Val->getOperand(0); SDValue ShVal = N.getNode()->getOperand(0);
// Okay, we know that we have a scale by now. However, if the scaled // Okay, we know that we have a scale by now. However, if the scaled
// value is an add of something and a constant, we can fold the // value is an add of something and a constant, we can fold the
// constant into the disp field here. // constant into the disp field here.
if (ShVal.Val->getOpcode() == ISD::ADD && ShVal.hasOneUse() && if (ShVal.getNode()->getOpcode() == ISD::ADD && ShVal.hasOneUse() &&
isa<ConstantSDNode>(ShVal.Val->getOperand(1))) { isa<ConstantSDNode>(ShVal.getNode()->getOperand(1))) {
AM.IndexReg = ShVal.Val->getOperand(0); AM.IndexReg = ShVal.getNode()->getOperand(0);
ConstantSDNode *AddVal = ConstantSDNode *AddVal =
cast<ConstantSDNode>(ShVal.Val->getOperand(1)); cast<ConstantSDNode>(ShVal.getNode()->getOperand(1));
uint64_t Disp = AM.Disp + (AddVal->getValue() << Val); uint64_t Disp = AM.Disp + (AddVal->getValue() << Val);
if (isInt32(Disp)) if (isInt32(Disp))
AM.Disp = Disp; AM.Disp = Disp;
@ -894,31 +894,31 @@ DOUT << "AlreadySelected " << AlreadySelected << "\n";
// X*[3,5,9] -> X+X*[2,4,8] // X*[3,5,9] -> X+X*[2,4,8]
if (!AlreadySelected && if (!AlreadySelected &&
AM.BaseType == X86ISelAddressMode::RegBase && AM.BaseType == X86ISelAddressMode::RegBase &&
AM.Base.Reg.Val == 0 && AM.Base.Reg.getNode() == 0 &&
AM.IndexReg.Val == 0 && AM.IndexReg.getNode() == 0 &&
!AM.isRIPRel) { !AM.isRIPRel) {
if (ConstantSDNode *CN = dyn_cast<ConstantSDNode>(N.Val->getOperand(1))) if (ConstantSDNode *CN = dyn_cast<ConstantSDNode>(N.getNode()->getOperand(1)))
if (CN->getValue() == 3 || CN->getValue() == 5 || CN->getValue() == 9) { if (CN->getValue() == 3 || CN->getValue() == 5 || CN->getValue() == 9) {
AM.Scale = unsigned(CN->getValue())-1; AM.Scale = unsigned(CN->getValue())-1;
SDValue MulVal = N.Val->getOperand(0); SDValue MulVal = N.getNode()->getOperand(0);
SDValue Reg; SDValue Reg;
// Okay, we know that we have a scale by now. However, if the scaled // Okay, we know that we have a scale by now. However, if the scaled
// value is an add of something and a constant, we can fold the // value is an add of something and a constant, we can fold the
// constant into the disp field here. // constant into the disp field here.
if (MulVal.Val->getOpcode() == ISD::ADD && MulVal.hasOneUse() && if (MulVal.getNode()->getOpcode() == ISD::ADD && MulVal.hasOneUse() &&
isa<ConstantSDNode>(MulVal.Val->getOperand(1))) { isa<ConstantSDNode>(MulVal.getNode()->getOperand(1))) {
Reg = MulVal.Val->getOperand(0); Reg = MulVal.getNode()->getOperand(0);
ConstantSDNode *AddVal = ConstantSDNode *AddVal =
cast<ConstantSDNode>(MulVal.Val->getOperand(1)); cast<ConstantSDNode>(MulVal.getNode()->getOperand(1));
uint64_t Disp = AM.Disp + AddVal->getValue() * CN->getValue(); uint64_t Disp = AM.Disp + AddVal->getValue() * CN->getValue();
if (isInt32(Disp)) if (isInt32(Disp))
AM.Disp = Disp; AM.Disp = Disp;
else else
Reg = N.Val->getOperand(0); Reg = N.getNode()->getOperand(0);
} else { } else {
Reg = N.Val->getOperand(0); Reg = N.getNode()->getOperand(0);
} }
AM.IndexReg = AM.Base.Reg = Reg; AM.IndexReg = AM.Base.Reg = Reg;
@ -930,12 +930,12 @@ DOUT << "AlreadySelected " << AlreadySelected << "\n";
case ISD::ADD: case ISD::ADD:
if (!AlreadySelected) { if (!AlreadySelected) {
X86ISelAddressMode Backup = AM; X86ISelAddressMode Backup = AM;
if (!MatchAddress(N.Val->getOperand(0), AM, false, Depth+1) && if (!MatchAddress(N.getNode()->getOperand(0), AM, false, Depth+1) &&
!MatchAddress(N.Val->getOperand(1), AM, false, Depth+1)) !MatchAddress(N.getNode()->getOperand(1), AM, false, Depth+1))
return false; return false;
AM = Backup; AM = Backup;
if (!MatchAddress(N.Val->getOperand(1), AM, false, Depth+1) && if (!MatchAddress(N.getNode()->getOperand(1), AM, false, Depth+1) &&
!MatchAddress(N.Val->getOperand(0), AM, false, Depth+1)) !MatchAddress(N.getNode()->getOperand(0), AM, false, Depth+1))
return false; return false;
AM = Backup; AM = Backup;
} }
@ -970,7 +970,7 @@ DOUT << "AlreadySelected " << AlreadySelected << "\n";
if (Shift.getOpcode() != ISD::SHL) break; if (Shift.getOpcode() != ISD::SHL) break;
// Scale must not be used already. // Scale must not be used already.
if (AM.IndexReg.Val != 0 || AM.Scale != 1) break; if (AM.IndexReg.getNode() != 0 || AM.Scale != 1) break;
// Not when RIP is used as the base. // Not when RIP is used as the base.
if (AM.isRIPRel) break; if (AM.isRIPRel) break;
@ -995,8 +995,8 @@ DOUT << "AlreadySelected " << AlreadySelected << "\n";
SDValue(C2, 0), SDValue(C1, 0)); SDValue(C2, 0), SDValue(C1, 0));
SDValue NewAND = CurDAG->getNode(ISD::AND, N.getValueType(), SDValue NewAND = CurDAG->getNode(ISD::AND, N.getValueType(),
Shift.getOperand(0), NewANDMask); Shift.getOperand(0), NewANDMask);
NewANDMask.Val->setNodeId(Shift.Val->getNodeId()); NewANDMask.getNode()->setNodeId(Shift.getNode()->getNodeId());
NewAND.Val->setNodeId(N.Val->getNodeId()); NewAND.getNode()->setNodeId(N.getNode()->getNodeId());
AM.Scale = 1 << ShiftCst; AM.Scale = 1 << ShiftCst;
AM.IndexReg = NewAND; AM.IndexReg = NewAND;
@ -1012,9 +1012,9 @@ DOUT << "AlreadySelected " << AlreadySelected << "\n";
bool X86DAGToDAGISel::MatchAddressBase(SDValue N, X86ISelAddressMode &AM, bool X86DAGToDAGISel::MatchAddressBase(SDValue N, X86ISelAddressMode &AM,
bool isRoot, unsigned Depth) { bool isRoot, unsigned Depth) {
// Is the base register already occupied? // Is the base register already occupied?
if (AM.BaseType != X86ISelAddressMode::RegBase || AM.Base.Reg.Val) { if (AM.BaseType != X86ISelAddressMode::RegBase || AM.Base.Reg.getNode()) {
// If so, check to see if the scale index register is set. // If so, check to see if the scale index register is set.
if (AM.IndexReg.Val == 0 && !AM.isRIPRel) { if (AM.IndexReg.getNode() == 0 && !AM.isRIPRel) {
AM.IndexReg = N; AM.IndexReg = N;
AM.Scale = 1; AM.Scale = 1;
return false; return false;
@ -1042,11 +1042,11 @@ bool X86DAGToDAGISel::SelectAddr(SDValue Op, SDValue N, SDValue &Base,
MVT VT = N.getValueType(); MVT VT = N.getValueType();
if (AM.BaseType == X86ISelAddressMode::RegBase) { if (AM.BaseType == X86ISelAddressMode::RegBase) {
if (!AM.Base.Reg.Val) if (!AM.Base.Reg.getNode())
AM.Base.Reg = CurDAG->getRegister(0, VT); AM.Base.Reg = CurDAG->getRegister(0, VT);
} }
if (!AM.IndexReg.Val) if (!AM.IndexReg.getNode())
AM.IndexReg = CurDAG->getRegister(0, VT); AM.IndexReg = CurDAG->getRegister(0, VT);
getAddressOperands(AM, Base, Scale, Index, Disp); getAddressOperands(AM, Base, Scale, Index, Disp);
@ -1073,10 +1073,10 @@ bool X86DAGToDAGISel::SelectScalarSSELoad(SDValue Op, SDValue Pred,
SDValue &OutChain) { SDValue &OutChain) {
if (N.getOpcode() == ISD::SCALAR_TO_VECTOR) { if (N.getOpcode() == ISD::SCALAR_TO_VECTOR) {
InChain = N.getOperand(0).getValue(1); InChain = N.getOperand(0).getValue(1);
if (ISD::isNON_EXTLoad(InChain.Val) && if (ISD::isNON_EXTLoad(InChain.getNode()) &&
InChain.getValue(0).hasOneUse() && InChain.getValue(0).hasOneUse() &&
N.hasOneUse() && N.hasOneUse() &&
CanBeFoldedBy(N.Val, Pred.Val, Op.Val)) { CanBeFoldedBy(N.getNode(), Pred.getNode(), Op.getNode())) {
LoadSDNode *LD = cast<LoadSDNode>(InChain); LoadSDNode *LD = cast<LoadSDNode>(InChain);
if (!SelectAddr(Op, LD->getBasePtr(), Base, Scale, Index, Disp)) if (!SelectAddr(Op, LD->getBasePtr(), Base, Scale, Index, Disp))
return false; return false;
@ -1087,11 +1087,11 @@ bool X86DAGToDAGISel::SelectScalarSSELoad(SDValue Op, SDValue Pred,
// Also handle the case where we explicitly require zeros in the top // Also handle the case where we explicitly require zeros in the top
// elements. This is a vector shuffle from the zero vector. // elements. This is a vector shuffle from the zero vector.
if (N.getOpcode() == X86ISD::VZEXT_MOVL && N.Val->hasOneUse() && if (N.getOpcode() == X86ISD::VZEXT_MOVL && N.getNode()->hasOneUse() &&
// Check to see if the top elements are all zeros (or bitcast of zeros). // Check to see if the top elements are all zeros (or bitcast of zeros).
N.getOperand(0).getOpcode() == ISD::SCALAR_TO_VECTOR && N.getOperand(0).getOpcode() == ISD::SCALAR_TO_VECTOR &&
N.getOperand(0).Val->hasOneUse() && N.getOperand(0).getNode()->hasOneUse() &&
ISD::isNON_EXTLoad(N.getOperand(0).getOperand(0).Val) && ISD::isNON_EXTLoad(N.getOperand(0).getOperand(0).getNode()) &&
N.getOperand(0).getOperand(0).hasOneUse()) { N.getOperand(0).getOperand(0).hasOneUse()) {
// Okay, this is a zero extending load. Fold it. // Okay, this is a zero extending load. Fold it.
LoadSDNode *LD = cast<LoadSDNode>(N.getOperand(0).getOperand(0)); LoadSDNode *LD = cast<LoadSDNode>(N.getOperand(0).getOperand(0));
@ -1117,14 +1117,14 @@ bool X86DAGToDAGISel::SelectLEAAddr(SDValue Op, SDValue N,
MVT VT = N.getValueType(); MVT VT = N.getValueType();
unsigned Complexity = 0; unsigned Complexity = 0;
if (AM.BaseType == X86ISelAddressMode::RegBase) if (AM.BaseType == X86ISelAddressMode::RegBase)
if (AM.Base.Reg.Val) if (AM.Base.Reg.getNode())
Complexity = 1; Complexity = 1;
else else
AM.Base.Reg = CurDAG->getRegister(0, VT); AM.Base.Reg = CurDAG->getRegister(0, VT);
else if (AM.BaseType == X86ISelAddressMode::FrameIndexBase) else if (AM.BaseType == X86ISelAddressMode::FrameIndexBase)
Complexity = 4; Complexity = 4;
if (AM.IndexReg.Val) if (AM.IndexReg.getNode())
Complexity++; Complexity++;
else else
AM.IndexReg = CurDAG->getRegister(0, VT); AM.IndexReg = CurDAG->getRegister(0, VT);
@ -1148,7 +1148,7 @@ bool X86DAGToDAGISel::SelectLEAAddr(SDValue Op, SDValue N,
Complexity += 2; Complexity += 2;
} }
if (AM.Disp && (AM.Base.Reg.Val || AM.IndexReg.Val)) if (AM.Disp && (AM.Base.Reg.getNode() || AM.IndexReg.getNode()))
Complexity++; Complexity++;
if (Complexity > 2) { if (Complexity > 2) {
@ -1161,9 +1161,9 @@ bool X86DAGToDAGISel::SelectLEAAddr(SDValue Op, SDValue N,
bool X86DAGToDAGISel::TryFoldLoad(SDValue P, SDValue N, bool X86DAGToDAGISel::TryFoldLoad(SDValue P, SDValue N,
SDValue &Base, SDValue &Scale, SDValue &Base, SDValue &Scale,
SDValue &Index, SDValue &Disp) { SDValue &Index, SDValue &Disp) {
if (ISD::isNON_EXTLoad(N.Val) && if (ISD::isNON_EXTLoad(N.getNode()) &&
N.hasOneUse() && N.hasOneUse() &&
CanBeFoldedBy(N.Val, P.Val, P.Val)) CanBeFoldedBy(N.getNode(), P.getNode(), P.getNode()))
return SelectAddr(P, N.getOperand(1), Base, Scale, Index, Disp); return SelectAddr(P, N.getOperand(1), Base, Scale, Index, Disp);
return false; return false;
} }
@ -1198,14 +1198,14 @@ SDNode *X86DAGToDAGISel::getGlobalBaseReg() {
} }
} }
return CurDAG->getRegister(GlobalBaseReg, TLI.getPointerTy()).Val; return CurDAG->getRegister(GlobalBaseReg, TLI.getPointerTy()).getNode();
} }
static SDNode *FindCallStartFromCall(SDNode *Node) { static SDNode *FindCallStartFromCall(SDNode *Node) {
if (Node->getOpcode() == ISD::CALLSEQ_START) return Node; if (Node->getOpcode() == ISD::CALLSEQ_START) return Node;
assert(Node->getOperand(0).getValueType() == MVT::Other && assert(Node->getOperand(0).getValueType() == MVT::Other &&
"Node doesn't have a token chain argument!"); "Node doesn't have a token chain argument!");
return FindCallStartFromCall(Node->getOperand(0).Val); return FindCallStartFromCall(Node->getOperand(0).getNode());
} }
/// getTruncateTo8Bit - return an SDNode that implements a subreg based /// getTruncateTo8Bit - return an SDNode that implements a subreg based
@ -1239,7 +1239,7 @@ SDNode *X86DAGToDAGISel::getTruncateTo8Bit(SDValue N0) {
SDNode *X86DAGToDAGISel::Select(SDValue N) { SDNode *X86DAGToDAGISel::Select(SDValue N) {
SDNode *Node = N.Val; SDNode *Node = N.getNode();
MVT NVT = Node->getValueType(0); MVT NVT = Node->getValueType(0);
unsigned Opc, MOpc; unsigned Opc, MOpc;
unsigned Opcode = Node->getOpcode(); unsigned Opcode = Node->getOpcode();
@ -1277,7 +1277,7 @@ SDNode *X86DAGToDAGISel::Select(SDValue N) {
MVT PtrVT = TLI.getPointerTy(); MVT PtrVT = TLI.getPointerTy();
SDValue N0 = N.getOperand(0); SDValue N0 = N.getOperand(0);
SDValue N1 = N.getOperand(1); SDValue N1 = N.getOperand(1);
if (N.Val->getValueType(0) == PtrVT && if (N.getNode()->getValueType(0) == PtrVT &&
N0.getOpcode() == X86ISD::Wrapper && N0.getOpcode() == X86ISD::Wrapper &&
N1.getOpcode() == ISD::Constant) { N1.getOpcode() == ISD::Constant) {
unsigned Offset = (unsigned)cast<ConstantSDNode>(N1)->getValue(); unsigned Offset = (unsigned)cast<ConstantSDNode>(N1)->getValue();
@ -1294,13 +1294,13 @@ SDNode *X86DAGToDAGISel::Select(SDValue N) {
CP->getOffset()+Offset); CP->getOffset()+Offset);
} }
if (C.Val) { if (C.getNode()) {
if (Subtarget->is64Bit()) { if (Subtarget->is64Bit()) {
SDValue Ops[] = { CurDAG->getRegister(0, PtrVT), getI8Imm(1), SDValue Ops[] = { CurDAG->getRegister(0, PtrVT), getI8Imm(1),
CurDAG->getRegister(0, PtrVT), C }; CurDAG->getRegister(0, PtrVT), C };
return CurDAG->SelectNodeTo(N.Val, X86::LEA64r, MVT::i64, Ops, 4); return CurDAG->SelectNodeTo(N.getNode(), X86::LEA64r, MVT::i64, Ops, 4);
} else } else
return CurDAG->SelectNodeTo(N.Val, X86::MOV32ri, PtrVT, C); return CurDAG->SelectNodeTo(N.getNode(), X86::MOV32ri, PtrVT, C);
} }
} }
@ -1379,7 +1379,7 @@ SDNode *X86DAGToDAGISel::Select(SDValue N) {
ReplaceUses(N.getValue(0), Result); ReplaceUses(N.getValue(0), Result);
#ifndef NDEBUG #ifndef NDEBUG
DOUT << std::string(Indent-2, ' ') << "=> "; DOUT << std::string(Indent-2, ' ') << "=> ";
DEBUG(Result.Val->dump(CurDAG)); DEBUG(Result.getNode()->dump(CurDAG));
DOUT << "\n"; DOUT << "\n";
#endif #endif
} }
@ -1406,7 +1406,7 @@ SDNode *X86DAGToDAGISel::Select(SDValue N) {
ReplaceUses(N.getValue(1), Result); ReplaceUses(N.getValue(1), Result);
#ifndef NDEBUG #ifndef NDEBUG
DOUT << std::string(Indent-2, ' ') << "=> "; DOUT << std::string(Indent-2, ' ') << "=> ";
DEBUG(Result.Val->dump(CurDAG)); DEBUG(Result.getNode()->dump(CurDAG));
DOUT << "\n"; DOUT << "\n";
#endif #endif
} }
@ -1538,7 +1538,7 @@ SDNode *X86DAGToDAGISel::Select(SDValue N) {
ReplaceUses(N.getValue(0), Result); ReplaceUses(N.getValue(0), Result);
#ifndef NDEBUG #ifndef NDEBUG
DOUT << std::string(Indent-2, ' ') << "=> "; DOUT << std::string(Indent-2, ' ') << "=> ";
DEBUG(Result.Val->dump(CurDAG)); DEBUG(Result.getNode()->dump(CurDAG));
DOUT << "\n"; DOUT << "\n";
#endif #endif
} }
@ -1565,7 +1565,7 @@ SDNode *X86DAGToDAGISel::Select(SDValue N) {
ReplaceUses(N.getValue(1), Result); ReplaceUses(N.getValue(1), Result);
#ifndef NDEBUG #ifndef NDEBUG
DOUT << std::string(Indent-2, ' ') << "=> "; DOUT << std::string(Indent-2, ' ') << "=> ";
DEBUG(Result.Val->dump(CurDAG)); DEBUG(Result.getNode()->dump(CurDAG));
DOUT << "\n"; DOUT << "\n";
#endif #endif
} }
@ -1599,7 +1599,7 @@ SDNode *X86DAGToDAGISel::Select(SDValue N) {
#ifndef NDEBUG #ifndef NDEBUG
DOUT << std::string(Indent-2, ' ') << "=> "; DOUT << std::string(Indent-2, ' ') << "=> ";
DEBUG(TruncOp.Val->dump(CurDAG)); DEBUG(TruncOp.getNode()->dump(CurDAG));
DOUT << "\n"; DOUT << "\n";
DOUT << std::string(Indent-2, ' ') << "=> "; DOUT << std::string(Indent-2, ' ') << "=> ";
DEBUG(ResNode->dump(CurDAG)); DEBUG(ResNode->dump(CurDAG));
@ -1659,8 +1659,8 @@ SDNode *X86DAGToDAGISel::Select(SDValue N) {
#ifndef NDEBUG #ifndef NDEBUG
DOUT << std::string(Indent-2, ' ') << "=> "; DOUT << std::string(Indent-2, ' ') << "=> ";
if (ResNode == NULL || ResNode == N.Val) if (ResNode == NULL || ResNode == N.getNode())
DEBUG(N.Val->dump(CurDAG)); DEBUG(N.getNode()->dump(CurDAG));
else else
DEBUG(ResNode->dump(CurDAG)); DEBUG(ResNode->dump(CurDAG));
DOUT << "\n"; DOUT << "\n";

216
lib/Target/X86/X86ISelLowering.cpp
View File

@ -852,7 +852,7 @@ SDValue X86TargetLowering::LowerRET(SDValue Op, SelectionDAG &DAG) {
unsigned CC = DAG.getMachineFunction().getFunction()->getCallingConv(); unsigned CC = DAG.getMachineFunction().getFunction()->getCallingConv();
bool isVarArg = DAG.getMachineFunction().getFunction()->isVarArg(); bool isVarArg = DAG.getMachineFunction().getFunction()->isVarArg();
CCState CCInfo(CC, isVarArg, getTargetMachine(), RVLocs); CCState CCInfo(CC, isVarArg, getTargetMachine(), RVLocs);
CCInfo.AnalyzeReturn(Op.Val, RetCC_X86); CCInfo.AnalyzeReturn(Op.getNode(), RetCC_X86);
// If this is the first return lowered for this function, add the regs to the // If this is the first return lowered for this function, add the regs to the
// liveout set for the function. // liveout set for the function.
@ -944,7 +944,7 @@ SDValue X86TargetLowering::LowerRET(SDValue Op, SelectionDAG &DAG) {
RetOps[0] = Chain; // Update chain. RetOps[0] = Chain; // Update chain.
// Add the flag if we have it. // Add the flag if we have it.
if (Flag.Val) if (Flag.getNode())
RetOps.push_back(Flag); RetOps.push_back(Flag);
return DAG.getNode(X86ISD::RET_FLAG, MVT::Other, &RetOps[0], RetOps.size()); return DAG.getNode(X86ISD::RET_FLAG, MVT::Other, &RetOps[0], RetOps.size());
@ -1000,7 +1000,7 @@ LowerCallResult(SDValue Chain, SDValue InFlag, SDNode *TheCall,
// Merge everything together with a MERGE_VALUES node. // Merge everything together with a MERGE_VALUES node.
ResultVals.push_back(Chain); ResultVals.push_back(Chain);
return DAG.getMergeValues(TheCall->getVTList(), &ResultVals[0], return DAG.getMergeValues(TheCall->getVTList(), &ResultVals[0],
ResultVals.size()).Val; ResultVals.size()).getNode();
} }
@ -1038,7 +1038,7 @@ static bool CallIsStructReturn(SDValue Op) {
/// ArgsAreStructReturn - Determines whether a FORMAL_ARGUMENTS node uses struct /// ArgsAreStructReturn - Determines whether a FORMAL_ARGUMENTS node uses struct
/// return semantics. /// return semantics.
static bool ArgsAreStructReturn(SDValue Op) { static bool ArgsAreStructReturn(SDValue Op) {
unsigned NumArgs = Op.Val->getNumValues() - 1; unsigned NumArgs = Op.getNode()->getNumValues() - 1;
if (!NumArgs) if (!NumArgs)
return false; return false;
@ -1182,7 +1182,7 @@ X86TargetLowering::LowerFORMAL_ARGUMENTS(SDValue Op, SelectionDAG &DAG) {
// Assign locations to all of the incoming arguments. // Assign locations to all of the incoming arguments.
SmallVector<CCValAssign, 16> ArgLocs; SmallVector<CCValAssign, 16> ArgLocs;
CCState CCInfo(CC, isVarArg, getTargetMachine(), ArgLocs); CCState CCInfo(CC, isVarArg, getTargetMachine(), ArgLocs);
CCInfo.AnalyzeFormalArguments(Op.Val, CCAssignFnForNode(Op)); CCInfo.AnalyzeFormalArguments(Op.getNode(), CCAssignFnForNode(Op));
SmallVector<SDValue, 8> ArgValues; SmallVector<SDValue, 8> ArgValues;
unsigned LastVal = ~0U; unsigned LastVal = ~0U;
@ -1395,7 +1395,7 @@ X86TargetLowering::LowerFORMAL_ARGUMENTS(SDValue Op, SelectionDAG &DAG) {
FuncInfo->setBytesToPopOnReturn(BytesToPopOnReturn); FuncInfo->setBytesToPopOnReturn(BytesToPopOnReturn);
// Return the new list of results. // Return the new list of results.
return DAG.getMergeValues(Op.Val->getVTList(), &ArgValues[0], return DAG.getMergeValues(Op.getNode()->getVTList(), &ArgValues[0],
ArgValues.size()).getValue(Op.getResNo()); ArgValues.size()).getValue(Op.getResNo());
} }
@ -1433,7 +1433,7 @@ X86TargetLowering::EmitTailCallLoadRetAddr(SelectionDAG &DAG,
OutRetAddr = getReturnAddressFrameIndex(DAG); OutRetAddr = getReturnAddressFrameIndex(DAG);
// Load the "old" Return address. // Load the "old" Return address.
OutRetAddr = DAG.getLoad(VT, Chain,OutRetAddr, NULL, 0); OutRetAddr = DAG.getLoad(VT, Chain,OutRetAddr, NULL, 0);
return SDValue(OutRetAddr.Val, 1); return SDValue(OutRetAddr.getNode(), 1);
} }
/// EmitTailCallStoreRetAddr - Emit a store of the return adress if tail call /// EmitTailCallStoreRetAddr - Emit a store of the return adress if tail call
@ -1472,7 +1472,7 @@ SDValue X86TargetLowering::LowerCALL(SDValue Op, SelectionDAG &DAG) {
// Analyze operands of the call, assigning locations to each operand. // Analyze operands of the call, assigning locations to each operand.
SmallVector<CCValAssign, 16> ArgLocs; SmallVector<CCValAssign, 16> ArgLocs;
CCState CCInfo(CC, isVarArg, getTargetMachine(), ArgLocs); CCState CCInfo(CC, isVarArg, getTargetMachine(), ArgLocs);
CCInfo.AnalyzeCallOperands(Op.Val, CCAssignFnForNode(Op)); CCInfo.AnalyzeCallOperands(Op.getNode(), CCAssignFnForNode(Op));
// Get a count of how many bytes are to be pushed on the stack. // Get a count of how many bytes are to be pushed on the stack.
unsigned NumBytes = CCInfo.getNextStackOffset(); unsigned NumBytes = CCInfo.getNextStackOffset();
@ -1562,7 +1562,7 @@ SDValue X86TargetLowering::LowerCALL(SDValue Op, SelectionDAG &DAG) {
} else { } else {
if (!IsTailCall || (IsTailCall && isByVal)) { if (!IsTailCall || (IsTailCall && isByVal)) {
assert(VA.isMemLoc()); assert(VA.isMemLoc());
if (StackPtr.Val == 0) if (StackPtr.getNode() == 0)
StackPtr = DAG.getCopyFromReg(Chain, X86StackPtr, getPointerTy()); StackPtr = DAG.getCopyFromReg(Chain, X86StackPtr, getPointerTy());
MemOpChains.push_back(LowerMemOpCallTo(Op, DAG, StackPtr, VA, Chain, MemOpChains.push_back(LowerMemOpCallTo(Op, DAG, StackPtr, VA, Chain,
@ -1658,7 +1658,7 @@ SDValue X86TargetLowering::LowerCALL(SDValue Op, SelectionDAG &DAG) {
if (Flags.isByVal()) { if (Flags.isByVal()) {
// Copy relative to framepointer. // Copy relative to framepointer.
SDValue Source = DAG.getIntPtrConstant(VA.getLocMemOffset()); SDValue Source = DAG.getIntPtrConstant(VA.getLocMemOffset());
if (StackPtr.Val == 0) if (StackPtr.getNode() == 0)
StackPtr = DAG.getCopyFromReg(Chain, X86StackPtr, getPointerTy()); StackPtr = DAG.getCopyFromReg(Chain, X86StackPtr, getPointerTy());
Source = DAG.getNode(ISD::ADD, getPointerTy(), StackPtr, Source); Source = DAG.getNode(ISD::ADD, getPointerTy(), StackPtr, Source);
@ -1719,7 +1719,7 @@ SDValue X86TargetLowering::LowerCALL(SDValue Op, SelectionDAG &DAG) {
Ops.push_back(Chain); Ops.push_back(Chain);
Ops.push_back(DAG.getIntPtrConstant(NumBytes)); Ops.push_back(DAG.getIntPtrConstant(NumBytes));
Ops.push_back(DAG.getIntPtrConstant(0)); Ops.push_back(DAG.getIntPtrConstant(0));
if (InFlag.Val) if (InFlag.getNode())
Ops.push_back(InFlag); Ops.push_back(InFlag);
Chain = DAG.getNode(ISD::CALLSEQ_END, NodeTys, &Ops[0], Ops.size()); Chain = DAG.getNode(ISD::CALLSEQ_END, NodeTys, &Ops[0], Ops.size());
InFlag = Chain.getValue(1); InFlag = Chain.getValue(1);
@ -1751,16 +1751,16 @@ SDValue X86TargetLowering::LowerCALL(SDValue Op, SelectionDAG &DAG) {
if (Is64Bit && isVarArg) if (Is64Bit && isVarArg)
Ops.push_back(DAG.getRegister(X86::AL, MVT::i8)); Ops.push_back(DAG.getRegister(X86::AL, MVT::i8));
if (InFlag.Val) if (InFlag.getNode())
Ops.push_back(InFlag); Ops.push_back(InFlag);
if (IsTailCall) { if (IsTailCall) {
assert(InFlag.Val && assert(InFlag.getNode() &&
"Flag must be set. Depend on flag being set in LowerRET"); "Flag must be set. Depend on flag being set in LowerRET");
Chain = DAG.getNode(X86ISD::TAILCALL, Chain = DAG.getNode(X86ISD::TAILCALL,
Op.Val->getVTList(), &Ops[0], Ops.size()); Op.getNode()->getVTList(), &Ops[0], Ops.size());
return SDValue(Chain.Val, Op.getResNo()); return SDValue(Chain.getNode(), Op.getResNo());
} }
Chain = DAG.getNode(X86ISD::CALL, NodeTys, &Ops[0], Ops.size()); Chain = DAG.getNode(X86ISD::CALL, NodeTys, &Ops[0], Ops.size());
@ -1787,7 +1787,7 @@ SDValue X86TargetLowering::LowerCALL(SDValue Op, SelectionDAG &DAG) {
// Handle result values, copying them out of physregs into vregs that we // Handle result values, copying them out of physregs into vregs that we
// return. // return.
return SDValue(LowerCallResult(Chain, InFlag, Op.Val, CC, DAG), Op.getResNo()); return SDValue(LowerCallResult(Chain, InFlag, Op.getNode(), CC, DAG), Op.getResNo());
} }
@ -2457,7 +2457,7 @@ static bool isSplatMask(SDNode *N) {
} }
} }
if (!ElementBase.Val) if (!ElementBase.getNode())
return false; return false;
for (; i != NumElems; ++i) { for (; i != NumElems; ++i) {
@ -2661,7 +2661,7 @@ static bool ShouldXformToMOVHLPS(SDNode *Mask) {
/// required. /// required.
static bool isScalarLoadToVector(SDNode *N, LoadSDNode **LD = NULL) { static bool isScalarLoadToVector(SDNode *N, LoadSDNode **LD = NULL) {
if (N->getOpcode() == ISD::SCALAR_TO_VECTOR) { if (N->getOpcode() == ISD::SCALAR_TO_VECTOR) {
N = N->getOperand(0).Val; N = N->getOperand(0).getNode();
if (ISD::isNON_EXTLoad(N)) { if (ISD::isNON_EXTLoad(N)) {
if (LD) if (LD)
*LD = cast<LoadSDNode>(N); *LD = cast<LoadSDNode>(N);
@ -2758,18 +2758,18 @@ static bool isZeroShuffle(SDNode *N) {
unsigned Idx = cast<ConstantSDNode>(Arg)->getValue(); unsigned Idx = cast<ConstantSDNode>(Arg)->getValue();
if (Idx < NumElems) { if (Idx < NumElems) {
unsigned Opc = V1.Val->getOpcode(); unsigned Opc = V1.getNode()->getOpcode();
if (Opc == ISD::UNDEF || ISD::isBuildVectorAllZeros(V1.Val)) if (Opc == ISD::UNDEF || ISD::isBuildVectorAllZeros(V1.getNode()))
continue; continue;
if (Opc != ISD::BUILD_VECTOR || if (Opc != ISD::BUILD_VECTOR ||
!isZeroNode(V1.Val->getOperand(Idx))) !isZeroNode(V1.getNode()->getOperand(Idx)))
return false; return false;
} else if (Idx >= NumElems) { } else if (Idx >= NumElems) {
unsigned Opc = V2.Val->getOpcode(); unsigned Opc = V2.getNode()->getOpcode();
if (Opc == ISD::UNDEF || ISD::isBuildVectorAllZeros(V2.Val)) if (Opc == ISD::UNDEF || ISD::isBuildVectorAllZeros(V2.getNode()))
continue; continue;
if (Opc != ISD::BUILD_VECTOR || if (Opc != ISD::BUILD_VECTOR ||
!isZeroNode(V2.Val->getOperand(Idx - NumElems))) !isZeroNode(V2.getNode()->getOperand(Idx - NumElems)))
return false; return false;
} }
} }
@ -2958,8 +2958,8 @@ unsigned getNumOfConsecutiveZeros(SDValue Op, SDValue Mask,
++NumZeros; ++NumZeros;
continue; continue;
} }
SDValue Elt = DAG.getShuffleScalarElt(Op.Val, Index); SDValue Elt = DAG.getShuffleScalarElt(Op.getNode(), Index);
if (Elt.Val && isZeroNode(Elt)) if (Elt.getNode() && isZeroNode(Elt))
++NumZeros; ++NumZeros;
else else
break; break;
@ -3043,7 +3043,7 @@ static SDValue LowerBuildVectorv16i8(SDValue Op, unsigned NonZeros,
} else } else
ThisElt = LastElt; ThisElt = LastElt;
if (ThisElt.Val) if (ThisElt.getNode())
V = DAG.getNode(ISD::INSERT_VECTOR_ELT, MVT::v8i16, V, ThisElt, V = DAG.getNode(ISD::INSERT_VECTOR_ELT, MVT::v8i16, V, ThisElt,
DAG.getIntPtrConstant(i/2)); DAG.getIntPtrConstant(i/2));
} }
@ -3097,14 +3097,14 @@ static SDValue getVShift(bool isLeft, MVT VT, SDValue SrcOp,
SDValue SDValue
X86TargetLowering::LowerBUILD_VECTOR(SDValue Op, SelectionDAG &DAG) { X86TargetLowering::LowerBUILD_VECTOR(SDValue Op, SelectionDAG &DAG) {
// All zero's are handled with pxor, all one's are handled with pcmpeqd. // All zero's are handled with pxor, all one's are handled with pcmpeqd.
if (ISD::isBuildVectorAllZeros(Op.Val) || ISD::isBuildVectorAllOnes(Op.Val)) { if (ISD::isBuildVectorAllZeros(Op.getNode()) || ISD::isBuildVectorAllOnes(Op.getNode())) {
// Canonicalize this to either <4 x i32> or <2 x i32> (SSE vs MMX) to // Canonicalize this to either <4 x i32> or <2 x i32> (SSE vs MMX) to
// 1) ensure the zero vectors are CSE'd, and 2) ensure that i64 scalars are // 1) ensure the zero vectors are CSE'd, and 2) ensure that i64 scalars are
// eliminated on x86-32 hosts. // eliminated on x86-32 hosts.
if (Op.getValueType() == MVT::v4i32 || Op.getValueType() == MVT::v2i32) if (Op.getValueType() == MVT::v4i32 || Op.getValueType() == MVT::v2i32)
return Op; return Op;
if (ISD::isBuildVectorAllOnes(Op.Val)) if (ISD::isBuildVectorAllOnes(Op.getNode()))
return getOnesVector(Op.getValueType(), DAG); return getOnesVector(Op.getValueType(), DAG);
return getZeroVector(Op.getValueType(), Subtarget->hasSSE2(), DAG); return getZeroVector(Op.getValueType(), Subtarget->hasSSE2(), DAG);
} }
@ -3252,13 +3252,13 @@ X86TargetLowering::LowerBUILD_VECTOR(SDValue Op, SelectionDAG &DAG) {
if (EVTBits == 8 && NumElems == 16) { if (EVTBits == 8 && NumElems == 16) {
SDValue V = LowerBuildVectorv16i8(Op, NonZeros,NumNonZero,NumZero, DAG, SDValue V = LowerBuildVectorv16i8(Op, NonZeros,NumNonZero,NumZero, DAG,
*this); *this);
if (V.Val) return V; if (V.getNode()) return V;
} }
if (EVTBits == 16 && NumElems == 8) { if (EVTBits == 16 && NumElems == 8) {
SDValue V = LowerBuildVectorv8i16(Op, NonZeros,NumNonZero,NumZero, DAG, SDValue V = LowerBuildVectorv8i16(Op, NonZeros,NumNonZero,NumZero, DAG,
*this); *this);
if (V.Val) return V; if (V.getNode()) return V;
} }
// If element VT is == 32 bits, turn it into a number of shuffles. // If element VT is == 32 bits, turn it into a number of shuffles.
@ -3344,8 +3344,8 @@ SDValue LowerVECTOR_SHUFFLEv8i16(SDValue V1, SDValue V2,
MVT MaskVT = MVT::getIntVectorWithNumElements(8); MVT MaskVT = MVT::getIntVectorWithNumElements(8);
MVT MaskEVT = MaskVT.getVectorElementType(); MVT MaskEVT = MaskVT.getVectorElementType();
MVT PtrVT = TLI.getPointerTy(); MVT PtrVT = TLI.getPointerTy();
SmallVector<SDValue, 8> MaskElts(PermMask.Val->op_begin(), SmallVector<SDValue, 8> MaskElts(PermMask.getNode()->op_begin(),
PermMask.Val->op_end()); PermMask.getNode()->op_end());
// First record which half of which vector the low elements come from. // First record which half of which vector the low elements come from.
SmallVector<unsigned, 4> LowQuad(4); SmallVector<unsigned, 4> LowQuad(4);
@ -3653,7 +3653,7 @@ static SDValue getVZextMovL(MVT VT, MVT OpVT,
const X86Subtarget *Subtarget) { const X86Subtarget *Subtarget) {
if (VT == MVT::v2f64 || VT == MVT::v4f32) { if (VT == MVT::v2f64 || VT == MVT::v4f32) {
LoadSDNode *LD = NULL; LoadSDNode *LD = NULL;
if (!isScalarLoadToVector(SrcOp.Val, &LD)) if (!isScalarLoadToVector(SrcOp.getNode(), &LD))
LD = dyn_cast<LoadSDNode>(SrcOp); LD = dyn_cast<LoadSDNode>(SrcOp);
if (!LD) { if (!LD) {
// movssrr and movsdrr do not clear top bits. Try to use movd, movq // movssrr and movsdrr do not clear top bits. Try to use movd, movq
@ -3850,18 +3850,18 @@ X86TargetLowering::LowerVECTOR_SHUFFLE(SDValue Op, SelectionDAG &DAG) {
bool V1IsSplat = false; bool V1IsSplat = false;
bool V2IsSplat = false; bool V2IsSplat = false;
if (isUndefShuffle(Op.Val)) if (isUndefShuffle(Op.getNode()))
return DAG.getNode(ISD::UNDEF, VT); return DAG.getNode(ISD::UNDEF, VT);
if (isZeroShuffle(Op.Val)) if (isZeroShuffle(Op.getNode()))
return getZeroVector(VT, Subtarget->hasSSE2(), DAG); return getZeroVector(VT, Subtarget->hasSSE2(), DAG);
if (isIdentityMask(PermMask.Val)) if (isIdentityMask(PermMask.getNode()))
return V1; return V1;
else if (isIdentityMask(PermMask.Val, true)) else if (isIdentityMask(PermMask.getNode(), true))
return V2; return V2;
if (isSplatMask(PermMask.Val)) { if (isSplatMask(PermMask.getNode())) {
if (isMMX || NumElems < 4) return Op; if (isMMX || NumElems < 4) return Op;
// Promote it to a v4{if}32 splat. // Promote it to a v4{if}32 splat.
return PromoteSplat(Op, DAG, Subtarget->hasSSE2()); return PromoteSplat(Op, DAG, Subtarget->hasSSE2());
@ -3871,27 +3871,27 @@ X86TargetLowering::LowerVECTOR_SHUFFLE(SDValue Op, SelectionDAG &DAG) {
// do it! // do it!
if (VT == MVT::v8i16 || VT == MVT::v16i8) { if (VT == MVT::v8i16 || VT == MVT::v16i8) {
SDValue NewOp= RewriteAsNarrowerShuffle(V1, V2, VT, PermMask, DAG, *this); SDValue NewOp= RewriteAsNarrowerShuffle(V1, V2, VT, PermMask, DAG, *this);
if (NewOp.Val) if (NewOp.getNode())
return DAG.getNode(ISD::BIT_CONVERT, VT, LowerVECTOR_SHUFFLE(NewOp, DAG)); return DAG.getNode(ISD::BIT_CONVERT, VT, LowerVECTOR_SHUFFLE(NewOp, DAG));
} else if ((VT == MVT::v4i32 || (VT == MVT::v4f32 && Subtarget->hasSSE2()))) { } else if ((VT == MVT::v4i32 || (VT == MVT::v4f32 && Subtarget->hasSSE2()))) {
// FIXME: Figure out a cleaner way to do this. // FIXME: Figure out a cleaner way to do this.
// Try to make use of movq to zero out the top part. // Try to make use of movq to zero out the top part.
if (ISD::isBuildVectorAllZeros(V2.Val)) { if (ISD::isBuildVectorAllZeros(V2.getNode())) {
SDValue NewOp = RewriteAsNarrowerShuffle(V1, V2, VT, PermMask, SDValue NewOp = RewriteAsNarrowerShuffle(V1, V2, VT, PermMask,
DAG, *this); DAG, *this);
if (NewOp.Val) { if (NewOp.getNode()) {
SDValue NewV1 = NewOp.getOperand(0); SDValue NewV1 = NewOp.getOperand(0);
SDValue NewV2 = NewOp.getOperand(1); SDValue NewV2 = NewOp.getOperand(1);
SDValue NewMask = NewOp.getOperand(2); SDValue NewMask = NewOp.getOperand(2);
if (isCommutedMOVL(NewMask.Val, true, false)) { if (isCommutedMOVL(NewMask.getNode(), true, false)) {
NewOp = CommuteVectorShuffle(NewOp, NewV1, NewV2, NewMask, DAG); NewOp = CommuteVectorShuffle(NewOp, NewV1, NewV2, NewMask, DAG);
return getVZextMovL(VT, NewOp.getValueType(), NewV2, DAG, Subtarget); return getVZextMovL(VT, NewOp.getValueType(), NewV2, DAG, Subtarget);
} }
} }
} else if (ISD::isBuildVectorAllZeros(V1.Val)) { } else if (ISD::isBuildVectorAllZeros(V1.getNode())) {
SDValue NewOp= RewriteAsNarrowerShuffle(V1, V2, VT, PermMask, SDValue NewOp= RewriteAsNarrowerShuffle(V1, V2, VT, PermMask,
DAG, *this); DAG, *this);
if (NewOp.Val && X86::isMOVLMask(NewOp.getOperand(2).Val)) if (NewOp.getNode() && X86::isMOVLMask(NewOp.getOperand(2).getNode()))
return getVZextMovL(VT, NewOp.getValueType(), NewOp.getOperand(1), return getVZextMovL(VT, NewOp.getValueType(), NewOp.getOperand(1),
DAG, Subtarget); DAG, Subtarget);
} }
@ -3910,24 +3910,24 @@ X86TargetLowering::LowerVECTOR_SHUFFLE(SDValue Op, SelectionDAG &DAG) {
return getVShift(isLeft, VT, ShVal, ShAmt, DAG, *this); return getVShift(isLeft, VT, ShVal, ShAmt, DAG, *this);
} }
if (X86::isMOVLMask(PermMask.Val)) { if (X86::isMOVLMask(PermMask.getNode())) {
if (V1IsUndef) if (V1IsUndef)
return V2; return V2;
if (ISD::isBuildVectorAllZeros(V1.Val)) if (ISD::isBuildVectorAllZeros(V1.getNode()))
return getVZextMovL(VT, VT, V2, DAG, Subtarget); return getVZextMovL(VT, VT, V2, DAG, Subtarget);
if (!isMMX) if (!isMMX)
return Op; return Op;
} }
if (!isMMX && (X86::isMOVSHDUPMask(PermMask.Val) || if (!isMMX && (X86::isMOVSHDUPMask(PermMask.getNode()) ||
X86::isMOVSLDUPMask(PermMask.Val) || X86::isMOVSLDUPMask(PermMask.getNode()) ||
X86::isMOVHLPSMask(PermMask.Val) || X86::isMOVHLPSMask(PermMask.getNode()) ||
X86::isMOVHPMask(PermMask.Val) || X86::isMOVHPMask(PermMask.getNode()) ||
X86::isMOVLPMask(PermMask.Val))) X86::isMOVLPMask(PermMask.getNode())))
return Op; return Op;
if (ShouldXformToMOVHLPS(PermMask.Val) || if (ShouldXformToMOVHLPS(PermMask.getNode()) ||
ShouldXformToMOVLP(V1.Val, V2.Val, PermMask.Val)) ShouldXformToMOVLP(V1.getNode(), V2.getNode(), PermMask.getNode()))
return CommuteVectorShuffle(Op, V1, V2, PermMask, DAG); return CommuteVectorShuffle(Op, V1, V2, PermMask, DAG);
if (isShift) { if (isShift) {
@ -3940,8 +3940,8 @@ X86TargetLowering::LowerVECTOR_SHUFFLE(SDValue Op, SelectionDAG &DAG) {
bool Commuted = false; bool Commuted = false;
// FIXME: This should also accept a bitcast of a splat? Be careful, not // FIXME: This should also accept a bitcast of a splat? Be careful, not
// 1,1,1,1 -> v8i16 though. // 1,1,1,1 -> v8i16 though.
V1IsSplat = isSplatVector(V1.Val); V1IsSplat = isSplatVector(V1.getNode());
V2IsSplat = isSplatVector(V2.Val); V2IsSplat = isSplatVector(V2.getNode());
// Canonicalize the splat or undef, if present, to be on the RHS. // Canonicalize the splat or undef, if present, to be on the RHS.
if ((V1IsSplat || V1IsUndef) && !(V2IsSplat || V2IsUndef)) { if ((V1IsSplat || V1IsUndef) && !(V2IsSplat || V2IsUndef)) {
@ -3952,7 +3952,7 @@ X86TargetLowering::LowerVECTOR_SHUFFLE(SDValue Op, SelectionDAG &DAG) {
} }
// FIXME: Figure out a cleaner way to do this. // FIXME: Figure out a cleaner way to do this.
if (isCommutedMOVL(PermMask.Val, V2IsSplat, V2IsUndef)) { if (isCommutedMOVL(PermMask.getNode(), V2IsSplat, V2IsUndef)) {
if (V2IsUndef) return V1; if (V2IsUndef) return V1;
Op = CommuteVectorShuffle(Op, V1, V2, PermMask, DAG); Op = CommuteVectorShuffle(Op, V1, V2, PermMask, DAG);
if (V2IsSplat) { if (V2IsSplat) {
@ -3960,16 +3960,16 @@ X86TargetLowering::LowerVECTOR_SHUFFLE(SDValue Op, SelectionDAG &DAG) {
// to any V2 element. The instruction selectior won't like this. Get // to any V2 element. The instruction selectior won't like this. Get
// a corrected mask and commute to form a proper MOVS{S|D}. // a corrected mask and commute to form a proper MOVS{S|D}.
SDValue NewMask = getMOVLMask(NumElems, DAG); SDValue NewMask = getMOVLMask(NumElems, DAG);
if (NewMask.Val != PermMask.Val) if (NewMask.getNode() != PermMask.getNode())
Op = DAG.getNode(ISD::VECTOR_SHUFFLE, VT, V1, V2, NewMask); Op = DAG.getNode(ISD::VECTOR_SHUFFLE, VT, V1, V2, NewMask);
} }
return Op; return Op;
} }
if (X86::isUNPCKL_v_undef_Mask(PermMask.Val) || if (X86::isUNPCKL_v_undef_Mask(PermMask.getNode()) ||
X86::isUNPCKH_v_undef_Mask(PermMask.Val) || X86::isUNPCKH_v_undef_Mask(PermMask.getNode()) ||
X86::isUNPCKLMask(PermMask.Val) || X86::isUNPCKLMask(PermMask.getNode()) ||
X86::isUNPCKHMask(PermMask.Val)) X86::isUNPCKHMask(PermMask.getNode()))
return Op; return Op;
if (V2IsSplat) { if (V2IsSplat) {
@ -3977,11 +3977,11 @@ X86TargetLowering::LowerVECTOR_SHUFFLE(SDValue Op, SelectionDAG &DAG) {
// element then try to match unpck{h|l} again. If match, return a // element then try to match unpck{h|l} again. If match, return a
// new vector_shuffle with the corrected mask. // new vector_shuffle with the corrected mask.
SDValue NewMask = NormalizeMask(PermMask, DAG); SDValue NewMask = NormalizeMask(PermMask, DAG);
if (NewMask.Val != PermMask.Val) { if (NewMask.getNode() != PermMask.getNode()) {
if (X86::isUNPCKLMask(PermMask.Val, true)) { if (X86::isUNPCKLMask(PermMask.getNode(), true)) {
SDValue NewMask = getUnpacklMask(NumElems, DAG); SDValue NewMask = getUnpacklMask(NumElems, DAG);
return DAG.getNode(ISD::VECTOR_SHUFFLE, VT, V1, V2, NewMask); return DAG.getNode(ISD::VECTOR_SHUFFLE, VT, V1, V2, NewMask);
} else if (X86::isUNPCKHMask(PermMask.Val, true)) { } else if (X86::isUNPCKHMask(PermMask.getNode(), true)) {
SDValue NewMask = getUnpackhMask(NumElems, DAG); SDValue NewMask = getUnpackhMask(NumElems, DAG);
return DAG.getNode(ISD::VECTOR_SHUFFLE, VT, V1, V2, NewMask); return DAG.getNode(ISD::VECTOR_SHUFFLE, VT, V1, V2, NewMask);
} }
@ -3989,23 +3989,23 @@ X86TargetLowering::LowerVECTOR_SHUFFLE(SDValue Op, SelectionDAG &DAG) {
} }
// Normalize the node to match x86 shuffle ops if needed // Normalize the node to match x86 shuffle ops if needed
if (V2.getOpcode() != ISD::UNDEF && isCommutedSHUFP(PermMask.Val)) if (V2.getOpcode() != ISD::UNDEF && isCommutedSHUFP(PermMask.getNode()))
Op = CommuteVectorShuffle(Op, V1, V2, PermMask, DAG); Op = CommuteVectorShuffle(Op, V1, V2, PermMask, DAG);
if (Commuted) { if (Commuted) {
// Commute is back and try unpck* again. // Commute is back and try unpck* again.
Op = CommuteVectorShuffle(Op, V1, V2, PermMask, DAG); Op = CommuteVectorShuffle(Op, V1, V2, PermMask, DAG);
if (X86::isUNPCKL_v_undef_Mask(PermMask.Val) || if (X86::isUNPCKL_v_undef_Mask(PermMask.getNode()) ||
X86::isUNPCKH_v_undef_Mask(PermMask.Val) || X86::isUNPCKH_v_undef_Mask(PermMask.getNode()) ||
X86::isUNPCKLMask(PermMask.Val) || X86::isUNPCKLMask(PermMask.getNode()) ||
X86::isUNPCKHMask(PermMask.Val)) X86::isUNPCKHMask(PermMask.getNode()))
return Op; return Op;
} }
// Try PSHUF* first, then SHUFP*. // Try PSHUF* first, then SHUFP*.
// MMX doesn't have PSHUFD but it does have PSHUFW. While it's theoretically // MMX doesn't have PSHUFD but it does have PSHUFW. While it's theoretically
// possible to shuffle a v2i32 using PSHUFW, that's not yet implemented. // possible to shuffle a v2i32 using PSHUFW, that's not yet implemented.
if (isMMX && NumElems == 4 && X86::isPSHUFDMask(PermMask.Val)) { if (isMMX && NumElems == 4 && X86::isPSHUFDMask(PermMask.getNode())) {
if (V2.getOpcode() != ISD::UNDEF) if (V2.getOpcode() != ISD::UNDEF)
return DAG.getNode(ISD::VECTOR_SHUFFLE, VT, V1, return DAG.getNode(ISD::VECTOR_SHUFFLE, VT, V1,
DAG.getNode(ISD::UNDEF, VT), PermMask); DAG.getNode(ISD::UNDEF, VT), PermMask);
@ -4014,9 +4014,9 @@ X86TargetLowering::LowerVECTOR_SHUFFLE(SDValue Op, SelectionDAG &DAG) {
if (!isMMX) { if (!isMMX) {
if (Subtarget->hasSSE2() && if (Subtarget->hasSSE2() &&
(X86::isPSHUFDMask(PermMask.Val) || (X86::isPSHUFDMask(PermMask.getNode()) ||
X86::isPSHUFHWMask(PermMask.Val) || X86::isPSHUFHWMask(PermMask.getNode()) ||
X86::isPSHUFLWMask(PermMask.Val))) { X86::isPSHUFLWMask(PermMask.getNode()))) {
MVT RVT = VT; MVT RVT = VT;
if (VT == MVT::v4f32) { if (VT == MVT::v4f32) {
RVT = MVT::v4i32; RVT = MVT::v4i32;
@ -4032,15 +4032,15 @@ X86TargetLowering::LowerVECTOR_SHUFFLE(SDValue Op, SelectionDAG &DAG) {
} }
// Binary or unary shufps. // Binary or unary shufps.
if (X86::isSHUFPMask(PermMask.Val) || if (X86::isSHUFPMask(PermMask.getNode()) ||
(V2.getOpcode() == ISD::UNDEF && X86::isPSHUFDMask(PermMask.Val))) (V2.getOpcode() == ISD::UNDEF && X86::isPSHUFDMask(PermMask.getNode())))
return Op; return Op;
} }
// Handle v8i16 specifically since SSE can do byte extraction and insertion. // Handle v8i16 specifically since SSE can do byte extraction and insertion.
if (VT == MVT::v8i16) { if (VT == MVT::v8i16) {
SDValue NewOp = LowerVECTOR_SHUFFLEv8i16(V1, V2, PermMask, DAG, *this); SDValue NewOp = LowerVECTOR_SHUFFLEv8i16(V1, V2, PermMask, DAG, *this);
if (NewOp.Val) if (NewOp.getNode())
return NewOp; return NewOp;
} }
@ -4073,7 +4073,7 @@ X86TargetLowering::LowerEXTRACT_VECTOR_ELT_SSE4(SDValue Op,
// result has a single use which is a store or a bitcast to i32. // result has a single use which is a store or a bitcast to i32.
if (!Op.hasOneUse()) if (!Op.hasOneUse())
return SDValue(); return SDValue();
SDNode *User = *Op.Val->use_begin(); SDNode *User = *Op.getNode()->use_begin();
if (User->getOpcode() != ISD::STORE && if (User->getOpcode() != ISD::STORE &&
(User->getOpcode() != ISD::BIT_CONVERT || (User->getOpcode() != ISD::BIT_CONVERT ||
User->getValueType(0) != MVT::i32)) User->getValueType(0) != MVT::i32))
@ -4094,7 +4094,7 @@ X86TargetLowering::LowerEXTRACT_VECTOR_ELT(SDValue Op, SelectionDAG &DAG) {
if (Subtarget->hasSSE41()) { if (Subtarget->hasSSE41()) {
SDValue Res = LowerEXTRACT_VECTOR_ELT_SSE4(Op, DAG); SDValue Res = LowerEXTRACT_VECTOR_ELT_SSE4(Op, DAG);
if (Res.Val) if (Res.getNode())
return Res; return Res;
} }
@ -4599,7 +4599,7 @@ FP_TO_SINTHelper(SDValue Op, SelectionDAG &DAG) {
SDValue X86TargetLowering::LowerFP_TO_SINT(SDValue Op, SelectionDAG &DAG) { SDValue X86TargetLowering::LowerFP_TO_SINT(SDValue Op, SelectionDAG &DAG) {
std::pair<SDValue,SDValue> Vals = FP_TO_SINTHelper(Op, DAG); std::pair<SDValue,SDValue> Vals = FP_TO_SINTHelper(Op, DAG);
SDValue FIST = Vals.first, StackSlot = Vals.second; SDValue FIST = Vals.first, StackSlot = Vals.second;
if (FIST.Val == 0) return SDValue(); if (FIST.getNode() == 0) return SDValue();
// Load the result. // Load the result.
return DAG.getLoad(Op.getValueType(), FIST, StackSlot, NULL, 0); return DAG.getLoad(Op.getValueType(), FIST, StackSlot, NULL, 0);
@ -4608,7 +4608,7 @@ SDValue X86TargetLowering::LowerFP_TO_SINT(SDValue Op, SelectionDAG &DAG) {
SDNode *X86TargetLowering::ExpandFP_TO_SINT(SDNode *N, SelectionDAG &DAG) { SDNode *X86TargetLowering::ExpandFP_TO_SINT(SDNode *N, SelectionDAG &DAG) {
std::pair<SDValue,SDValue> Vals = FP_TO_SINTHelper(SDValue(N, 0), DAG); std::pair<SDValue,SDValue> Vals = FP_TO_SINTHelper(SDValue(N, 0), DAG);
SDValue FIST = Vals.first, StackSlot = Vals.second; SDValue FIST = Vals.first, StackSlot = Vals.second;
if (FIST.Val == 0) return 0; if (FIST.getNode() == 0) return 0;
MVT VT = N->getValueType(0); MVT VT = N->getValueType(0);
@ -4618,7 +4618,7 @@ SDNode *X86TargetLowering::ExpandFP_TO_SINT(SDNode *N, SelectionDAG &DAG) {
// Use MERGE_VALUES to drop the chain result value and get a node with one // Use MERGE_VALUES to drop the chain result value and get a node with one
// result. This requires turning off getMergeValues simplification, since // result. This requires turning off getMergeValues simplification, since
// otherwise it will give us Res back. // otherwise it will give us Res back.
return DAG.getMergeValues(&Res, 1, false).Val; return DAG.getMergeValues(&Res, 1, false).getNode();
} }
SDValue X86TargetLowering::LowerFABS(SDValue Op, SelectionDAG &DAG) { SDValue X86TargetLowering::LowerFABS(SDValue Op, SelectionDAG &DAG) {
@ -5258,7 +5258,7 @@ SDNode *X86TargetLowering::ExpandREADCYCLECOUNTER(SDNode *N, SelectionDAG &DAG){
DAG.getNode(ISD::OR, MVT::i64, rax, Tmp), rdx.getValue(1) DAG.getNode(ISD::OR, MVT::i64, rax, Tmp), rdx.getValue(1)
}; };
return DAG.getMergeValues(Ops, 2).Val; return DAG.getMergeValues(Ops, 2).getNode();
} }
SDValue eax = DAG.getCopyFromReg(rd, X86::EAX, MVT::i32, rd.getValue(1)); SDValue eax = DAG.getCopyFromReg(rd, X86::EAX, MVT::i32, rd.getValue(1));
@ -5270,7 +5270,7 @@ SDNode *X86TargetLowering::ExpandREADCYCLECOUNTER(SDNode *N, SelectionDAG &DAG){
// Use a MERGE_VALUES to return the value and chain. // Use a MERGE_VALUES to return the value and chain.
Ops[1] = edx.getValue(1); Ops[1] = edx.getValue(1);
return DAG.getMergeValues(Ops, 2).Val; return DAG.getMergeValues(Ops, 2).getNode();
} }
SDValue X86TargetLowering::LowerVASTART(SDValue Op, SelectionDAG &DAG) { SDValue X86TargetLowering::LowerVASTART(SDValue Op, SelectionDAG &DAG) {
@ -5857,7 +5857,7 @@ SDValue X86TargetLowering::LowerCMP_SWAP(SDValue Op, SelectionDAG &DAG) {
if (Subtarget->is64Bit()) { if (Subtarget->is64Bit()) {
Reg = X86::RAX; size = 8; Reg = X86::RAX; size = 8;
} else //Should go away when LowerType stuff lands } else //Should go away when LowerType stuff lands
return SDValue(ExpandATOMIC_CMP_SWAP(Op.Val, DAG), 0); return SDValue(ExpandATOMIC_CMP_SWAP(Op.getNode(), DAG), 0);
break; break;
}; };
SDValue cpIn = DAG.getCopyToReg(Op.getOperand(0), Reg, SDValue cpIn = DAG.getCopyToReg(Op.getOperand(0), Reg,
@ -5907,7 +5907,7 @@ SDNode* X86TargetLowering::ExpandATOMIC_CMP_SWAP(SDNode* Op, SelectionDAG &DAG)
SDValue OpsF[] = { cpOutL.getValue(0), cpOutH.getValue(0)}; SDValue OpsF[] = { cpOutL.getValue(0), cpOutH.getValue(0)};
SDValue ResultVal = DAG.getNode(ISD::BUILD_PAIR, MVT::i64, OpsF, 2); SDValue ResultVal = DAG.getNode(ISD::BUILD_PAIR, MVT::i64, OpsF, 2);
SDValue Vals[2] = { ResultVal, cpOutH.getValue(1) }; SDValue Vals[2] = { ResultVal, cpOutH.getValue(1) };
return DAG.getMergeValues(Vals, 2).Val; return DAG.getMergeValues(Vals, 2).getNode();
} }
SDNode* X86TargetLowering::ExpandATOMIC_LOAD_SUB(SDNode* Op, SelectionDAG &DAG) { SDNode* X86TargetLowering::ExpandATOMIC_LOAD_SUB(SDNode* Op, SelectionDAG &DAG) {
@ -5920,7 +5920,7 @@ SDNode* X86TargetLowering::ExpandATOMIC_LOAD_SUB(SDNode* Op, SelectionDAG &DAG)
T==MVT::i64 ? ISD::ATOMIC_LOAD_ADD_64: 0), T==MVT::i64 ? ISD::ATOMIC_LOAD_ADD_64: 0),
Op->getOperand(0), Op->getOperand(1), negOp, Op->getOperand(0), Op->getOperand(1), negOp,
cast<AtomicSDNode>(Op)->getSrcValue(), cast<AtomicSDNode>(Op)->getSrcValue(),
cast<AtomicSDNode>(Op)->getAlignment()).Val; cast<AtomicSDNode>(Op)->getAlignment()).getNode();
} }
/// LowerOperation - Provide custom lowering hooks for some operations. /// LowerOperation - Provide custom lowering hooks for some operations.
@ -5974,7 +5974,7 @@ SDValue X86TargetLowering::LowerOperation(SDValue Op, SelectionDAG &DAG) {
// FIXME: REMOVE THIS WHEN LegalizeDAGTypes lands. // FIXME: REMOVE THIS WHEN LegalizeDAGTypes lands.
case ISD::READCYCLECOUNTER: case ISD::READCYCLECOUNTER:
return SDValue(ExpandREADCYCLECOUNTER(Op.Val, DAG), 0); return SDValue(ExpandREADCYCLECOUNTER(Op.getNode(), DAG), 0);
} }
} }
@ -6135,15 +6135,15 @@ bool
X86TargetLowering::isShuffleMaskLegal(SDValue Mask, MVT VT) const { X86TargetLowering::isShuffleMaskLegal(SDValue Mask, MVT VT) const {
// Only do shuffles on 128-bit vector types for now. // Only do shuffles on 128-bit vector types for now.
if (VT.getSizeInBits() == 64) return false; if (VT.getSizeInBits() == 64) return false;
return (Mask.Val->getNumOperands() <= 4 || return (Mask.getNode()->getNumOperands() <= 4 ||
isIdentityMask(Mask.Val) || isIdentityMask(Mask.getNode()) ||
isIdentityMask(Mask.Val, true) || isIdentityMask(Mask.getNode(), true) ||
isSplatMask(Mask.Val) || isSplatMask(Mask.getNode()) ||
isPSHUFHW_PSHUFLWMask(Mask.Val) || isPSHUFHW_PSHUFLWMask(Mask.getNode()) ||
X86::isUNPCKLMask(Mask.Val) || X86::isUNPCKLMask(Mask.getNode()) ||
X86::isUNPCKHMask(Mask.Val) || X86::isUNPCKHMask(Mask.getNode()) ||
X86::isUNPCKL_v_undef_Mask(Mask.Val) || X86::isUNPCKL_v_undef_Mask(Mask.getNode()) ||
X86::isUNPCKH_v_undef_Mask(Mask.Val)); X86::isUNPCKH_v_undef_Mask(Mask.getNode()));
} }
bool bool
@ -6695,11 +6695,11 @@ static bool EltsFromConsecutiveLoads(SDNode *N, SDValue PermMask,
} }
SDValue Elt = DAG.getShuffleScalarElt(N, i); SDValue Elt = DAG.getShuffleScalarElt(N, i);
if (!Elt.Val || if (!Elt.getNode() ||
(Elt.getOpcode() != ISD::UNDEF && !ISD::isNON_EXTLoad(Elt.Val))) (Elt.getOpcode() != ISD::UNDEF && !ISD::isNON_EXTLoad(Elt.getNode())))
return false; return false;
if (!Base) { if (!Base) {
Base = Elt.Val; Base = Elt.getNode();
if (Base->getOpcode() == ISD::UNDEF) if (Base->getOpcode() == ISD::UNDEF)
return false; return false;
continue; continue;
@ -6707,7 +6707,7 @@ static bool EltsFromConsecutiveLoads(SDNode *N, SDValue PermMask,
if (Elt.getOpcode() == ISD::UNDEF) if (Elt.getOpcode() == ISD::UNDEF)
continue; continue;
if (!TLI.isConsecutiveLoad(Elt.Val, Base, if (!TLI.isConsecutiveLoad(Elt.getNode(), Base,
EVT.getSizeInBits()/8, i, MFI)) EVT.getSizeInBits()/8, i, MFI))
return false; return false;
} }
@ -6731,7 +6731,7 @@ static SDValue PerformShuffleCombine(SDNode *N, SelectionDAG &DAG,
return SDValue(); return SDValue();
LoadSDNode *LD = cast<LoadSDNode>(Base); LoadSDNode *LD = cast<LoadSDNode>(Base);
if (isBaseAlignmentOfN(16, Base->getOperand(1).Val, TLI)) if (isBaseAlignmentOfN(16, Base->getOperand(1).getNode(), TLI))
return DAG.getLoad(VT, LD->getChain(), LD->getBasePtr(), LD->getSrcValue(), return DAG.getLoad(VT, LD->getChain(), LD->getBasePtr(), LD->getSrcValue(),
LD->getSrcValueOffset(), LD->isVolatile()); LD->getSrcValueOffset(), LD->isVolatile());
return DAG.getLoad(VT, LD->getChain(), LD->getBasePtr(), LD->getSrcValue(), return DAG.getLoad(VT, LD->getChain(), LD->getBasePtr(), LD->getSrcValue(),
@ -6762,11 +6762,11 @@ static SDValue PerformBuildVectorCombine(SDNode *N, SelectionDAG &DAG,
return SDValue(); return SDValue();
// Value must be a load. // Value must be a load.
SDNode *Base = N->getOperand(0).Val; SDNode *Base = N->getOperand(0).getNode();
if (!isa<LoadSDNode>(Base)) { if (!isa<LoadSDNode>(Base)) {
if (Base->getOpcode() != ISD::BIT_CONVERT) if (Base->getOpcode() != ISD::BIT_CONVERT)
return SDValue(); return SDValue();
Base = Base->getOperand(0).Val; Base = Base->getOperand(0).getNode();
if (!isa<LoadSDNode>(Base)) if (!isa<LoadSDNode>(Base))
return SDValue(); return SDValue();
} }
@ -6866,11 +6866,11 @@ static SDValue PerformSTORECombine(SDNode *N, SelectionDAG &DAG,
isa<LoadSDNode>(St->getValue()) && isa<LoadSDNode>(St->getValue()) &&
!cast<LoadSDNode>(St->getValue())->isVolatile() && !cast<LoadSDNode>(St->getValue())->isVolatile() &&
St->getChain().hasOneUse() && !St->isVolatile()) { St->getChain().hasOneUse() && !St->isVolatile()) {
SDNode* LdVal = St->getValue().Val; SDNode* LdVal = St->getValue().getNode();
LoadSDNode *Ld = 0; LoadSDNode *Ld = 0;
int TokenFactorIndex = -1; int TokenFactorIndex = -1;
SmallVector<SDValue, 8> Ops; SmallVector<SDValue, 8> Ops;
SDNode* ChainVal = St->getChain().Val; SDNode* ChainVal = St->getChain().getNode();
// Must be a store of a load. We currently handle two cases: the load // Must be a store of a load. We currently handle two cases: the load
// is a direct child, and it's under an intervening TokenFactor. It is // is a direct child, and it's under an intervening TokenFactor. It is
// possible to dig deeper under nested TokenFactors. // possible to dig deeper under nested TokenFactors.
@ -6879,7 +6879,7 @@ static SDValue PerformSTORECombine(SDNode *N, SelectionDAG &DAG,
else if (St->getValue().hasOneUse() && else if (St->getValue().hasOneUse() &&
ChainVal->getOpcode() == ISD::TokenFactor) { ChainVal->getOpcode() == ISD::TokenFactor) {
for (unsigned i=0, e = ChainVal->getNumOperands(); i != e; ++i) { for (unsigned i=0, e = ChainVal->getNumOperands(); i != e; ++i) {
if (ChainVal->getOperand(i).Val == LdVal) { if (ChainVal->getOperand(i).getNode() == LdVal) {
TokenFactorIndex = i; TokenFactorIndex = i;
Ld = cast<LoadSDNode>(St->getValue()); Ld = cast<LoadSDNode>(St->getValue());
} else } else
@ -7108,7 +7108,7 @@ void X86TargetLowering::LowerAsmOperandForConstraint(SDValue Op,
} }
} }
if (Result.Val) { if (Result.getNode()) {
Ops.push_back(Result); Ops.push_back(Result);
return; return;
} }

68
utils/TableGen/DAGISelEmitter.cpp
View File

@ -506,17 +506,17 @@ public:
if (NeedCheck) { if (NeedCheck) {
std::string ParentName(RootName.begin(), RootName.end()-1); std::string ParentName(RootName.begin(), RootName.end()-1);
emitCheck("CanBeFoldedBy(" + RootName + ".Val, " + ParentName + emitCheck("CanBeFoldedBy(" + RootName + ".getNode(), " + ParentName +
".Val, N.Val)"); ".getNode(), N.getNode())");
} }
} }
} }
if (NodeHasChain) { if (NodeHasChain) {
if (FoundChain) { if (FoundChain) {
emitCheck("(" + ChainName + ".Val == " + RootName + ".Val || " emitCheck("(" + ChainName + ".getNode() == " + RootName + ".getNode() || "
"IsChainCompatible(" + ChainName + ".Val, " + "IsChainCompatible(" + ChainName + ".getNode(), " +
RootName + ".Val))"); RootName + ".getNode()))");
OrigChains.push_back(std::make_pair(ChainName, RootName)); OrigChains.push_back(std::make_pair(ChainName, RootName));
} else } else
FoundChain = true; FoundChain = true;
@ -543,7 +543,7 @@ public:
// If there is a node predicate for this, emit the call. // If there is a node predicate for this, emit the call.
if (!N->getPredicateFn().empty()) if (!N->getPredicateFn().empty())
emitCheck(N->getPredicateFn() + "(" + RootName + ".Val)"); emitCheck(N->getPredicateFn() + "(" + RootName + ".getNode())");
// If this is an 'and R, 1234' where the operation is AND/OR and the RHS is // If this is an 'and R, 1234' where the operation is AND/OR and the RHS is
@ -720,7 +720,7 @@ public:
// If there is a node predicate for this, emit the call. // If there is a node predicate for this, emit the call.
if (!Child->getPredicateFn().empty()) if (!Child->getPredicateFn().empty())
emitCheck(Child->getPredicateFn() + "(" + RootName + emitCheck(Child->getPredicateFn() + "(" + RootName +
".Val)"); ".getNode())");
} else if (IntInit *II = } else if (IntInit *II =
dynamic_cast<IntInit*>(Child->getLeafValue())) { dynamic_cast<IntInit*>(Child->getLeafValue())) {
emitCheck("isa<ConstantSDNode>(" + RootName + ")"); emitCheck("isa<ConstantSDNode>(" + RootName + ")");
@ -951,8 +951,8 @@ public:
// case, the TokenFactor can have more operands. // case, the TokenFactor can have more operands.
emitCode("SmallVector<SDValue, 8> InChains;"); emitCode("SmallVector<SDValue, 8> InChains;");
for (unsigned i = 0, e = OrigChains.size(); i < e; ++i) { for (unsigned i = 0, e = OrigChains.size(); i < e; ++i) {
emitCode("if (" + OrigChains[i].first + ".Val != " + emitCode("if (" + OrigChains[i].first + ".getNode() != " +
OrigChains[i].second + ".Val) {"); OrigChains[i].second + ".getNode()) {");
emitCode(" AddToISelQueue(" + OrigChains[i].first + ");"); emitCode(" AddToISelQueue(" + OrigChains[i].first + ");");
emitCode(" InChains.push_back(" + OrigChains[i].first + ");"); emitCode(" InChains.push_back(" + OrigChains[i].first + ");");
emitCode("}"); emitCode("}");
@ -1164,7 +1164,7 @@ public:
std::string Code; std::string Code;
for (unsigned j = 0, e = FoldedChains.size(); j < e; j++) { for (unsigned j = 0, e = FoldedChains.size(); j < e; j++) {
ReplaceFroms.push_back("SDValue(" + ReplaceFroms.push_back("SDValue(" +
FoldedChains[j].first + ".Val, " + FoldedChains[j].first + ".getNode(), " +
utostr(FoldedChains[j].second) + utostr(FoldedChains[j].second) +
")"); ")");
ReplaceTos.push_back("SDValue(ResNode, " + ReplaceTos.push_back("SDValue(ResNode, " +
@ -1174,12 +1174,12 @@ public:
if (NodeHasOutFlag) { if (NodeHasOutFlag) {
if (FoldedFlag.first != "") { if (FoldedFlag.first != "") {
ReplaceFroms.push_back("SDValue(" + FoldedFlag.first + ".Val, " + ReplaceFroms.push_back("SDValue(" + FoldedFlag.first + ".getNode(), " +
utostr(FoldedFlag.second) + ")"); utostr(FoldedFlag.second) + ")");
ReplaceTos.push_back("InFlag"); ReplaceTos.push_back("InFlag");
} else { } else {
assert(NodeHasProperty(Pattern, SDNPOutFlag, CGP)); assert(NodeHasProperty(Pattern, SDNPOutFlag, CGP));
ReplaceFroms.push_back("SDValue(N.Val, " + ReplaceFroms.push_back("SDValue(N.getNode(), " +
utostr(NumPatResults + (unsigned)InputHasChain) utostr(NumPatResults + (unsigned)InputHasChain)
+ ")"); + ")");
ReplaceTos.push_back("InFlag"); ReplaceTos.push_back("InFlag");
@ -1187,9 +1187,9 @@ public:
} }
if (!ReplaceFroms.empty() && InputHasChain) { if (!ReplaceFroms.empty() && InputHasChain) {
ReplaceFroms.push_back("SDValue(N.Val, " + ReplaceFroms.push_back("SDValue(N.getNode(), " +
utostr(NumPatResults) + ")"); utostr(NumPatResults) + ")");
ReplaceTos.push_back("SDValue(" + ChainName + ".Val, " + ReplaceTos.push_back("SDValue(" + ChainName + ".getNode(), " +
ChainName + ".getResNo()" + ")"); ChainName + ".getResNo()" + ")");
ChainAssignmentNeeded |= NodeHasChain; ChainAssignmentNeeded |= NodeHasChain;
} }
@ -1200,12 +1200,12 @@ public:
} else if (InputHasChain && !NodeHasChain) { } else if (InputHasChain && !NodeHasChain) {
// One of the inner node produces a chain. // One of the inner node produces a chain.
if (NodeHasOutFlag) { if (NodeHasOutFlag) {
ReplaceFroms.push_back("SDValue(N.Val, " + ReplaceFroms.push_back("SDValue(N.getNode(), " +
utostr(NumPatResults+1) + utostr(NumPatResults+1) +
")"); ")");
ReplaceTos.push_back("SDValue(ResNode, N.getResNo()-1)"); ReplaceTos.push_back("SDValue(ResNode, N.getResNo()-1)");
} }
ReplaceFroms.push_back("SDValue(N.Val, " + ReplaceFroms.push_back("SDValue(N.getNode(), " +
utostr(NumPatResults) + ")"); utostr(NumPatResults) + ")");
ReplaceTos.push_back(ChainName); ReplaceTos.push_back(ChainName);
} }
@ -1216,7 +1216,7 @@ public:
std::string ChainAssign; std::string ChainAssign;
if (!isRoot) if (!isRoot)
ChainAssign = ChainName + " = SDValue(" + NodeName + ChainAssign = ChainName + " = SDValue(" + NodeName +
".Val, " + utostr(NumResults+NumDstRegs) + ");"; ".getNode(), " + utostr(NumResults+NumDstRegs) + ");";
else else
ChainAssign = ChainName + " = SDValue(" + NodeName + ChainAssign = ChainName + " = SDValue(" + NodeName +
", " + utostr(NumResults+NumDstRegs) + ");"; ", " + utostr(NumResults+NumDstRegs) + ");";
@ -1251,7 +1251,7 @@ public:
if (!isRoot || (InputHasChain && !NodeHasChain)) { if (!isRoot || (InputHasChain && !NodeHasChain)) {
Code = "CurDAG->getTargetNode(" + Code; Code = "CurDAG->getTargetNode(" + Code;
} else { } else {
Code = "CurDAG->SelectNodeTo(N.Val, " + Code; Code = "CurDAG->SelectNodeTo(N.getNode(), " + Code;
} }
if (isRoot) { if (isRoot) {
if (After.empty()) if (After.empty())
@ -1274,10 +1274,10 @@ public:
ResNodeDecled, true); ResNodeDecled, true);
unsigned ResNo = TmpNo++; unsigned ResNo = TmpNo++;
emitCode("SDValue Tmp" + utostr(ResNo) + " = Transform_" + Op->getName() emitCode("SDValue Tmp" + utostr(ResNo) + " = Transform_" + Op->getName()
+ "(" + Ops.back() + ".Val);"); + "(" + Ops.back() + ".getNode());");
NodeOps.push_back("Tmp" + utostr(ResNo)); NodeOps.push_back("Tmp" + utostr(ResNo));
if (isRoot) if (isRoot)
emitCode("return Tmp" + utostr(ResNo) + ".Val;"); emitCode("return Tmp" + utostr(ResNo) + ".getNode();");
return NodeOps; return NodeOps;
} else { } else {
N->dump(); N->dump();
@ -1298,7 +1298,7 @@ public:
Pat->setTypes(Other->getExtTypes()); Pat->setTypes(Other->getExtTypes());
// The top level node type is checked outside of the select function. // The top level node type is checked outside of the select function.
if (!isRoot) if (!isRoot)
emitCheck(Prefix + ".Val->getValueType(0) == " + emitCheck(Prefix + ".getNode()->getValueType(0) == " +
getName(Pat->getTypeNum(0))); getName(Pat->getTypeNum(0)));
return true; return true;
} }
@ -1360,7 +1360,7 @@ private:
std::string Decl = (!ResNodeDecled) ? "SDNode *" : ""; std::string Decl = (!ResNodeDecled) ? "SDNode *" : "";
emitCode(Decl + "ResNode = CurDAG->getCopyToReg(" + ChainName + emitCode(Decl + "ResNode = CurDAG->getCopyToReg(" + ChainName +
", " + getQualifiedName(RR) + ", " + getQualifiedName(RR) +
", " + RootName + utostr(OpNo) + ", InFlag).Val;"); ", " + RootName + utostr(OpNo) + ", InFlag).getNode();");
ResNodeDecled = true; ResNodeDecled = true;
emitCode(ChainName + " = SDValue(ResNode, 0);"); emitCode(ChainName + " = SDValue(ResNode, 0);");
emitCode("InFlag = SDValue(ResNode, 1);"); emitCode("InFlag = SDValue(ResNode, 1);");
@ -1836,7 +1836,7 @@ void DAGISelEmitter::EmitInstructionSelector(std::ostream &OS) {
if (OpName != "ISD::INTRINSIC_W_CHAIN" && if (OpName != "ISD::INTRINSIC_W_CHAIN" &&
OpName != "ISD::INTRINSIC_WO_CHAIN" && OpName != "ISD::INTRINSIC_WO_CHAIN" &&
OpName != "ISD::INTRINSIC_VOID") { OpName != "ISD::INTRINSIC_VOID") {
OS << " N.Val->dump(CurDAG);\n"; OS << " N.getNode()->dump(CurDAG);\n";
} else { } else {
OS << " unsigned iid = cast<ConstantSDNode>(N.getOperand(" OS << " unsigned iid = cast<ConstantSDNode>(N.getOperand("
"N.getOperand(0).getValueType() == MVT::Other))->getValue();\n" "N.getOperand(0).getValueType() == MVT::Other))->getValue();\n"
@ -1853,7 +1853,7 @@ void DAGISelEmitter::EmitInstructionSelector(std::ostream &OS) {
// Emit boilerplate. // Emit boilerplate.
OS << "SDNode *Select_INLINEASM(SDValue N) {\n" OS << "SDNode *Select_INLINEASM(SDValue N) {\n"
<< " std::vector<SDValue> Ops(N.Val->op_begin(), N.Val->op_end());\n" << " std::vector<SDValue> Ops(N.getNode()->op_begin(), N.getNode()->op_end());\n"
<< " SelectInlineAsmMemoryOperands(Ops);\n\n" << " SelectInlineAsmMemoryOperands(Ops);\n\n"
<< " // Ensure that the asm operands are themselves selected.\n" << " // Ensure that the asm operands are themselves selected.\n"
@ -1865,11 +1865,11 @@ void DAGISelEmitter::EmitInstructionSelector(std::ostream &OS) {
<< " VTs.push_back(MVT::Flag);\n" << " VTs.push_back(MVT::Flag);\n"
<< " SDValue New = CurDAG->getNode(ISD::INLINEASM, VTs, &Ops[0], " << " SDValue New = CurDAG->getNode(ISD::INLINEASM, VTs, &Ops[0], "
"Ops.size());\n" "Ops.size());\n"
<< " return New.Val;\n" << " return New.getNode();\n"
<< "}\n\n"; << "}\n\n";
OS << "SDNode *Select_UNDEF(const SDValue &N) {\n" OS << "SDNode *Select_UNDEF(const SDValue &N) {\n"
<< " return CurDAG->SelectNodeTo(N.Val, TargetInstrInfo::IMPLICIT_DEF,\n" << " return CurDAG->SelectNodeTo(N.getNode(), TargetInstrInfo::IMPLICIT_DEF,\n"
<< " N.getValueType());\n" << " N.getValueType());\n"
<< "}\n\n"; << "}\n\n";
@ -1878,7 +1878,7 @@ void DAGISelEmitter::EmitInstructionSelector(std::ostream &OS) {
<< " unsigned C = cast<LabelSDNode>(N)->getLabelID();\n" << " unsigned C = cast<LabelSDNode>(N)->getLabelID();\n"
<< " SDValue Tmp = CurDAG->getTargetConstant(C, MVT::i32);\n" << " SDValue Tmp = CurDAG->getTargetConstant(C, MVT::i32);\n"
<< " AddToISelQueue(Chain);\n" << " AddToISelQueue(Chain);\n"
<< " return CurDAG->SelectNodeTo(N.Val, TargetInstrInfo::DBG_LABEL,\n" << " return CurDAG->SelectNodeTo(N.getNode(), TargetInstrInfo::DBG_LABEL,\n"
<< " MVT::Other, Tmp, Chain);\n" << " MVT::Other, Tmp, Chain);\n"
<< "}\n\n"; << "}\n\n";
@ -1887,7 +1887,7 @@ void DAGISelEmitter::EmitInstructionSelector(std::ostream &OS) {
<< " unsigned C = cast<LabelSDNode>(N)->getLabelID();\n" << " unsigned C = cast<LabelSDNode>(N)->getLabelID();\n"
<< " SDValue Tmp = CurDAG->getTargetConstant(C, MVT::i32);\n" << " SDValue Tmp = CurDAG->getTargetConstant(C, MVT::i32);\n"
<< " AddToISelQueue(Chain);\n" << " AddToISelQueue(Chain);\n"
<< " return CurDAG->SelectNodeTo(N.Val, TargetInstrInfo::EH_LABEL,\n" << " return CurDAG->SelectNodeTo(N.getNode(), TargetInstrInfo::EH_LABEL,\n"
<< " MVT::Other, Tmp, Chain);\n" << " MVT::Other, Tmp, Chain);\n"
<< "}\n\n"; << "}\n\n";
@ -1897,7 +1897,7 @@ void DAGISelEmitter::EmitInstructionSelector(std::ostream &OS) {
<< " SDValue N2 = N.getOperand(2);\n" << " SDValue N2 = N.getOperand(2);\n"
<< " if (!isa<FrameIndexSDNode>(N1) || !isa<GlobalAddressSDNode>(N2)) {\n" << " if (!isa<FrameIndexSDNode>(N1) || !isa<GlobalAddressSDNode>(N2)) {\n"
<< " cerr << \"Cannot yet select llvm.dbg.declare: \";\n" << " cerr << \"Cannot yet select llvm.dbg.declare: \";\n"
<< " N.Val->dump(CurDAG);\n" << " N.getNode()->dump(CurDAG);\n"
<< " abort();\n" << " abort();\n"
<< " }\n" << " }\n"
<< " int FI = cast<FrameIndexSDNode>(N1)->getIndex();\n" << " int FI = cast<FrameIndexSDNode>(N1)->getIndex();\n"
@ -1907,7 +1907,7 @@ void DAGISelEmitter::EmitInstructionSelector(std::ostream &OS) {
<< " SDValue Tmp2 = " << " SDValue Tmp2 = "
<< "CurDAG->getTargetGlobalAddress(GV, TLI.getPointerTy());\n" << "CurDAG->getTargetGlobalAddress(GV, TLI.getPointerTy());\n"
<< " AddToISelQueue(Chain);\n" << " AddToISelQueue(Chain);\n"
<< " return CurDAG->SelectNodeTo(N.Val, TargetInstrInfo::DECLARE,\n" << " return CurDAG->SelectNodeTo(N.getNode(), TargetInstrInfo::DECLARE,\n"
<< " MVT::Other, Tmp1, Tmp2, Chain);\n" << " MVT::Other, Tmp1, Tmp2, Chain);\n"
<< "}\n\n"; << "}\n\n";
@ -1917,7 +1917,7 @@ void DAGISelEmitter::EmitInstructionSelector(std::ostream &OS) {
<< " unsigned C = cast<ConstantSDNode>(N1)->getValue();\n" << " unsigned C = cast<ConstantSDNode>(N1)->getValue();\n"
<< " SDValue Tmp = CurDAG->getTargetConstant(C, MVT::i32);\n" << " SDValue Tmp = CurDAG->getTargetConstant(C, MVT::i32);\n"
<< " AddToISelQueue(N0);\n" << " AddToISelQueue(N0);\n"
<< " return CurDAG->SelectNodeTo(N.Val, TargetInstrInfo::EXTRACT_SUBREG,\n" << " return CurDAG->SelectNodeTo(N.getNode(), TargetInstrInfo::EXTRACT_SUBREG,\n"
<< " N.getValueType(), N0, Tmp);\n" << " N.getValueType(), N0, Tmp);\n"
<< "}\n\n"; << "}\n\n";
@ -1929,7 +1929,7 @@ void DAGISelEmitter::EmitInstructionSelector(std::ostream &OS) {
<< " SDValue Tmp = CurDAG->getTargetConstant(C, MVT::i32);\n" << " SDValue Tmp = CurDAG->getTargetConstant(C, MVT::i32);\n"
<< " AddToISelQueue(N1);\n" << " AddToISelQueue(N1);\n"
<< " AddToISelQueue(N0);\n" << " AddToISelQueue(N0);\n"
<< " return CurDAG->SelectNodeTo(N.Val, TargetInstrInfo::INSERT_SUBREG,\n" << " return CurDAG->SelectNodeTo(N.getNode(), TargetInstrInfo::INSERT_SUBREG,\n"
<< " N.getValueType(), N0, N1, Tmp);\n" << " N.getValueType(), N0, N1, Tmp);\n"
<< "}\n\n"; << "}\n\n";
@ -1938,7 +1938,7 @@ void DAGISelEmitter::EmitInstructionSelector(std::ostream &OS) {
<< " if (N.isMachineOpcode()) {\n" << " if (N.isMachineOpcode()) {\n"
<< " return NULL; // Already selected.\n" << " return NULL; // Already selected.\n"
<< " }\n\n" << " }\n\n"
<< " MVT::SimpleValueType NVT = N.Val->getValueType(0).getSimpleVT();\n" << " MVT::SimpleValueType NVT = N.getNode()->getValueType(0).getSimpleVT();\n"
<< " switch (N.getOpcode()) {\n" << " switch (N.getOpcode()) {\n"
<< " default: break;\n" << " default: break;\n"
<< " case ISD::EntryToken: // These leaves remain the same.\n" << " case ISD::EntryToken: // These leaves remain the same.\n"
@ -2033,7 +2033,7 @@ void DAGISelEmitter::EmitInstructionSelector(std::ostream &OS) {
<< " if (N.getOpcode() != ISD::INTRINSIC_W_CHAIN &&\n" << " if (N.getOpcode() != ISD::INTRINSIC_W_CHAIN &&\n"
<< " N.getOpcode() != ISD::INTRINSIC_WO_CHAIN &&\n" << " N.getOpcode() != ISD::INTRINSIC_WO_CHAIN &&\n"
<< " N.getOpcode() != ISD::INTRINSIC_VOID) {\n" << " N.getOpcode() != ISD::INTRINSIC_VOID) {\n"
<< " N.Val->dump(CurDAG);\n" << " N.getNode()->dump(CurDAG);\n"
<< " } else {\n" << " } else {\n"
<< " unsigned iid = cast<ConstantSDNode>(N.getOperand(" << " unsigned iid = cast<ConstantSDNode>(N.getOperand("
"N.getOperand(0).getValueType() == MVT::Other))->getValue();\n" "N.getOperand(0).getValueType() == MVT::Other))->getValue();\n"