[llvm-commits] [llvm] r78504 - in /llvm/trunk: lib/Target/X86/AsmParser/X86AsmParser.cpp utils/TableGen/AsmMatcherEmitter.cpp
Daniel Dunbar
daniel at zuster.org
Sat Aug 8 14:22:41 PDT 2009
Author: ddunbar
Date: Sat Aug 8 16:22:41 2009
New Revision: 78504
URL: http://llvm.org/viewvc/llvm-project?rev=78504&view=rev
Log:
llvm-mc/AsmMatcher: Switch token matching to use the new string matcher.
Also, redefined MatchRegisterName to just return the register value or a
sentinel, to simplify the generated code.
Modified:
llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp
llvm/trunk/utils/TableGen/AsmMatcherEmitter.cpp
Modified: llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp?rev=78504&r1=78503&r2=78504&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp Sat Aug 8 16:22:41 2009
@@ -46,7 +46,9 @@
bool MatchInstruction(SmallVectorImpl<X86Operand> &Operands,
MCInst &Inst);
- bool MatchRegisterName(const StringRef &Name, unsigned &RegNo);
+ /// MatchRegisterName - Match the given string to a register name, or 0 if
+ /// there is no match.
+ unsigned MatchRegisterName(const StringRef &Name);
/// }
@@ -214,7 +216,9 @@
// validation later, so maybe there is no need for this here.
unsigned RegNo;
assert(Tok.getString().startswith("%") && "Invalid register name!");
- if (MatchRegisterName(Tok.getString().substr(1), RegNo))
+
+ RegNo = MatchRegisterName(Tok.getString().substr(1));
+ if (RegNo == 0)
return Error(Tok.getLoc(), "invalid register name");
Op = X86Operand::CreateReg(RegNo);
Modified: llvm/trunk/utils/TableGen/AsmMatcherEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/AsmMatcherEmitter.cpp?rev=78504&r1=78503&r2=78504&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/AsmMatcherEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/AsmMatcherEmitter.cpp Sat Aug 8 16:22:41 2009
@@ -690,27 +690,6 @@
OS << "}\n\n";
}
-/// EmitMatchRegisterName - Emit the function to match a string to appropriate
-/// match class value.
-static void EmitMatchTokenString(CodeGenTarget &Target,
- std::vector<ClassInfo*> &Infos,
- raw_ostream &OS) {
- // FIXME: TableGen should have a fast string matcher generator.
- OS << "static MatchClassKind MatchTokenString(const StringRef &Name) {\n";
- for (std::vector<ClassInfo*>::iterator it = Infos.begin(),
- ie = Infos.end(); it != ie; ++it) {
- ClassInfo &CI = **it;
-
- if (CI.Kind == ClassInfo::Token)
- OS << " if (Name == \"" << CI.ValueName << "\")\n"
- << " return " << CI.Name << ";\n\n";
- }
- OS << " return InvalidMatchClass;\n";
- OS << "}\n\n";
-}
-
-
-
/// EmitClassifyOperand - Emit the function to classify an operand.
static void EmitClassifyOperand(CodeGenTarget &Target,
std::vector<ClassInfo*> &Infos,
@@ -860,32 +839,51 @@
}
+/// EmitMatchTokenString - Emit the function to match a token string to the
+/// appropriate match class value.
+static void EmitMatchTokenString(CodeGenTarget &Target,
+ std::vector<ClassInfo*> &Infos,
+ raw_ostream &OS) {
+ // Construct the match list.
+ std::vector<StringPair> Matches;
+ for (std::vector<ClassInfo*>::iterator it = Infos.begin(),
+ ie = Infos.end(); it != ie; ++it) {
+ ClassInfo &CI = **it;
+
+ if (CI.Kind == ClassInfo::Token)
+ Matches.push_back(StringPair(CI.ValueName, "return " + CI.Name + ";"));
+ }
+
+ OS << "static MatchClassKind MatchTokenString(const StringRef &Name) {\n";
+
+ EmitStringMatcher("Name", Matches, OS);
+
+ OS << " return InvalidMatchClass;\n";
+ OS << "}\n\n";
+}
/// EmitMatchRegisterName - Emit the function to match a string to the target
/// specific register enum.
static void EmitMatchRegisterName(CodeGenTarget &Target, Record *AsmParser,
raw_ostream &OS) {
- const std::vector<CodeGenRegister> &Registers = Target.getRegisters();
-
- OS << "bool " << Target.getName()
- << AsmParser->getValueAsString("AsmParserClassName")
- << "::MatchRegisterName(const StringRef &Name, unsigned &RegNo) {\n";
-
+ // Construct the match list.
std::vector<StringPair> Matches;
-
- // FIXME: TableGen should have a fast string matcher generator.
- for (unsigned i = 0, e = Registers.size(); i != e; ++i) {
- const CodeGenRegister &Reg = Registers[i];
+ for (unsigned i = 0, e = Target.getRegisters().size(); i != e; ++i) {
+ const CodeGenRegister &Reg = Target.getRegisters()[i];
if (Reg.TheDef->getValueAsString("AsmName").empty())
continue;
Matches.push_back(StringPair(Reg.TheDef->getValueAsString("AsmName"),
- "RegNo=" + utostr(i + 1) + "; return false;"));
+ "return " + utostr(i + 1) + ";"));
}
+ OS << "unsigned " << Target.getName()
+ << AsmParser->getValueAsString("AsmParserClassName")
+ << "::MatchRegisterName(const StringRef &Name) {\n";
+
EmitStringMatcher("Name", Matches, OS);
- OS << " return true;\n";
+ OS << " return 0;\n";
OS << "}\n\n";
}
More information about the llvm-commits
mailing list