[llvm-commits] [llvm] r90628 - in /llvm/trunk/utils/TableGen: CodeEmitterGen.cpp CodeEmitterGen.h

[Dan Gohman]

Author: djg
Date: Fri Dec  4 18:05:43 2009
New Revision: 90628

URL: http://llvm.org/viewvc/llvm-project?rev=90628&view=rev
Log:
Minor code simplification.

Modified:
    llvm/trunk/utils/TableGen/CodeEmitterGen.cpp
    llvm/trunk/utils/TableGen/CodeEmitterGen.h

Modified: llvm/trunk/utils/TableGen/CodeEmitterGen.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/CodeEmitterGen.cpp?rev=90628&r1=90627&r2=90628&view=diff

==============================================================================
--- llvm/trunk/utils/TableGen/CodeEmitterGen.cpp (original)
+++ llvm/trunk/utils/TableGen/CodeEmitterGen.cpp Fri Dec  4 18:05:43 2009
@@ -61,14 +61,11 @@
 
 // If the VarBitInit at position 'bit' matches the specified variable then
 // return the variable bit position.  Otherwise return -1.
-int CodeEmitterGen::getVariableBit(const std::string &VarName,
+int CodeEmitterGen::getVariableBit(const Init *VarVal,
             BitsInit *BI, int bit) {
   if (VarBitInit *VBI = dynamic_cast<VarBitInit*>(BI->getBit(bit))) {
     TypedInit *TI = VBI->getVariable();
-    
-    if (VarInit *VI = dynamic_cast<VarInit*>(TI)) {
-      if (VI->getName() == VarName) return VBI->getBitNum();
-    }
+    if (TI == VarVal) return VBI->getBitNum();
   }
   
   return -1;
@@ -162,11 +159,11 @@
       if (!Vals[i].getPrefix() && !Vals[i].getValue()->isComplete()) {
         // Is the operand continuous? If so, we can just mask and OR it in
         // instead of doing it bit-by-bit, saving a lot in runtime cost.
-        const std::string &VarName = Vals[i].getName();
+        const Init *VarVal = Vals[i].getValue();
         bool gotOp = false;
         
         for (int bit = BI->getNumBits()-1; bit >= 0; ) {
-          int varBit = getVariableBit(VarName, BI, bit);
+          int varBit = getVariableBit(VarVal, BI, bit);
           
           if (varBit == -1) {
             --bit;
@@ -176,7 +173,7 @@
             int N = 1;
             
             for (--bit; bit >= 0;) {
-              varBit = getVariableBit(VarName, BI, bit);
+              varBit = getVariableBit(VarVal, BI, bit);
               if (varBit == -1 || varBit != (beginVarBit - N)) break;
               ++N;
               --bit;
@@ -188,7 +185,7 @@
               while (CGI.isFlatOperandNotEmitted(op))
                 ++op;
               
-              Case += "      // op: " + VarName + "\n"
+              Case += "      // op: " + Vals[i].getName() + "\n"
                    +  "      op = getMachineOpValue(MI, MI.getOperand("
                    +  utostr(op++) + "));\n";
               gotOp = true;

Modified: llvm/trunk/utils/TableGen/CodeEmitterGen.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/CodeEmitterGen.h?rev=90628&r1=90627&r2=90628&view=diff

==============================================================================
--- llvm/trunk/utils/TableGen/CodeEmitterGen.h (original)
+++ llvm/trunk/utils/TableGen/CodeEmitterGen.h Fri Dec  4 18:05:43 2009
@@ -23,6 +23,7 @@
 
 class RecordVal;
 class BitsInit;
+class Init;
 
 class CodeEmitterGen : public TableGenBackend {
   RecordKeeper &Records;
@@ -35,7 +36,7 @@
   void emitMachineOpEmitter(raw_ostream &o, const std::string &Namespace);
   void emitGetValueBit(raw_ostream &o, const std::string &Namespace);
   void reverseBits(std::vector<Record*> &Insts);
-  int getVariableBit(const std::string &VarName, BitsInit *BI, int bit);
+  int getVariableBit(const Init *VarVal, BitsInit *BI, int bit);
 };
 
 } // End llvm namespace