[llvm-commits] CVS: llvm/utils/TableGen/CodeEmitterGen.cpp CodeEmitterGen.h TableGen.cpp

[Chris Lattner]

Changes in directory llvm/utils/TableGen:

CodeEmitterGen.cpp updated: 1.13 -> 1.14
CodeEmitterGen.h updated: 1.2 -> 1.3
TableGen.cpp updated: 1.7 -> 1.8

---
Log message:

Don't crash if there is no Inst class in the tablegen file!


---
Diffs of the changes:

Index: llvm/utils/TableGen/CodeEmitterGen.cpp
diff -u llvm/utils/TableGen/CodeEmitterGen.cpp:1.13 llvm/utils/TableGen/CodeEmitterGen.cpp:1.14
--- llvm/utils/TableGen/CodeEmitterGen.cpp:1.13	Fri Jul 18 13:03:45 2003
+++ llvm/utils/TableGen/CodeEmitterGen.cpp	Tue Jul 29 18:00:08 2003
@@ -2,7 +2,7 @@
 #include "Record.h"
 #include "CodeEmitterGen.h"
 
-void CodeEmitterGen::createEmitter(std::ostream &o) {
+int CodeEmitterGen::createEmitter(std::ostream &o) {
   std::vector<Record*> Insts;
 
   const std::map<std::string, Record*> &Defs = Records.getDefs();
@@ -31,8 +31,12 @@
       << "      DEBUG(std::cerr << \"Emitting " << R->getName() << "\\n\");\n";
 
     const RecordVal *InstVal = R->getValue("Inst");
-    Init *InitVal = InstVal->getValue();
+    if (!InstVal) {
+      std::cerr << "No 'Inst' record found in target description file!\n";
+      return 1;
+    }
 
+    Init *InitVal = InstVal->getValue();
     assert(dynamic_cast<BitsInit*>(InitVal) &&
            "Can only handle undefined bits<> types!");
     BitsInit *BI = (BitsInit*)InitVal;
@@ -225,4 +229,5 @@
     << "  }\n"
     << "  return Value;\n"
     << "}\n";
+  return 0;
 }


Index: llvm/utils/TableGen/CodeEmitterGen.h
diff -u llvm/utils/TableGen/CodeEmitterGen.h:1.2 llvm/utils/TableGen/CodeEmitterGen.h:1.3
--- llvm/utils/TableGen/CodeEmitterGen.h:1.2	Fri Jun  6 18:06:20 2003
+++ llvm/utils/TableGen/CodeEmitterGen.h	Tue Jul 29 18:00:08 2003
@@ -15,7 +15,7 @@
 public:
   CodeEmitterGen(RecordKeeper &R) : Records(R) {}
   
-  void createEmitter(std::ostream &o);
+  int createEmitter(std::ostream &o);
   void emitMachineOpEmitter(std::ostream &o, const std::string &Namespace);
   void emitGetValueBit(std::ostream &o, const std::string &Namespace);
 };


Index: llvm/utils/TableGen/TableGen.cpp
diff -u llvm/utils/TableGen/TableGen.cpp:1.7 llvm/utils/TableGen/TableGen.cpp:1.8
--- llvm/utils/TableGen/TableGen.cpp:1.7	Tue Jun  3 00:07:28 2003
+++ llvm/utils/TableGen/TableGen.cpp	Tue Jul 29 18:00:08 2003
@@ -394,10 +394,12 @@
     RemoveFileOnSignal(OutputFilename);
   }
 
+  int ErrorCode = 0;
+
   switch (Action) {
   case Parse: ParseMachineCode(); break;
   case GenEmitter:
-    CodeEmitterGen(Records).createEmitter(*Out);
+    ErrorCode = CodeEmitterGen(Records).createEmitter(*Out);
     break;
   case PrintRecords:
     *Out << Records;           // No argument, dump all contents
@@ -421,5 +423,5 @@
   }
 
   if (Out != &std::cout) delete Out;
-  return 0;
+  return ErrorCode;
 }