[llvm-commits] CVS: llvm/lib/Target/X86/X86ISelDAGToDAG.cpp

[Evan Cheng]

Changes in directory llvm/lib/Target/X86:

X86ISelDAGToDAG.cpp updated: 1.44 -> 1.45
---
Log message:

Match getTargetNode() changes (now return SDNode* instead of SDOperand).


---
Diffs of the changes:  (+22 -14)

 X86ISelDAGToDAG.cpp |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)


Index: llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
diff -u llvm/lib/Target/X86/X86ISelDAGToDAG.cpp:1.44 llvm/lib/Target/X86/X86ISelDAGToDAG.cpp:1.45
--- llvm/lib/Target/X86/X86ISelDAGToDAG.cpp:1.44	Wed Feb  8 18:37:58 2006
+++ llvm/lib/Target/X86/X86ISelDAGToDAG.cpp	Thu Feb  9 01:17:49 2006
@@ -521,12 +521,15 @@
         Select(Tmp1, Tmp1);
         Select(Tmp2, Tmp2);
         Select(Tmp3, Tmp3);
-        Chain  = CurDAG->getTargetNode(MOpc, MVT::Other, MVT::Flag, Tmp0, Tmp1,
-                                       Tmp2, Tmp3, Chain, InFlag);
-        InFlag = Chain.getValue(1);
+        SDNode *CNode =
+          CurDAG->getTargetNode(MOpc, MVT::Other, MVT::Flag, Tmp0, Tmp1,
+                                Tmp2, Tmp3, Chain, InFlag);
+        Chain  = SDOperand(CNode, 0);
+        InFlag = SDOperand(CNode, 1);
       } else {
         Select(N1, N1);
-        InFlag = CurDAG->getTargetNode(Opc, MVT::Flag, N1, InFlag);
+        InFlag =
+          SDOperand(CurDAG->getTargetNode(Opc, MVT::Flag, N1, InFlag), 0);
       }
 
       Result = CurDAG->getCopyFromReg(Chain, HiReg, NVT, InFlag);
@@ -601,12 +604,13 @@
 
       if (isSigned) {
         // Sign extend the low part into the high part.
-        InFlag = CurDAG->getTargetNode(SExtOpcode, MVT::Flag, InFlag);
+        InFlag =
+          SDOperand(CurDAG->getTargetNode(SExtOpcode, MVT::Flag, InFlag), 0);
       } else {
         // Zero out the high part, effectively zero extending the input.
         SDOperand ClrNode =
-          CurDAG->getTargetNode(ClrOpcode, NVT,
-                                CurDAG->getTargetConstant(0, NVT));
+          SDOperand(CurDAG->getTargetNode(ClrOpcode, NVT,
+                                         CurDAG->getTargetConstant(0, NVT)), 0);
         Chain  = CurDAG->getCopyToReg(Chain, CurDAG->getRegister(HiReg, NVT),
                                       ClrNode, InFlag);
         InFlag = Chain.getValue(1);
@@ -617,12 +621,15 @@
         Select(Tmp1, Tmp1);
         Select(Tmp2, Tmp2);
         Select(Tmp3, Tmp3);
-        Chain  = CurDAG->getTargetNode(MOpc, MVT::Other, MVT::Flag, Tmp0, Tmp1,
-                                       Tmp2, Tmp3, Chain, InFlag);
-        InFlag = Chain.getValue(1);
+        SDNode *CNode =
+          CurDAG->getTargetNode(MOpc, MVT::Other, MVT::Flag, Tmp0, Tmp1,
+                                Tmp2, Tmp3, Chain, InFlag);
+        Chain  = SDOperand(CNode, 0);
+        InFlag = SDOperand(CNode, 1);
       } else {
         Select(N1, N1);
-        InFlag = CurDAG->getTargetNode(Opc, MVT::Flag, N1, InFlag);
+        InFlag =
+          SDOperand(CurDAG->getTargetNode(Opc, MVT::Flag, N1, InFlag), 0);
       }
 
       Result = CurDAG->getCopyFromReg(Chain, isDiv ? LoReg : HiReg,
@@ -645,7 +652,7 @@
       }
       SDOperand Tmp0, Tmp1;
       Select(Tmp0, Node->getOperand(0));
-      Select(Tmp1, CurDAG->getTargetNode(Opc, VT, Tmp0));
+      Select(Tmp1, SDOperand(CurDAG->getTargetNode(Opc, VT, Tmp0), 0));
       SDOperand InFlag = SDOperand(0,0);
       Result = CurDAG->getCopyToReg(CurDAG->getEntryNode(), Reg, Tmp1, InFlag);
       SDOperand Chain = Result.getValue(0);
@@ -659,9 +666,10 @@
 
       Result = CurDAG->getCopyFromReg(Chain, Reg, VT, InFlag);
       if (N.Val->hasOneUse())
-        Result =CurDAG->SelectNodeTo(N.Val, Opc, VT, Result);
+        Result = CurDAG->SelectNodeTo(N.Val, Opc, VT, Result);
       else
-        Result = CodeGenMap[N] = CurDAG->getTargetNode(Opc, VT, Result);
+        Result = CodeGenMap[N] =
+          SDOperand(CurDAG->getTargetNode(Opc, VT, Result), 0);
       return;
     }
   }