maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

MC/AsmParser: Add support for allowing the conversion process to fail (via 

custom conversion functions).

llvm-svn: 124872
This commit is contained in:
Daniel Dunbar 2011-02-04 17:12:23 +00:00
parent 38992cc9df
commit 6619340462
4 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
View File

@ -1393,6 +1393,8 @@ MatchAndEmitInstruction(SMLoc IDLoc,
}
case Match_MnemonicFail:
return Error(IDLoc, "unrecognized instruction mnemonic");
case Match_ConversionFail:
return Error(IDLoc, "unable to convert operands to instruction");
}
llvm_unreachable("Implement any new match types added!");

2
llvm/lib/Target/MBlaze/AsmParser/MBlazeAsmParser.cpp
View File

@ -334,6 +334,8 @@ MatchAndEmitInstruction(SMLoc IDLoc,
return Error(IDLoc, "instruction use requires an option to be enabled");
case Match_MnemonicFail:
return Error(IDLoc, "unrecognized instruction mnemonic");
case Match_ConversionFail:
return Error(IDLoc, "unable to convert operands to instruction");
case Match_InvalidOperand:
ErrorLoc = IDLoc;
if (ErrorInfo != ~0U) {

2
llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
View File

@ -842,6 +842,8 @@ MatchAndEmitInstruction(SMLoc IDLoc,
case Match_MissingFeature:
Error(IDLoc, "instruction requires a CPU feature not currently enabled");
return true;
case Match_ConversionFail:
return Error(IDLoc, "unable to convert operands to instruction");
case Match_InvalidOperand:
WasOriginallyInvalidOperand = true;
break;

25
llvm/utils/TableGen/AsmMatcherEmitter.cpp
View File

@ -1368,7 +1368,7 @@ static void EmitConvertToMCInst(CodeGenTarget &Target,
std::set<std::string> GeneratedFns;
// Start the unified conversion function.
CvtOS << "static void ConvertToMCInst(ConversionKind Kind, MCInst &Inst, "
CvtOS << "static bool ConvertToMCInst(ConversionKind Kind, MCInst &Inst, "
<< "unsigned Opcode,\n"
<< " const SmallVectorImpl<MCParsedAsmOperand*"
<< "> &Operands) {\n";
@ -1403,8 +1403,8 @@ static void EmitConvertToMCInst(CodeGenTarget &Target,
OS << " " << Signature << ",\n";
CvtOS << " case " << Signature << ":\n";
CvtOS << " " << AsmMatchConverter << "(Inst, Opcode, Operands);\n";
CvtOS << " return;\n";
CvtOS << " return " << AsmMatchConverter
<< "(Inst, Opcode, Operands);\n";
continue;
}
@ -1479,12 +1479,13 @@ static void EmitConvertToMCInst(CodeGenTarget &Target,
CvtOS << " case " << Signature << ":\n";
CvtOS << CaseOS.str();
CvtOS << " return;\n";
CvtOS << " return true;\n";
}
// Finish the convert function.
CvtOS << " }\n";
CvtOS << " return false;\n";
CvtOS << "}\n\n";
// Finish the enum, and drop the convert function after it.
@ -1914,8 +1915,11 @@ void AsmMatcherEmitter::run(raw_ostream &OS) {
OS << " unsigned ComputeAvailableFeatures(const " <<
Target.getName() << "Subtarget *Subtarget) const;\n";
OS << " enum MatchResultTy {\n";
OS << " Match_Success, Match_MnemonicFail, Match_InvalidOperand,\n";
OS << " Match_MissingFeature\n";
OS << " Match_ConversionFail,\n";
OS << " Match_InvalidOperand,\n";
OS << " Match_MissingFeature,\n";
OS << " Match_MnemonicFail,\n";
OS << " Match_Success\n";
OS << " };\n";
OS << " bool MnemonicIsValid(StringRef Mnemonic);\n";
OS << " MatchResultTy MatchInstructionImpl(\n";
@ -2132,9 +2136,14 @@ void AsmMatcherEmitter::run(raw_ostream &OS) {
OS << " HadMatchOtherThanFeatures = true;\n";
OS << " continue;\n";
OS << " }\n";
OS << "\n";
OS << " ConvertToMCInst(it->ConvertFn, Inst, it->Opcode, Operands);\n";
OS << " // We have selected a definite instruction, convert the parsed\n"
<< " // operands into the appropriate MCInst.\n";
OS << " if (!ConvertToMCInst(it->ConvertFn, Inst,\n"
<< " it->Opcode, Operands))\n";
OS << " return Match_ConversionFail;\n";
OS << "\n";
OS << " return Match_Success;\n";
// Call the post-processing function, if used.
std::string InsnCleanupFn =