[llvm-commits] [llvm] r78523 - in /llvm/trunk: include/llvm/Target/Target.td lib/Target/X86/X86InstrInfo.td utils/TableGen/AsmMatcherEmitter.cpp
Daniel Dunbar
daniel at zuster.org
Sat Aug 8 22:18:30 PDT 2009
Author: ddunbar
Date: Sun Aug 9 00:18:30 2009
New Revision: 78523
URL: http://llvm.org/viewvc/llvm-project?rev=78523&view=rev
Log:
llvm-mc/AsmParser: Define match classes in the .td file.
-2 FIXMEs.
Modified:
llvm/trunk/include/llvm/Target/Target.td
llvm/trunk/lib/Target/X86/X86InstrInfo.td
llvm/trunk/utils/TableGen/AsmMatcherEmitter.cpp
Modified: llvm/trunk/include/llvm/Target/Target.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/Target.td?rev=78523&r1=78522&r2=78523&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Target/Target.td (original)
+++ llvm/trunk/include/llvm/Target/Target.td Sun Aug 9 00:18:30 2009
@@ -286,6 +286,17 @@
string PrintMethod = "printOperand";
string AsmOperandLowerMethod = ?;
dag MIOperandInfo = (ops);
+
+ // ParserMatchClass - The "match class" that operands of this type fit
+ // in. Match classes are used to define the order in which instructions are
+ // match, to ensure that which instructions gets matched is deterministic.
+ string ParserMatchClass = "Imm";
+
+ // ParserMatchSuperClass - The enclosing super class for this operand (if
+ // any). This operand *must* be a subset of the valid operands for the super
+ // class; i.e., the match predicate for this super class must return true
+ // for all instances of this class.
+ string ParserMatchSuperClass = ?;
}
def i1imm : Operand<i1>;
Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.td?rev=78523&r1=78522&r2=78523&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86InstrInfo.td (original)
+++ llvm/trunk/lib/Target/X86/X86InstrInfo.td Sun Aug 9 00:18:30 2009
@@ -173,6 +173,7 @@
class X86MemOperand<string printMethod> : Operand<iPTR> {
let PrintMethod = printMethod;
let MIOperandInfo = (ops ptr_rc, i8imm, ptr_rc_nosp, i32imm, i8imm);
+ let ParserMatchClass = "Mem";
}
def i8mem : X86MemOperand<"printi8mem">;
@@ -192,11 +193,13 @@
def i8mem_NOREX : Operand<i64> {
let PrintMethod = "printi8mem";
let MIOperandInfo = (ops GR64_NOREX, i8imm, GR64_NOREX_NOSP, i32imm, i8imm);
+ let ParserMatchClass = "Mem";
}
def lea32mem : Operand<i32> {
let PrintMethod = "printlea32mem";
let MIOperandInfo = (ops GR32, i8imm, GR32_NOSP, i32imm);
+ let ParserMatchClass = "Mem";
}
def SSECC : Operand<i8> {
Modified: llvm/trunk/utils/TableGen/AsmMatcherEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/AsmMatcherEmitter.cpp?rev=78523&r1=78522&r2=78523&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/AsmMatcherEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/AsmMatcherEmitter.cpp Sun Aug 9 00:18:30 2009
@@ -278,19 +278,23 @@
/// class of operands which can be matched.
struct ClassInfo {
enum ClassInfoKind {
- Token, ///< The class for a particular token.
- Register, ///< A register class.
- UserClass0 ///< The (first) user defined class, subsequent user defined
- /// classes are UserClass0+1, and so on.
+ Invalid = 0, ///< Invalid kind, for use as a sentinel value.
+ Token, ///< The class for a particular token.
+ Register, ///< A register class.
+ UserClass0 ///< The (first) user defined class, subsequent user defined
+ /// classes are UserClass0+1, and so on.
};
/// Kind - The class kind, which is either a predefined kind, or (UserClass0 +
/// N) for the Nth user defined class.
unsigned Kind;
- /// Name - The class name, suitable for use as an enum.
+ /// Name - The full class name, suitable for use in an enum.
std::string Name;
+ /// ClassName - The unadorned generic name for this class (e.g., Token).
+ std::string ClassName;
+
/// ValueName - The name of the value this class represents; for a token this
/// is the literal token string, for an operand it is the TableGen class (or
/// empty if this is a derived class).
@@ -311,6 +315,8 @@
return Kind < RHS.Kind;
switch (Kind) {
+ case Invalid:
+ assert(0 && "Invalid kind!");
case Token:
// Tokens are always comparable.
//
@@ -412,10 +418,17 @@
/// constructed.
std::map<std::string, ClassInfo*> OperandClasses;
+ /// Map of user class names to kind value.
+ std::map<std::string, unsigned> UserClasses;
+
private:
/// getTokenClass - Lookup or create the class for the given token.
ClassInfo *getTokenClass(const StringRef &Token);
+ /// getUserClassKind - Lookup or create the kind value for the given class
+ /// name.
+ unsigned getUserClassKind(const StringRef &Name);
+
/// getOperandClass - Lookup or create the class for the given operand.
ClassInfo *getOperandClass(const StringRef &Token,
const CodeGenInstruction::OperandInfo &OI);
@@ -439,7 +452,7 @@
for (unsigned i = 0, e = Operands.size(); i != e; ++i) {
Operand &Op = Operands[i];
- errs() << " op[" << i << "] = ";
+ errs() << " op[" << i << "] = " << Op.Class->ClassName << " - ";
if (Op.Class->Kind == ClassInfo::Token) {
errs() << '\"' << Tokens[i] << "\"\n";
continue;
@@ -478,6 +491,7 @@
if (!Entry) {
Entry = new ClassInfo();
Entry->Kind = ClassInfo::Token;
+ Entry->ClassName = "Token";
Entry->Name = "MCK_" + getEnumNameForToken(Token);
Entry->ValueName = Token;
Entry->PredicateMethod = "<invalid>";
@@ -488,28 +502,28 @@
return Entry;
}
+unsigned AsmMatcherInfo::getUserClassKind(const StringRef &Name) {
+ unsigned &Entry = UserClasses[Name];
+
+ if (!Entry)
+ Entry = ClassInfo::UserClass0 + UserClasses.size() - 1;
+
+ return Entry;
+}
+
ClassInfo *
AsmMatcherInfo::getOperandClass(const StringRef &Token,
const CodeGenInstruction::OperandInfo &OI) {
std::string ClassName;
if (OI.Rec->isSubClassOf("RegisterClass")) {
ClassName = "Reg";
- } else if (OI.Rec->isSubClassOf("Operand")) {
- // FIXME: This should not be hard coded.
- const RecordVal *RV = OI.Rec->getValue("Type");
-
- // FIXME: Yet another total hack.
- if (RV->getValue()->getAsString() == "iPTR" ||
- OI.Rec->getName() == "i8mem_NOREX" ||
- OI.Rec->getName() == "lea32mem" ||
- OI.Rec->getName() == "lea64mem" ||
- OI.Rec->getName() == "i128mem" ||
- OI.Rec->getName() == "sdmem" ||
- OI.Rec->getName() == "ssmem" ||
- OI.Rec->getName() == "lea64_32mem") {
- ClassName = "Mem";
- } else {
- ClassName = "Imm";
+ } else {
+ try {
+ ClassName = OI.Rec->getValueAsString("ParserMatchClass");
+ assert(ClassName != "Reg" && "'Reg' class name is reserved!");
+ } catch(...) {
+ PrintError(OI.Rec->getLoc(), "operand has no match class!");
+ ClassName = "Invalid";
}
}
@@ -521,11 +535,9 @@
if (ClassName == "Reg") {
Entry->Kind = ClassInfo::Register;
} else {
- if (ClassName == "Mem")
- Entry->Kind = ClassInfo::UserClass0;
- else
- Entry->Kind = ClassInfo::UserClass0 + 1;
+ Entry->Kind = getUserClassKind(ClassName);
}
+ Entry->ClassName = ClassName;
Entry->Name = "MCK_" + ClassName;
Entry->ValueName = OI.Rec->getName();
Entry->PredicateMethod = "is" + ClassName;
@@ -665,7 +677,7 @@
for (; CurIndex != Op.OperandInfo->MIOperandNo; ++CurIndex)
Signature += "Imp";
- Signature += Op.Class->Name;
+ Signature += Op.Class->ClassName;
Signature += utostr(Op.OperandInfo->MINumOperands);
Signature += "_" + utostr(MIOperandList[i].second);
More information about the llvm-commits
mailing list