Adjust #includes to compensate for lost of DerivedTypes.h in

[oota-llvm.git] / utils / TableGen / InstrInfoEmitter.cpp

diff --git a/utils/TableGen/InstrInfoEmitter.cpp b/utils/TableGen/InstrInfoEmitter.cpp
index 07aaf91861e25e5bd228f5da16f3b7d0d17cd544..3d4da0ee288d114cf9bcef878b4ff8190f0a29e3 100644 (file)
--- a/utils/TableGen/InstrInfoEmitter.cpp
+++ b/utils/TableGen/InstrInfoEmitter.cpp
@@ -37,7 +37,7 @@ void InstrInfoEmitter::runEnums(std::ostream &OS) {
   }
   
   if (Namespace.empty()) {
-    std::cerr << "No instructions defined!\n";
+    cerr << "No instructions defined!\n";
     exit(1);
   }
 
@@ -197,7 +197,9 @@ void InstrInfoEmitter::emitRecord(const CodeGenInstruction &Inst, unsigned Num,
   else
     MinOperands = 0;
   
-  OS << "  { \"";
+  OS << "  { ";
+  OS << Num << ",\t" << MinOperands << ",\t\"";
+
   if (Inst.Name.empty())
     OS << Inst.TheDef->getName();
   else
@@ -206,8 +208,7 @@ void InstrInfoEmitter::emitRecord(const CodeGenInstruction &Inst, unsigned Num,
   unsigned ItinClass = !IsItineraries ? 0 :
             ItinClassNumber(Inst.TheDef->getValueAsDef("Itinerary")->getName());
   
-  OS << "\",\t" << MinOperands << ", " << ItinClass
-     << ", 0";
+  OS << "\",\t" << ItinClass << ", 0";
 
   // Try to determine (from the pattern), if the instruction is a store.
   bool isStore = false;
@@ -348,7 +349,7 @@ void InstrInfoEmitter::emitShiftedValue(Record *R, StringInit *Val,
     return;
   }
 
-  std::cerr << "Unhandled initializer: " << *Val << "\n";
+  cerr << "Unhandled initializer: " << *Val << "\n";
   throw "In record '" + R->getName() + "' for TSFlag emission.";
 }