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

[Evan Cheng]

Changes in directory llvm/utils/TableGen:

CodeGenTarget.cpp updated: 1.83 -> 1.84
Record.cpp updated: 1.56 -> 1.57
Record.h updated: 1.60 -> 1.61
TableGen.cpp updated: 1.48 -> 1.49
---
Log message:

Backing out
CodeGenTarget.cpp updated: 1.82 -> 1.83
Record.cpp updated: 1.55 -> 1.56
Record.h updated: 1.59 -> 1.60
TableGen.cpp updated: 1.47 -> 1.48
It's missing CallingConvEmitter.h


---
Diffs of the changes:  (+7 -18)

 CodeGenTarget.cpp |    8 ++++++--
 Record.cpp        |    7 -------
 Record.h          |    2 --
 TableGen.cpp      |    8 +-------
 4 files changed, 7 insertions(+), 18 deletions(-)


Index: llvm/utils/TableGen/CodeGenTarget.cpp
diff -u llvm/utils/TableGen/CodeGenTarget.cpp:1.83 llvm/utils/TableGen/CodeGenTarget.cpp:1.84
--- llvm/utils/TableGen/CodeGenTarget.cpp:1.83	Tue Feb 27 14:43:37 2007
+++ llvm/utils/TableGen/CodeGenTarget.cpp	Tue Feb 27 15:44:08 2007
@@ -604,7 +604,9 @@
   // Parse the list of argument types.
   ListInit *TypeList = R->getValueAsListInit("Types");
   for (unsigned i = 0, e = TypeList->getSize(); i != e; ++i) {
-    Record *TyEl = TypeList->getElementAsRecord(i);
+    DefInit *DI = dynamic_cast<DefInit*>(TypeList->getElement(i));
+    assert(DI && "Invalid list type!");
+    Record *TyEl = DI->getDef();
     assert(TyEl->isSubClassOf("LLVMType") && "Expected a type!");
     ArgTypes.push_back(TyEl->getValueAsString("TypeVal"));
     
@@ -618,7 +620,9 @@
   // Parse the intrinsic properties.
   ListInit *PropList = R->getValueAsListInit("Properties");
   for (unsigned i = 0, e = PropList->getSize(); i != e; ++i) {
-    Record *Property = PropList->getElementAsRecord(i);
+    DefInit *DI = dynamic_cast<DefInit*>(PropList->getElement(i));
+    assert(DI && "Invalid list type!");
+    Record *Property = DI->getDef();
     assert(Property->isSubClassOf("IntrinsicProperty") &&
            "Expected a property!");
     


Index: llvm/utils/TableGen/Record.cpp
diff -u llvm/utils/TableGen/Record.cpp:1.56 llvm/utils/TableGen/Record.cpp:1.57
--- llvm/utils/TableGen/Record.cpp:1.56	Tue Feb 27 14:43:37 2007
+++ llvm/utils/TableGen/Record.cpp	Tue Feb 27 15:44:08 2007
@@ -337,13 +337,6 @@
   return new ListInit(Vals);
 }
 
-Record *ListInit::getElementAsRecord(unsigned i) const {
-  assert(i < Values.size() && "List element index out of range!");
-  DefInit *DI = dynamic_cast<DefInit*>(Values[i]);
-  if (DI == 0) throw "Expected record in list!";
-  return DI->getDef();
-}
-
 Init *ListInit::resolveReferences(Record &R, const RecordVal *RV) {
   std::vector<Init*> Resolved;
   Resolved.reserve(getSize());


Index: llvm/utils/TableGen/Record.h
diff -u llvm/utils/TableGen/Record.h:1.60 llvm/utils/TableGen/Record.h:1.61
--- llvm/utils/TableGen/Record.h:1.60	Tue Feb 27 14:43:37 2007
+++ llvm/utils/TableGen/Record.h	Tue Feb 27 15:44:08 2007
@@ -626,8 +626,6 @@
     return Values[i];
   }
 
-  Record *getElementAsRecord(unsigned i) const;
-  
   Init *convertInitListSlice(const std::vector<unsigned> &Elements);
 
   virtual Init *convertInitializerTo(RecTy *Ty) {


Index: llvm/utils/TableGen/TableGen.cpp
diff -u llvm/utils/TableGen/TableGen.cpp:1.48 llvm/utils/TableGen/TableGen.cpp:1.49
--- llvm/utils/TableGen/TableGen.cpp:1.48	Tue Feb 27 14:43:37 2007
+++ llvm/utils/TableGen/TableGen.cpp	Tue Feb 27 15:44:08 2007
@@ -20,7 +20,6 @@
 #include "llvm/Support/Streams.h"
 #include "llvm/System/Signals.h"
 #include "llvm/Support/FileUtilities.h"
-#include "CallingConvEmitter.h"
 #include "CodeEmitterGen.h"
 #include "RegisterInfoEmitter.h"
 #include "InstrInfoEmitter.h"
@@ -39,7 +38,6 @@
   GenEmitter,
   GenRegisterEnums, GenRegister, GenRegisterHeader,
   GenInstrEnums, GenInstrs, GenAsmWriter, 
-  GenCallingConv,
   GenDAGISel,
   GenSubtarget,
   GenIntrinsic,
@@ -63,8 +61,6 @@
                                "Generate enum values for instructions"),
                     clEnumValN(GenInstrs, "gen-instr-desc",
                                "Generate instruction descriptions"),
-                    clEnumValN(GenCallingConv, "gen-callingconv",
-                               "Generate calling convention descriptions"),
                     clEnumValN(GenAsmWriter, "gen-asm-writer",
                                "Generate assembly writer"),
                     clEnumValN(GenDAGISel, "gen-dag-isel",
@@ -142,9 +138,7 @@
     case GenInstrs:
       InstrInfoEmitter(Records).run(*Out);
       break;
-    case GenCallingConv:
-      CallingConvEmitter(Records).run(*Out);
-      break;
+
     case GenAsmWriter:
       AsmWriterEmitter(Records).run(*Out);
       break;