diff --git a/support/tools/TableGen/CodeEmitterGen.cpp b/support/tools/TableGen/CodeEmitterGen.cpp
index 0d378871e8c..90474cf4c02 100644
--- a/support/tools/TableGen/CodeEmitterGen.cpp
+++ b/support/tools/TableGen/CodeEmitterGen.cpp
@@ -18,9 +18,10 @@ void CodeEmitterGen::createEmitter(std::ostream &o) {
   std::string ClassName = "SparcV9CodeEmitter::";
 
   //const std::string &Namespace = Inst->getValue("Namespace")->getName();
-  o << "unsigned " << ClassName
+  o << "static unsigned " << ClassName
     << "getBinaryCodeForInstr(MachineInstr &MI) {\n"
     << "  unsigned Value = 0;\n"
+    << "  std::cerr << MI;\n"
     << "  switch (MI.getOpcode()) {\n";
   for (std::vector<Record*>::iterator I = Insts.begin(), E = Insts.end();
        I != E; ++I)
@@ -38,18 +39,25 @@ void CodeEmitterGen::createEmitter(std::ostream &o) {
     unsigned Value = 0;
     const std::vector<RecordVal> &Vals = R->getValues();
 
+    o << "      // prefilling: ";
     // Start by filling in fixed values...
-    for (unsigned i = 0, e = BI->getNumBits(); i != e; ++i)
-      if (BitInit *B = dynamic_cast<BitInit*>(BI->getBit(i)))
-        Value |= B->getValue() << i;
+    for (unsigned i = 0, e = BI->getNumBits(); i != e; ++i) {
+      if (BitInit *B = dynamic_cast<BitInit*>(BI->getBit(e-i-1))) {
+        Value |= B->getValue() << (e-i-1);
+        o << B->getValue();
+      } else {
+        o << "0";
+      }
+    }
+    o << "\n\n";
 
-    o << "      Value = " << Value << "U;\n";
-    o << "      // " << *InstVal << "\n";
+    o << "      // " << *InstVal << "\n\n";
+    o << "      Value = " << Value << "U;\n\n";
     
     // Loop over all of the fields in the instruction adding in any
     // contributions to this value (due to bit references).
     //
-    unsigned Offset = 31, opNum=0;
+    unsigned op = 0;
     std::map<const std::string,unsigned> OpOrder;
     for (unsigned i = 0, e = Vals.size(); i != e; ++i) {
       if (Vals[i].getName() != "Inst" && 
@@ -58,11 +66,15 @@ void CodeEmitterGen::createEmitter(std::ostream &o) {
           Vals[i].getName() != "cc" &&
           Vals[i].getName() != "predict")
       {
-        o << "      // " << opNum << ": " << Vals[i].getName() << "\n";
-        OpOrder[Vals[i].getName()] = opNum++;
+        o << "      // op" << op << ": " << Vals[i].getName() << "\n"
+          << "      int64_t op" << op 
+          <<" = getMachineOpValue(MI.getOperand("<<op<<"));\n";
+        //<< "      MachineOperand &op" << op <<" = MI.getOperand("<<op<<");\n";
+        OpOrder[Vals[i].getName()] = op++;
       }
     }
 
+    unsigned Offset = 31;
     for (int f = Vals.size()-1; f >= 0; --f) {
       if (Vals[f].getPrefix()) {
         BitsInit *FieldInitializer = (BitsInit*)Vals[f].getValue();
@@ -70,7 +82,6 @@ void CodeEmitterGen::createEmitter(std::ostream &o) {
         // Scan through the field looking for bit initializers of the current
         // variable...
         for (int i = FieldInitializer->getNumBits()-1; i >= 0; --i) {
-          
           if (BitInit *BI=dynamic_cast<BitInit*>(FieldInitializer->getBit(i))){
             --Offset;
           } else if (UnsetInit *UI = 
@@ -80,26 +91,32 @@ void CodeEmitterGen::createEmitter(std::ostream &o) {
                      dynamic_cast<VarBitInit*>(FieldInitializer->getBit(i))) {
             TypedInit *TI = VBI->getVariable();
             if (VarInit *VI = dynamic_cast<VarInit*>(TI)) {
-              o << "      Value |= getValueBit(MI.getOperand(" 
-                << OpOrder[VI->getName()]
-                << "), " << VBI->getBitNum()
+              o << "      Value |= getValueBit(op" << OpOrder[VI->getName()]
+                << ", " << VBI->getBitNum()
                 << ")" << " << " << Offset << ";\n";
               --Offset;
             } else if (FieldInit *FI = dynamic_cast<FieldInit*>(TI)) {
               // FIXME: implement this!
               o << "FIELD INIT not implemented yet!\n";
             } else {
-              o << "something else\n";
+              o << "Error: UNIMPLEMENTED\n";
             }
           }
-        }
+        } 
+      } else {
+        if (Vals[f].getName() == "annul" || Vals[f].getName() == "cc" ||
+            Vals[f].getName() == "predict")
+          --Offset;
       }
     }
 
     o << "      break;\n"
       << "    }\n";
   }
-  o << "  }\n"
+  o << "  default:\n"
+    << "    std::cerr << \"Not supported instr: \" << MI << \"\\n\";\n"
+    << "    abort();\n"
+    << "  }\n"
     << "  return Value;\n"
     << "}\n";
 }
diff --git a/utils/TableGen/CodeEmitterGen.cpp b/utils/TableGen/CodeEmitterGen.cpp
index 0d378871e8c..90474cf4c02 100644
--- a/utils/TableGen/CodeEmitterGen.cpp
+++ b/utils/TableGen/CodeEmitterGen.cpp
@@ -18,9 +18,10 @@ void CodeEmitterGen::createEmitter(std::ostream &o) {
   std::string ClassName = "SparcV9CodeEmitter::";
 
   //const std::string &Namespace = Inst->getValue("Namespace")->getName();
-  o << "unsigned " << ClassName
+  o << "static unsigned " << ClassName
     << "getBinaryCodeForInstr(MachineInstr &MI) {\n"
     << "  unsigned Value = 0;\n"
+    << "  std::cerr << MI;\n"
     << "  switch (MI.getOpcode()) {\n";
   for (std::vector<Record*>::iterator I = Insts.begin(), E = Insts.end();
        I != E; ++I)
@@ -38,18 +39,25 @@ void CodeEmitterGen::createEmitter(std::ostream &o) {
     unsigned Value = 0;
     const std::vector<RecordVal> &Vals = R->getValues();
 
+    o << "      // prefilling: ";
     // Start by filling in fixed values...
-    for (unsigned i = 0, e = BI->getNumBits(); i != e; ++i)
-      if (BitInit *B = dynamic_cast<BitInit*>(BI->getBit(i)))
-        Value |= B->getValue() << i;
+    for (unsigned i = 0, e = BI->getNumBits(); i != e; ++i) {
+      if (BitInit *B = dynamic_cast<BitInit*>(BI->getBit(e-i-1))) {
+        Value |= B->getValue() << (e-i-1);
+        o << B->getValue();
+      } else {
+        o << "0";
+      }
+    }
+    o << "\n\n";
 
-    o << "      Value = " << Value << "U;\n";
-    o << "      // " << *InstVal << "\n";
+    o << "      // " << *InstVal << "\n\n";
+    o << "      Value = " << Value << "U;\n\n";
     
     // Loop over all of the fields in the instruction adding in any
     // contributions to this value (due to bit references).
     //
-    unsigned Offset = 31, opNum=0;
+    unsigned op = 0;
     std::map<const std::string,unsigned> OpOrder;
     for (unsigned i = 0, e = Vals.size(); i != e; ++i) {
       if (Vals[i].getName() != "Inst" && 
@@ -58,11 +66,15 @@ void CodeEmitterGen::createEmitter(std::ostream &o) {
           Vals[i].getName() != "cc" &&
           Vals[i].getName() != "predict")
       {
-        o << "      // " << opNum << ": " << Vals[i].getName() << "\n";
-        OpOrder[Vals[i].getName()] = opNum++;
+        o << "      // op" << op << ": " << Vals[i].getName() << "\n"
+          << "      int64_t op" << op 
+          <<" = getMachineOpValue(MI.getOperand("<<op<<"));\n";
+        //<< "      MachineOperand &op" << op <<" = MI.getOperand("<<op<<");\n";
+        OpOrder[Vals[i].getName()] = op++;
       }
     }
 
+    unsigned Offset = 31;
     for (int f = Vals.size()-1; f >= 0; --f) {
       if (Vals[f].getPrefix()) {
         BitsInit *FieldInitializer = (BitsInit*)Vals[f].getValue();
@@ -70,7 +82,6 @@ void CodeEmitterGen::createEmitter(std::ostream &o) {
         // Scan through the field looking for bit initializers of the current
         // variable...
         for (int i = FieldInitializer->getNumBits()-1; i >= 0; --i) {
-          
           if (BitInit *BI=dynamic_cast<BitInit*>(FieldInitializer->getBit(i))){
             --Offset;
           } else if (UnsetInit *UI = 
@@ -80,26 +91,32 @@ void CodeEmitterGen::createEmitter(std::ostream &o) {
                      dynamic_cast<VarBitInit*>(FieldInitializer->getBit(i))) {
             TypedInit *TI = VBI->getVariable();
             if (VarInit *VI = dynamic_cast<VarInit*>(TI)) {
-              o << "      Value |= getValueBit(MI.getOperand(" 
-                << OpOrder[VI->getName()]
-                << "), " << VBI->getBitNum()
+              o << "      Value |= getValueBit(op" << OpOrder[VI->getName()]
+                << ", " << VBI->getBitNum()
                 << ")" << " << " << Offset << ";\n";
               --Offset;
             } else if (FieldInit *FI = dynamic_cast<FieldInit*>(TI)) {
               // FIXME: implement this!
               o << "FIELD INIT not implemented yet!\n";
             } else {
-              o << "something else\n";
+              o << "Error: UNIMPLEMENTED\n";
             }
           }
-        }
+        } 
+      } else {
+        if (Vals[f].getName() == "annul" || Vals[f].getName() == "cc" ||
+            Vals[f].getName() == "predict")
+          --Offset;
       }
     }
 
     o << "      break;\n"
       << "    }\n";
   }
-  o << "  }\n"
+  o << "  default:\n"
+    << "    std::cerr << \"Not supported instr: \" << MI << \"\\n\";\n"
+    << "    abort();\n"
+    << "  }\n"
     << "  return Value;\n"
     << "}\n";
 }