Stop special-casing annul and predict bits (which are Sparc-specific anyway)

since those bits are now hard-coded in Sparc*.td files.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@7593 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 2 insertions, 16 deletions

diff --git a/support/tools/TableGen/CodeEmitterGen.cpp b/support/tools/TableGen/CodeEmitterGen.cpp
index b98e712..b3928b8 100644
--- a/support/tools/TableGen/CodeEmitterGen.cpp
+++ b/support/tools/TableGen/CodeEmitterGen.cpp
@@ -53,9 +53,7 @@ void CodeEmitterGen::run(std::ostream &o) {
     std::map<std::string, unsigned> OpOrder;
     std::map<std::string, bool> OpContinuous;
     for (unsigned i = 0, e = Vals.size(); i != e; ++i) {
-      if (!Vals[i].getPrefix() &&  !Vals[i].getValue()->isComplete() &&
-          // ignore annul and predict bits since no one sets them yet
-          Vals[i].getName() != "annul" && Vals[i].getName() != "predict") {
+      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 BitsInit *InstInit = BI;
@@ -199,11 +197,6 @@ void CodeEmitterGen::run(std::ostream &o) {
             }
           }
         }
-      } else {
-        // ignore annul and predict bits since no one sets them yet
-        if (Vals[f].getName() == "annul" || Vals[f].getName() == "predict") {
-          o << "      // found " << Vals[f].getName() << "\n";
-        }
       }
     }
 
diff --git a/utils/TableGen/CodeEmitterGen.cpp b/utils/TableGen/CodeEmitterGen.cpp
index b98e712..b3928b8 100644
--- a/utils/TableGen/CodeEmitterGen.cpp
+++ b/utils/TableGen/CodeEmitterGen.cpp
@@ -53,9 +53,7 @@ void CodeEmitterGen::run(std::ostream &o) {
     std::map<std::string, unsigned> OpOrder;
     std::map<std::string, bool> OpContinuous;
     for (unsigned i = 0, e = Vals.size(); i != e; ++i) {
-      if (!Vals[i].getPrefix() &&  !Vals[i].getValue()->isComplete() &&
-          // ignore annul and predict bits since no one sets them yet
-          Vals[i].getName() != "annul" && Vals[i].getName() != "predict") {
+      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 BitsInit *InstInit = BI;
@@ -199,11 +197,6 @@ void CodeEmitterGen::run(std::ostream &o) {
             }
           }
         }
-      } else {
-        // ignore annul and predict bits since no one sets them yet
-        if (Vals[f].getName() == "annul" || Vals[f].getName() == "predict") {
-          o << "      // found " << Vals[f].getName() << "\n";
-        }
       }
     }