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

[Chris Lattner]

Changes in directory llvm/utils/TableGen:

CodeGenTarget.cpp updated: 1.11 -> 1.12
CodeGenTarget.h updated: 1.9 -> 1.10
CodeGenInstruction.h updated: 1.1 -> 1.2

---
Log message:

Parse the operand list of the instruction.  We currently support register and immediate operands.


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

Index: llvm/utils/TableGen/CodeGenTarget.cpp
diff -u llvm/utils/TableGen/CodeGenTarget.cpp:1.11 llvm/utils/TableGen/CodeGenTarget.cpp:1.12
--- llvm/utils/TableGen/CodeGenTarget.cpp:1.11	Sun Aug  1 00:59:33 2004
+++ llvm/utils/TableGen/CodeGenTarget.cpp	Sun Aug  1 02:42:39 2004
@@ -129,16 +129,47 @@
   isTwoAddress = R->getValueAsBit("isTwoAddress");
   isTerminator = R->getValueAsBit("isTerminator");
 
-
-  //TODO: Parse OperandList
   try {
     DagInit *DI = R->getValueAsDag("OperandList");
 
-    // Cannot handle instructions with operands yet.
-    if (DI->getNumArgs())
-      AsmString.clear();
+    for (unsigned i = 0, e = DI->getNumArgs(); i != e; ++i)
+      if (DefInit *Arg = dynamic_cast<DefInit*>(DI->getArg(i))) {
+        Record *Rec = Arg->getDef();
+        MVT::ValueType Ty;
+        if (Rec->isSubClassOf("RegisterClass"))
+          Ty = getValueType(Rec->getValueAsDef("RegType"));
+        else if (Rec->getName() == "i8imm")
+          Ty = MVT::i8;
+        else if (Rec->getName() == "i16imm")
+          Ty = MVT::i16;
+        else if (Rec->getName() == "i32imm")
+          Ty = MVT::i32;
+        else if (Rec->getName() == "i64imm")
+          Ty = MVT::i64;
+        else
+          throw "Unknown operand class '" + Rec->getName() +
+                "' in instruction '" + R->getName() + "' instruction!";
+        
+        OperandList.push_back(OperandInfo(Rec, Ty, DI->getArgName(i)));
+      } else {
+        throw "Illegal operand for the '" + R->getName() + "' instruction!";
+      }
   } catch (...) {
+    // Error parsing operands list, just ignore it.
+    AsmString.clear();
+    OperandList.clear();
   }
 }
 
 
+
+/// getOperandNamed - Return the index of the operand with the specified
+/// non-empty name.  If the instruction does not have an operand with the
+/// specified name, throw an exception.
+unsigned CodeGenInstruction::getOperandNamed(const std::string &Name) const {
+  assert(!Name.empty() && "Cannot search for operand with no name!");
+  for (unsigned i = 0, e = OperandList.size(); i != e; ++i)
+    if (OperandList[i].Name == Name) return i;
+  throw "Instruction '" + TheDef->getName() +
+        "' does not have an operand named '$" + Name + "'!";
+}


Index: llvm/utils/TableGen/CodeGenTarget.h
diff -u llvm/utils/TableGen/CodeGenTarget.h:1.9 llvm/utils/TableGen/CodeGenTarget.h:1.10
--- llvm/utils/TableGen/CodeGenTarget.h:1.9	Sun Aug  1 00:04:00 2004
+++ llvm/utils/TableGen/CodeGenTarget.h	Sun Aug  1 02:42:39 2004
@@ -18,7 +18,6 @@
 #define CODEGEN_TARGET_H
 
 #include "CodeGenInstruction.h"
-#include "llvm/CodeGen/ValueTypes.h"
 #include <iosfwd>
 #include <map>
 


Index: llvm/utils/TableGen/CodeGenInstruction.h
diff -u llvm/utils/TableGen/CodeGenInstruction.h:1.1 llvm/utils/TableGen/CodeGenInstruction.h:1.2
--- llvm/utils/TableGen/CodeGenInstruction.h:1.1	Sun Aug  1 00:04:00 2004
+++ llvm/utils/TableGen/CodeGenInstruction.h	Sun Aug  1 02:42:39 2004
@@ -14,6 +14,7 @@
 #ifndef CODEGEN_INSTRUCTION_H
 #define CODEGEN_INSTRUCTION_H
 
+#include "llvm/CodeGen/ValueTypes.h"
 #include <string>
 #include <vector>
 #include <utility>
@@ -29,10 +30,21 @@
     /// AsmString - The format string used to emit a .s file for the
     /// instruction.
     std::string AsmString;
+
+    /// OperandInfo - For each operand declared in the OperandList of the
+    /// instruction, keep track of its record (which specifies the class of the
+    /// operand), its type, and the name given to the operand, if any.
+    struct OperandInfo {
+      Record *Rec;
+      MVT::ValueType Ty;
+      std::string Name;
+      OperandInfo(Record *R, MVT::ValueType T, const std::string &N)
+        : Rec(R), Ty(T), Name(N) {}
+    };
     
     /// OperandList - The list of declared operands, along with their declared
     /// type (which is a record).
-    std::vector<std::pair<Record*, std::string> > OperandList;
+    std::vector<OperandInfo> OperandList;
 
     // Various boolean values we track for the instruction.
     bool isReturn;
@@ -43,6 +55,11 @@
     bool isTerminator;
 
     CodeGenInstruction(Record *R);
+
+    /// getOperandNamed - Return the index of the operand with the specified
+    /// non-empty name.  If the instruction does not have an operand with the
+    /// specified name, throw an exception.
+    unsigned getOperandNamed(const std::string &Name) const;
   };
 }