[llvm-commits] [llvm] r97516 - in /llvm/trunk: lib/Target/X86/X86ISelDAGToDAG.cpp utils/TableGen/DAGISelMatcherEmitter.cpp

[Chris Lattner]

Author: lattner
Date: Mon Mar  1 16:51:11 2010
New Revision: 97516

URL: http://llvm.org/viewvc/llvm-project?rev=97516&view=rev
Log:
remove a little hack I did for the old isel, not needed
now that it is gone.

Modified:
    llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp
    llvm/trunk/utils/TableGen/DAGISelMatcherEmitter.cpp

Modified: llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp?rev=97516&r1=97515&r2=97516&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp Mon Mar  1 16:51:11 2010
@@ -198,26 +198,12 @@
                        SDValue &Scale, SDValue &Index, SDValue &Disp);
     bool SelectTLSADDRAddr(SDNode *Op, SDValue N, SDValue &Base,
                        SDValue &Scale, SDValue &Index, SDValue &Disp);
-    bool SelectScalarSSELoadXXX(SDNode *Root, SDValue N,
+    bool SelectScalarSSELoad(SDNode *Root, SDValue N,
                              SDValue &Base, SDValue &Scale,
                              SDValue &Index, SDValue &Disp,
                              SDValue &Segment,
                              SDValue &NodeWithChain);
     
-    // FIXME: Remove this hacky wrapper.
-    bool SelectScalarSSELoad(SDNode *Root, SDValue N, SDValue &Base,
-                             SDValue &Scale, SDValue &Index,
-                             SDValue &Disp, SDValue &Segment,
-                             SDValue &PatternChainResult,
-                             SDValue &PatternInputChain) {
-      SDValue Tmp;
-      if (!SelectScalarSSELoadXXX(Root, N, Base, Scale, Index, Disp, Segment,
-                                  Tmp))
-        return false;
-      PatternInputChain = Tmp.getOperand(0);
-      PatternChainResult = Tmp.getValue(1);
-      return true;
-    }
     bool TryFoldLoad(SDNode *P, SDValue N,
                      SDValue &Base, SDValue &Scale,
                      SDValue &Index, SDValue &Disp,
@@ -1317,7 +1303,7 @@
 /// We also return:
 ///   PatternChainNode: this is the matched node that has a chain input and
 ///   output.
-bool X86DAGToDAGISel::SelectScalarSSELoadXXX(SDNode *Root,
+bool X86DAGToDAGISel::SelectScalarSSELoad(SDNode *Root,
                                           SDValue N, SDValue &Base,
                                           SDValue &Scale, SDValue &Index,
                                           SDValue &Disp, SDValue &Segment,

Modified: llvm/trunk/utils/TableGen/DAGISelMatcherEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/DAGISelMatcherEmitter.cpp?rev=97516&r1=97515&r2=97516&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/DAGISelMatcherEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/DAGISelMatcherEmitter.cpp Mon Mar  1 16:51:11 2010
@@ -608,10 +608,6 @@
       OS << "    Result.resize(Result.size()+" << NumOps << ");\n";
       OS << "    return "  << P.getSelectFunc();
 
-      // FIXME: Temporary hack until old isel dies.
-      if (P.hasProperty(SDNPHasChain))
-        OS << "XXX";
-      
       OS << "(Root, N";
       for (unsigned i = 0; i != NumOps; ++i)
         OS << ", Result[Result.size()-" << (NumOps-i) << ']';