RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-18 18:42:46 +02:00
Code Issues Projects Releases Wiki Activity

[AsmParser] Generalize matching for grammars without mnemonic-lead statements

Browse Source 
Differential Revision: http://reviews.llvm.org/D14257

llvm-svn: 252440
This commit is contained in:
Colin LeMahieu 2015-11-09 00:46:46 +00:00
parent 51dd820505
commit 6d56088f23
1 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
utils/TableGen/AsmMatcherEmitter.cpp
View File

@ -958,17 +958,9 @@ void MatchableInfo::tokenizeAsmString(const AsmMatcherInfo &Info,
if (AsmOperands.empty()) if (AsmOperands.empty())
PrintFatalError(TheDef->getLoc(), PrintFatalError(TheDef->getLoc(),
"Instruction '" + TheDef->getName() + "' has no tokens"); "Instruction '" + TheDef->getName() + "' has no tokens");
Mnemonic = AsmOperands[0].Token; assert(!AsmOperands[0].Token.empty());
if (Mnemonic.empty()) if (AsmOperands[0].Token[0] != '$')
PrintFatalError(TheDef->getLoc(), Mnemonic = AsmOperands[0].Token;
"Missing instruction mnemonic");
// FIXME : Check and raise an error if it is a register.
if (Mnemonic[0] == '$')
PrintFatalError(TheDef->getLoc(),
"Invalid instruction mnemonic '" + Mnemonic + "'!");
// Remove the first operand, it is tracked in the mnemonic field.
AsmOperands.erase(AsmOperands.begin());
} }
bool MatchableInfo::validate(StringRef CommentDelimiter, bool Hack) const { bool MatchableInfo::validate(StringRef CommentDelimiter, bool Hack) const {
@ -1879,7 +1871,7 @@ static void emitConvertFuncs(CodeGenTarget &Target, StringRef ClassName,
// Add the operand entry to the instruction kind conversion row. // Add the operand entry to the instruction kind conversion row.
ConversionRow.push_back(ID); ConversionRow.push_back(ID);
ConversionRow.push_back(OpInfo.AsmOperandNum + 1); ConversionRow.push_back(OpInfo.AsmOperandNum);
if (!IsNewConverter) if (!IsNewConverter)
break; break;
@ -2602,13 +2594,17 @@ static void emitCustomOperandParsing(raw_ostream &OS, CodeGenTarget &Target,
OS << " uint64_t AvailableFeatures = getAvailableFeatures();\n\n"; OS << " uint64_t AvailableFeatures = getAvailableFeatures();\n\n";
OS << " // Get the next operand index.\n"; OS << " // Get the next operand index.\n";
OS << " unsigned NextOpNum = Operands.size()-1;\n"; OS << " unsigned NextOpNum = Operands.size();\n";
// Emit code to search the table. // Emit code to search the table.
OS << " // Search the table.\n"; OS << " // Search the table.\n";
OS << " std::pair<const OperandMatchEntry*, const OperandMatchEntry*>"; OS << " std::pair<const OperandMatchEntry*, const OperandMatchEntry*>";
OS << " MnemonicRange =\n"; OS << " MnemonicRange\n";
OS << " std::equal_range(OperandMatchTable, OperandMatchTable+" OS << " (OperandMatchTable, OperandMatchTable+";
OS << Info.OperandMatchInfo.size() << ");\n";
OS << " if(!Mnemonic.empty())\n";
OS << " MnemonicRange = std::equal_range(OperandMatchTable,";
OS << " OperandMatchTable+"
<< Info.OperandMatchInfo.size() << ", Mnemonic,\n" << Info.OperandMatchInfo.size() << ", Mnemonic,\n"
<< " LessOpcodeOperand());\n\n"; << " LessOpcodeOperand());\n\n";
@ -2918,8 +2914,8 @@ void AsmMatcherEmitter::run(raw_ostream &OS) {
<< " bool matchingInlineAsm, unsigned VariantID) {\n"; << " bool matchingInlineAsm, unsigned VariantID) {\n";
OS << " // Eliminate obvious mismatches.\n"; OS << " // Eliminate obvious mismatches.\n";
OS << " if (Operands.size() > " << (MaxNumOperands+1) << ") {\n"; OS << " if (Operands.size() > " << MaxNumOperands << ") {\n";
OS << " ErrorInfo = " << (MaxNumOperands+1) << ";\n"; OS << " ErrorInfo = " << MaxNumOperands << ";\n";
OS << " return Match_InvalidOperand;\n"; OS << " return Match_InvalidOperand;\n";
OS << " }\n\n"; OS << " }\n\n";
@ -2928,7 +2924,9 @@ void AsmMatcherEmitter::run(raw_ostream &OS) {
OS << " uint64_t AvailableFeatures = getAvailableFeatures();\n\n"; OS << " uint64_t AvailableFeatures = getAvailableFeatures();\n\n";
OS << " // Get the instruction mnemonic, which is the first token.\n"; OS << " // Get the instruction mnemonic, which is the first token.\n";
OS << " StringRef Mnemonic = ((" << Target.getName() OS << " StringRef Mnemonic;\n";
OS << " if (Operands[0]->isToken())\n";
OS << " Mnemonic = ((" << Target.getName()
<< "Operand&)*Operands[0]).getToken();\n\n"; << "Operand&)*Operands[0]).getToken();\n\n";
if (HasMnemonicAliases) { if (HasMnemonicAliases) {
@ -2959,8 +2957,11 @@ void AsmMatcherEmitter::run(raw_ostream &OS) {
} }
OS << " }\n"; OS << " }\n";
OS << " // Search the table.\n"; OS << " // Search the table.\n";
OS << " std::pair<const MatchEntry*, const MatchEntry*> MnemonicRange =\n"; OS << " std::pair<const MatchEntry*, const MatchEntry*>"
OS << " std::equal_range(Start, End, Mnemonic, LessOpcode());\n\n"; "MnemonicRange(Start, End);\n";
OS << " unsigned SIndex = Mnemonic.empty() ? 0 : 1;\n";
OS << " if (!Mnemonic.empty())\n";
OS << " MnemonicRange = std::equal_range(Start, End, Mnemonic.lower(), LessOpcode());\n\n";
OS << " // Return a more specific error code if no mnemonics match.\n"; OS << " // Return a more specific error code if no mnemonics match.\n";
OS << " if (MnemonicRange.first == MnemonicRange.second)\n"; OS << " if (MnemonicRange.first == MnemonicRange.second)\n";
@ -2970,28 +2971,23 @@ void AsmMatcherEmitter::run(raw_ostream &OS) {
<< "*ie = MnemonicRange.second;\n"; << "*ie = MnemonicRange.second;\n";
OS << " it != ie; ++it) {\n"; OS << " it != ie; ++it) {\n";
OS << " // equal_range guarantees that instruction mnemonic matches.\n";
OS << " assert(Mnemonic == it->getMnemonic());\n";
// Emit check that the subclasses match. // Emit check that the subclasses match.
OS << " bool OperandsValid = true;\n"; OS << " bool OperandsValid = true;\n";
OS << " for (unsigned i = 0; i != " << MaxNumOperands << "; ++i) {\n"; OS << " for (unsigned i = SIndex; i != " << MaxNumOperands << "; ++i) {\n";
OS << " if (i + 1 >= Operands.size()) {\n"; OS << " auto Formal = static_cast<MatchClassKind>(it->Classes[i]);\n";
OS << " OperandsValid = (it->Classes[i] == " <<"InvalidMatchClass);\n"; OS << " if (i >= Operands.size()) {\n";
OS << " if (!OperandsValid) ErrorInfo = i + 1;\n"; OS << " OperandsValid = (Formal == " <<"InvalidMatchClass);\n";
OS << " if (!OperandsValid) ErrorInfo = i;\n";
OS << " break;\n"; OS << " break;\n";
OS << " }\n"; OS << " }\n";
OS << " unsigned Diag = validateOperandClass(*Operands[i+1],\n"; OS << " MCParsedAsmOperand &Actual = *Operands[i];\n";
OS.indent(43); OS << " unsigned Diag = validateOperandClass(Actual, Formal);\n";
OS << "(MatchClassKind)it->Classes[i]);\n";
OS << " if (Diag == Match_Success)\n"; OS << " if (Diag == Match_Success)\n";
OS << " continue;\n"; OS << " continue;\n";
OS << " // If the generic handler indicates an invalid operand\n"; OS << " // If the generic handler indicates an invalid operand\n";
OS << " // failure, check for a special case.\n"; OS << " // failure, check for a special case.\n";
OS << " if (Diag == Match_InvalidOperand) {\n"; OS << " if (Diag == Match_InvalidOperand) {\n";
OS << " Diag = validateTargetOperandClass(*Operands[i+1],\n"; OS << " Diag = validateTargetOperandClass(Actual, Formal);\n";
OS.indent(43);
OS << "(MatchClassKind)it->Classes[i]);\n";
OS << " if (Diag == Match_Success)\n"; OS << " if (Diag == Match_Success)\n";
OS << " continue;\n"; OS << " continue;\n";
OS << " }\n"; OS << " }\n";
@ -3000,8 +2996,8 @@ void AsmMatcherEmitter::run(raw_ostream &OS) {
OS << " // If we already had a match that only failed due to a\n"; OS << " // If we already had a match that only failed due to a\n";
OS << " // target predicate, that diagnostic is preferred.\n"; OS << " // target predicate, that diagnostic is preferred.\n";
OS << " if (!HadMatchOtherThanPredicate &&\n"; OS << " if (!HadMatchOtherThanPredicate &&\n";
OS << " (it == MnemonicRange.first || ErrorInfo <= i+1)) {\n"; OS << " (it == MnemonicRange.first || ErrorInfo <= i)) {\n";
OS << " ErrorInfo = i+1;\n"; OS << " ErrorInfo = i;\n";
OS << " // InvalidOperand is the default. Prefer specificity.\n"; OS << " // InvalidOperand is the default. Prefer specificity.\n";
OS << " if (Diag != Match_InvalidOperand)\n"; OS << " if (Diag != Match_InvalidOperand)\n";
OS << " RetCode = Diag;\n"; OS << " RetCode = Diag;\n";