commit 865359958bc5ebf34297877bcd8e8ee7fc98348a
author Chris Lattner <sabre@nondot.org> Sat May 14 07:45:46 2005 +0000
committer Chris Lattner <sabre@nondot.org> Sat May 14 07:45:46 2005 +0000
tree 6962e2d9997e985adef2bf21570ed56c37e4520b
parent 566307f92ac6415bd42436a6d9cfe8af5305d139

remove special case hacks for readport/readio from the binary operator
codepath

llvm-svn: 22019

llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp

diff --git a/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
index 2f259b1..e611557 100644
--- a/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
@@ -977,9 +977,13 @@
     Tmp1 = LegalizeOp(Node->getOperand(0));
     Tmp2 = LegalizeOp(Node->getOperand(1));
 
-    if (Tmp1 != Node->getOperand(0) || Tmp2 != Node->getOperand(1))
-      Result = DAG.getNode(ISD::READPORT, Node->getValueType(0), Tmp1, Tmp2);
-    else
+    if (Tmp1 != Node->getOperand(0) || Tmp2 != Node->getOperand(1)) {
+      std::vector<MVT::ValueType> VTs(Node->value_begin(), Node->value_end());
+      std::vector<SDOperand> Ops;
+      Ops.push_back(Tmp1);
+      Ops.push_back(Tmp2);
+      Result = DAG.getNode(ISD::READPORT, VTs, Ops);
+    } else
       Result = SDOperand(Node, 0);
     // Since these produce two values, make sure to remember that we legalized
     // both of them.
@@ -1003,10 +1007,13 @@
     case TargetLowering::Custom:
     default: assert(0 && "This action not implemented for this operation!");
     case TargetLowering::Legal:
-      if (Tmp1 != Node->getOperand(0) || Tmp2 != Node->getOperand(1))
-        Result = DAG.getNode(Node->getOpcode(), Node->getValueType(0),
-                             Tmp1, Tmp2);
-      else
+      if (Tmp1 != Node->getOperand(0) || Tmp2 != Node->getOperand(1)) {
+        std::vector<MVT::ValueType> VTs(Node->value_begin(), Node->value_end());
+        std::vector<SDOperand> Ops;
+        Ops.push_back(Tmp1);
+        Ops.push_back(Tmp2);
+        Result = DAG.getNode(ISD::READPORT, VTs, Ops);
+      } else
         Result = SDOperand(Node, 0);
       break;
     case TargetLowering::Expand:

llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp

diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index bfaca1d..c3889dd 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -1215,12 +1215,7 @@
     N = new SDNode(Opcode, N1, N2);
   }
 
-
-  if (Opcode != ISD::READPORT && Opcode != ISD::READIO)
-    N->setValueTypes(VT);
-  else
-    N->setValueTypes(VT, MVT::Other);
-
+  N->setValueTypes(VT);
   AllNodes.push_back(N);
   return SDOperand(N, 0);
 }