diff --git a/support/tools/TableGen/InstrInfoEmitter.cpp b/support/tools/TableGen/InstrInfoEmitter.cpp
index cc2d74fa8d4..761bdeef0c8 100644
--- a/support/tools/TableGen/InstrInfoEmitter.cpp
+++ b/support/tools/TableGen/InstrInfoEmitter.cpp
@@ -44,22 +44,136 @@ void InstrInfoEmitter::runEnums(std::ostream &OS) {
     OS << "namespace " << Namespace << " {\n";
   OS << "  enum {\n";
 
-  // We must emit the PHI and NOOP opcodes first...
+  // We must emit the PHI opcode first...
   Record *Target = getTarget(Records);
   Record *InstrInfo = Target->getValueAsDef("InstructionSet");
-
   Record *PHI = InstrInfo->getValueAsDef("PHIInst");
-  Record *NOOP = InstrInfo->getValueAsDef("NOOPInst");
 
-  OS << "    " << PHI->getName() << ", \t// 0 (fixed for all targets)\n"
-     << "    " << NOOP->getName() << ", \t// 1 (fixed for all targets)\n";
+  OS << "    " << PHI->getName() << ", \t// 0 (fixed for all targets)\n";
   
   // Print out the rest of the instructions now...
   for (unsigned i = 0, e = Insts.size(); i != e; ++i)
-    if (Insts[i] != PHI && Insts[i] != NOOP)
-      OS << "    " << Insts[i]->getName() << ", \t// " << i+2 << "\n";
+    if (Insts[i] != PHI)
+      OS << "    " << Insts[i]->getName() << ", \t// " << i+1 << "\n";
   
   OS << "  };\n";
   if (!Namespace.empty())
     OS << "}\n";
 }
+
+static void printDefList(ListInit *LI, const std::string &Name,
+                         std::ostream &OS) {
+  OS << "static const unsigned " << Name << "[] = { ";
+  for (unsigned j = 0, e = LI->getSize(); j != e; ++j)
+    if (DefInit *DI = dynamic_cast<DefInit*>(LI->getElement(j)))
+      OS << getQualifiedName(DI->getDef()) << ", ";
+    else
+      throw "Illegal value in '" + Name + "' list!";
+  OS << "0 };\n";
+}
+
+
+// run - Emit the main instruction description records for the target...
+void InstrInfoEmitter::run(std::ostream &OS) {
+  EmitSourceHeader("Target Instruction Descriptors", OS);
+  Record *Target = getTarget(Records);
+  const std::string &TargetName = Target->getName();
+  Record *InstrInfo = Target->getValueAsDef("InstructionSet");
+  Record *PHI = InstrInfo->getValueAsDef("PHIInst");
+
+  std::vector<Record*> Instructions =
+    Records.getAllDerivedDefinitions("Instruction");
+  
+  // Emit all of the instruction's implicit uses and defs...
+  for (unsigned i = 0, e = Instructions.size(); i != e; ++i) {
+    Record *Inst = Instructions[i];
+    ListInit *LI = Inst->getValueAsListInit("Uses");
+    if (LI->getSize()) printDefList(LI, Inst->getName()+"ImpUses", OS);
+    LI = Inst->getValueAsListInit("Defs");
+    if (LI->getSize()) printDefList(LI, Inst->getName()+"ImpDefs", OS);
+  }
+
+  OS << "\nstatic const TargetInstrDescriptor " << TargetName
+     << "Insts[] = {\n";
+  emitRecord(PHI, 0, InstrInfo, OS);
+
+  for (unsigned i = 0, e = Instructions.size(); i != e; ++i)
+    if (Instructions[i] != PHI)
+      emitRecord(Instructions[i], i+1, InstrInfo, OS);
+  OS << "};\n";
+}
+
+void InstrInfoEmitter::emitRecord(Record *R, unsigned Num, Record *InstrInfo,
+                                  std::ostream &OS) {
+  OS << "  { \"" << R->getValueAsString("Name")
+     << "\",\t-1, -1, 0, false, 0, 0, 0, 0";
+
+  // Emit all of the target indepedent flags...
+  if (R->getValueAsBit("isReturn"))     OS << "|M_RET_FLAG";
+  if (R->getValueAsBit("isBranch"))     OS << "|M_BRANCH_FLAG";
+  if (R->getValueAsBit("isCall"  ))     OS << "|M_CALL_FLAG";
+  if (R->getValueAsBit("isTwoAddress")) OS << "|M_2_ADDR_FLAG";
+  if (R->getValueAsBit("isTerminator")) OS << "|M_TERMINATOR_FLAG";
+  OS << ", 0";
+
+  // Emit all of the target-specific flags...
+  ListInit *LI    = InstrInfo->getValueAsListInit("TSFlagsFields");
+  ListInit *Shift = InstrInfo->getValueAsListInit("TSFlagsShifts");
+  if (LI->getSize() != Shift->getSize())
+    throw "Lengths of " + InstrInfo->getName() +
+          ":(TargetInfoFields, TargetInfoPositions) must be equal!";
+
+  for (unsigned i = 0, e = LI->getSize(); i != e; ++i)
+    emitShiftedValue(R, dynamic_cast<StringInit*>(LI->getElement(i)),
+                     dynamic_cast<IntInit*>(Shift->getElement(i)), OS);
+
+  OS << ", ";
+
+  // Emit the implicit uses and defs lists...
+  LI = R->getValueAsListInit("Uses");
+  if (!LI->getSize())
+    OS << "0, ";
+  else 
+    OS << R->getName() << "ImpUses, ";
+
+  LI = R->getValueAsListInit("Defs");
+  if (!LI->getSize())
+    OS << "0 ";
+  else 
+    OS << R->getName() << "ImpDefs ";
+
+  OS << " },  // Inst #" << Num << " = " << R->getName() << "\n";
+}
+
+void InstrInfoEmitter::emitShiftedValue(Record *R, StringInit *Val,
+                                        IntInit *ShiftInt, std::ostream &OS) {
+  if (Val == 0 || ShiftInt == 0)
+    throw std::string("Illegal value or shift amount in TargetInfo*!");
+  RecordVal *RV = R->getValue(Val->getValue());
+  int Shift = ShiftInt->getValue();
+
+  if (RV == 0 || RV->getValue() == 0)
+    throw R->getName() + " doesn't have a field named '" + Val->getValue()+"'!";
+
+  Init *Value = RV->getValue();
+  if (BitInit *BI = dynamic_cast<BitInit*>(Value)) {
+    if (BI->getValue()) OS << "|(1<<" << Shift << ")";
+    return;
+  } else if (BitsInit *BI = dynamic_cast<BitsInit*>(Value)) {
+    // Convert the Bits to an integer to print...
+    Init *I = BI->convertInitializerTo(new IntRecTy());
+    if (I)
+      if (IntInit *II = dynamic_cast<IntInit*>(I)) {
+        if (II->getValue())
+          OS << "|(" << II->getValue() << "<<" << Shift << ")";
+        return;
+      }
+
+  } else if (IntInit *II = dynamic_cast<IntInit*>(Value)) {
+    if (II->getValue()) OS << "|(" << II->getValue() << "<<" << Shift << ")";
+    return;
+  }
+
+  std::cerr << "Unhandled initializer: " << *Val << "\n";
+  throw "In record '" + R->getName() + "' for TSFlag emission.";
+}
diff --git a/support/tools/TableGen/InstrInfoEmitter.h b/support/tools/TableGen/InstrInfoEmitter.h
index bf7e6758a57..0415f043ce4 100644
--- a/support/tools/TableGen/InstrInfoEmitter.h
+++ b/support/tools/TableGen/InstrInfoEmitter.h
@@ -10,6 +10,9 @@
 
 #include <iosfwd>
 class RecordKeeper;
+class Record;
+class StringInit;
+class IntInit;
 
 class InstrInfoEmitter {
   RecordKeeper &Records;
@@ -17,10 +20,14 @@ public:
   InstrInfoEmitter(RecordKeeper &R) : Records(R) {}
   
   // run - Output the instruction set description, returning true on failure.
-  void run(std::ostream &o);
+  void run(std::ostream &OS);
 
   // runEnums - Print out enum values for all of the instructions.
-  void runEnums(std::ostream &o);
+  void runEnums(std::ostream &OS);
+private:
+  void emitRecord(Record *R, unsigned Num, Record *InstrInfo, std::ostream &OS);
+  void emitShiftedValue(Record *R, StringInit *Val, IntInit *Shift,
+                        std::ostream &OS);
 };
 
 #endif
diff --git a/utils/TableGen/InstrInfoEmitter.cpp b/utils/TableGen/InstrInfoEmitter.cpp
index cc2d74fa8d4..761bdeef0c8 100644
--- a/utils/TableGen/InstrInfoEmitter.cpp
+++ b/utils/TableGen/InstrInfoEmitter.cpp
@@ -44,22 +44,136 @@ void InstrInfoEmitter::runEnums(std::ostream &OS) {
     OS << "namespace " << Namespace << " {\n";
   OS << "  enum {\n";
 
-  // We must emit the PHI and NOOP opcodes first...
+  // We must emit the PHI opcode first...
   Record *Target = getTarget(Records);
   Record *InstrInfo = Target->getValueAsDef("InstructionSet");
-
   Record *PHI = InstrInfo->getValueAsDef("PHIInst");
-  Record *NOOP = InstrInfo->getValueAsDef("NOOPInst");
 
-  OS << "    " << PHI->getName() << ", \t// 0 (fixed for all targets)\n"
-     << "    " << NOOP->getName() << ", \t// 1 (fixed for all targets)\n";
+  OS << "    " << PHI->getName() << ", \t// 0 (fixed for all targets)\n";
   
   // Print out the rest of the instructions now...
   for (unsigned i = 0, e = Insts.size(); i != e; ++i)
-    if (Insts[i] != PHI && Insts[i] != NOOP)
-      OS << "    " << Insts[i]->getName() << ", \t// " << i+2 << "\n";
+    if (Insts[i] != PHI)
+      OS << "    " << Insts[i]->getName() << ", \t// " << i+1 << "\n";
   
   OS << "  };\n";
   if (!Namespace.empty())
     OS << "}\n";
 }
+
+static void printDefList(ListInit *LI, const std::string &Name,
+                         std::ostream &OS) {
+  OS << "static const unsigned " << Name << "[] = { ";
+  for (unsigned j = 0, e = LI->getSize(); j != e; ++j)
+    if (DefInit *DI = dynamic_cast<DefInit*>(LI->getElement(j)))
+      OS << getQualifiedName(DI->getDef()) << ", ";
+    else
+      throw "Illegal value in '" + Name + "' list!";
+  OS << "0 };\n";
+}
+
+
+// run - Emit the main instruction description records for the target...
+void InstrInfoEmitter::run(std::ostream &OS) {
+  EmitSourceHeader("Target Instruction Descriptors", OS);
+  Record *Target = getTarget(Records);
+  const std::string &TargetName = Target->getName();
+  Record *InstrInfo = Target->getValueAsDef("InstructionSet");
+  Record *PHI = InstrInfo->getValueAsDef("PHIInst");
+
+  std::vector<Record*> Instructions =
+    Records.getAllDerivedDefinitions("Instruction");
+  
+  // Emit all of the instruction's implicit uses and defs...
+  for (unsigned i = 0, e = Instructions.size(); i != e; ++i) {
+    Record *Inst = Instructions[i];
+    ListInit *LI = Inst->getValueAsListInit("Uses");
+    if (LI->getSize()) printDefList(LI, Inst->getName()+"ImpUses", OS);
+    LI = Inst->getValueAsListInit("Defs");
+    if (LI->getSize()) printDefList(LI, Inst->getName()+"ImpDefs", OS);
+  }
+
+  OS << "\nstatic const TargetInstrDescriptor " << TargetName
+     << "Insts[] = {\n";
+  emitRecord(PHI, 0, InstrInfo, OS);
+
+  for (unsigned i = 0, e = Instructions.size(); i != e; ++i)
+    if (Instructions[i] != PHI)
+      emitRecord(Instructions[i], i+1, InstrInfo, OS);
+  OS << "};\n";
+}
+
+void InstrInfoEmitter::emitRecord(Record *R, unsigned Num, Record *InstrInfo,
+                                  std::ostream &OS) {
+  OS << "  { \"" << R->getValueAsString("Name")
+     << "\",\t-1, -1, 0, false, 0, 0, 0, 0";
+
+  // Emit all of the target indepedent flags...
+  if (R->getValueAsBit("isReturn"))     OS << "|M_RET_FLAG";
+  if (R->getValueAsBit("isBranch"))     OS << "|M_BRANCH_FLAG";
+  if (R->getValueAsBit("isCall"  ))     OS << "|M_CALL_FLAG";
+  if (R->getValueAsBit("isTwoAddress")) OS << "|M_2_ADDR_FLAG";
+  if (R->getValueAsBit("isTerminator")) OS << "|M_TERMINATOR_FLAG";
+  OS << ", 0";
+
+  // Emit all of the target-specific flags...
+  ListInit *LI    = InstrInfo->getValueAsListInit("TSFlagsFields");
+  ListInit *Shift = InstrInfo->getValueAsListInit("TSFlagsShifts");
+  if (LI->getSize() != Shift->getSize())
+    throw "Lengths of " + InstrInfo->getName() +
+          ":(TargetInfoFields, TargetInfoPositions) must be equal!";
+
+  for (unsigned i = 0, e = LI->getSize(); i != e; ++i)
+    emitShiftedValue(R, dynamic_cast<StringInit*>(LI->getElement(i)),
+                     dynamic_cast<IntInit*>(Shift->getElement(i)), OS);
+
+  OS << ", ";
+
+  // Emit the implicit uses and defs lists...
+  LI = R->getValueAsListInit("Uses");
+  if (!LI->getSize())
+    OS << "0, ";
+  else 
+    OS << R->getName() << "ImpUses, ";
+
+  LI = R->getValueAsListInit("Defs");
+  if (!LI->getSize())
+    OS << "0 ";
+  else 
+    OS << R->getName() << "ImpDefs ";
+
+  OS << " },  // Inst #" << Num << " = " << R->getName() << "\n";
+}
+
+void InstrInfoEmitter::emitShiftedValue(Record *R, StringInit *Val,
+                                        IntInit *ShiftInt, std::ostream &OS) {
+  if (Val == 0 || ShiftInt == 0)
+    throw std::string("Illegal value or shift amount in TargetInfo*!");
+  RecordVal *RV = R->getValue(Val->getValue());
+  int Shift = ShiftInt->getValue();
+
+  if (RV == 0 || RV->getValue() == 0)
+    throw R->getName() + " doesn't have a field named '" + Val->getValue()+"'!";
+
+  Init *Value = RV->getValue();
+  if (BitInit *BI = dynamic_cast<BitInit*>(Value)) {
+    if (BI->getValue()) OS << "|(1<<" << Shift << ")";
+    return;
+  } else if (BitsInit *BI = dynamic_cast<BitsInit*>(Value)) {
+    // Convert the Bits to an integer to print...
+    Init *I = BI->convertInitializerTo(new IntRecTy());
+    if (I)
+      if (IntInit *II = dynamic_cast<IntInit*>(I)) {
+        if (II->getValue())
+          OS << "|(" << II->getValue() << "<<" << Shift << ")";
+        return;
+      }
+
+  } else if (IntInit *II = dynamic_cast<IntInit*>(Value)) {
+    if (II->getValue()) OS << "|(" << II->getValue() << "<<" << Shift << ")";
+    return;
+  }
+
+  std::cerr << "Unhandled initializer: " << *Val << "\n";
+  throw "In record '" + R->getName() + "' for TSFlag emission.";
+}
diff --git a/utils/TableGen/InstrInfoEmitter.h b/utils/TableGen/InstrInfoEmitter.h
index bf7e6758a57..0415f043ce4 100644
--- a/utils/TableGen/InstrInfoEmitter.h
+++ b/utils/TableGen/InstrInfoEmitter.h
@@ -10,6 +10,9 @@
 
 #include <iosfwd>
 class RecordKeeper;
+class Record;
+class StringInit;
+class IntInit;
 
 class InstrInfoEmitter {
   RecordKeeper &Records;
@@ -17,10 +20,14 @@ public:
   InstrInfoEmitter(RecordKeeper &R) : Records(R) {}
   
   // run - Output the instruction set description, returning true on failure.
-  void run(std::ostream &o);
+  void run(std::ostream &OS);
 
   // runEnums - Print out enum values for all of the instructions.
-  void runEnums(std::ostream &o);
+  void runEnums(std::ostream &OS);
+private:
+  void emitRecord(Record *R, unsigned Num, Record *InstrInfo, std::ostream &OS);
+  void emitShiftedValue(Record *R, StringInit *Val, IntInit *Shift,
+                        std::ostream &OS);
 };
 
 #endif