[llvm-commits] [llvm] r97429 - in /llvm/trunk/utils/TableGen: DAGISelMatcher.h DAGISelMatcherEmitter.cpp DAGISelMatcherOpt.cpp

[Chris Lattner]

Author: lattner
Date: Sun Feb 28 17:00:47 2010
New Revision: 97429

URL: http://llvm.org/viewvc/llvm-project?rev=97429&view=rev
Log:
simplify some code now that chain/flag results are not stored in 
the vtlist for emitnode.

Modified:
    llvm/trunk/utils/TableGen/DAGISelMatcher.h
    llvm/trunk/utils/TableGen/DAGISelMatcherEmitter.cpp
    llvm/trunk/utils/TableGen/DAGISelMatcherOpt.cpp

Modified: llvm/trunk/utils/TableGen/DAGISelMatcher.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/DAGISelMatcher.h?rev=97429&r1=97428&r2=97429&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/DAGISelMatcher.h (original)
+++ llvm/trunk/utils/TableGen/DAGISelMatcher.h Sun Feb 28 17:00:47 2010
@@ -902,15 +902,6 @@
     return VTs[i];
   }
 
-  /// getNumNonChainFlagVTs - Return the number of normal results that this node
-  /// will have, ignoring flag and chain results.
-  unsigned getNumNonChainFlagVTs() const {
-    for (unsigned i = 0, e = getNumVTs(); i != e; ++i)
-      if (VTs[i] == MVT::Flag || VTs[i] == MVT::Other)
-        return i;
-    return getNumVTs();
-  }
-  
   unsigned getNumOperands() const { return Operands.size(); }
   unsigned getOperand(unsigned i) const {
     assert(i < Operands.size());

Modified: llvm/trunk/utils/TableGen/DAGISelMatcherEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/DAGISelMatcherEmitter.cpp?rev=97429&r1=97428&r2=97429&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/DAGISelMatcherEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/DAGISelMatcherEmitter.cpp Sun Feb 28 17:00:47 2010
@@ -372,7 +372,7 @@
     
     // Print the result #'s for EmitNode.
     if (const EmitNodeMatcher *E = dyn_cast<EmitNodeMatcher>(EN)) {
-      if (unsigned NumResults = EN->getNumNonChainFlagVTs()) {
+      if (unsigned NumResults = EN->getNumVTs()) {
         OS.PadToColumn(CommentIndent) << "// Results = ";
         unsigned First = E->getFirstResultSlot();
         for (unsigned i = 0; i != NumResults; ++i)

Modified: llvm/trunk/utils/TableGen/DAGISelMatcherOpt.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/DAGISelMatcherOpt.cpp?rev=97429&r1=97428&r2=97429&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/DAGISelMatcherOpt.cpp (original)
+++ llvm/trunk/utils/TableGen/DAGISelMatcherOpt.cpp Sun Feb 28 17:00:47 2010
@@ -65,7 +65,9 @@
       MatcherPtr.reset(MP->takeNext());
       return ContractNodes(MatcherPtr, CGP);
     }
-  
+
+  // FIXME: Handle OPC_MarkFlagResults.
+
   // Turn EmitNode->CompleteMatch into MorphNodeTo if we can.
   if (EmitNodeMatcher *EN = dyn_cast<EmitNodeMatcher>(N))
     if (CompleteMatchMatcher *CM =
@@ -120,8 +122,6 @@
         return;
       }
 
-      // FIXME: Handle OPC_MarkFlagResults.
-      
       // FIXME2: Kill off all the SelectionDAG::MorphNodeTo and getMachineNode
       // variants.
     }