mirror of
https://github.com/RPCS3/llvm.git
synced 2024-11-27 13:40:43 +00:00
Correctly parse variant notation
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16637 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
560a79f1ea
commit
953c6fe112
@ -30,24 +30,24 @@ void AsmWriterEmitter::run(std::ostream &O) {
|
||||
O << "namespace llvm {\n\n";
|
||||
|
||||
CodeGenTarget Target;
|
||||
|
||||
Record *AsmWriter = Target.getAsmWriter();
|
||||
|
||||
std::string AsmWriterClassName =
|
||||
AsmWriter->getValueAsString("AsmWriterClassName");
|
||||
std::string ClassName = AsmWriter->getValueAsString("AsmWriterClassName");
|
||||
unsigned Variant = AsmWriter->getValueAsInt("Variant");
|
||||
|
||||
O <<
|
||||
"/// printInstruction - This method is automatically generated by tablegen\n"
|
||||
"/// from the instruction set description. This method returns true if the\n"
|
||||
"/// machine instruction was sufficiently described to print it, otherwise\n"
|
||||
"/// it returns false.\n"
|
||||
"bool " << Target.getName() << AsmWriterClassName
|
||||
"bool " << Target.getName() << ClassName
|
||||
<< "::printInstruction(const MachineInstr *MI) {\n";
|
||||
O << " switch (MI->getOpcode()) {\n"
|
||||
" default: return false;\n";
|
||||
|
||||
std::string Namespace = Target.inst_begin()->second.Namespace;
|
||||
|
||||
bool inVariant = false; // True if we are inside a {.|.|.} region.
|
||||
|
||||
for (CodeGenTarget::inst_iterator I = Target.inst_begin(),
|
||||
E = Target.inst_end(); I != E; ++I)
|
||||
if (!I->second.AsmString.empty()) {
|
||||
@ -56,7 +56,8 @@ void AsmWriterEmitter::run(std::ostream &O) {
|
||||
|
||||
std::string::size_type LastEmitted = 0;
|
||||
while (LastEmitted != AsmString.size()) {
|
||||
std::string::size_type DollarPos = AsmString.find('$', LastEmitted);
|
||||
std::string::size_type DollarPos =
|
||||
AsmString.find_first_of("${|}", LastEmitted);
|
||||
if (DollarPos == std::string::npos) DollarPos = AsmString.size();
|
||||
|
||||
// Emit a constant string fragment.
|
||||
@ -65,6 +66,41 @@ void AsmWriterEmitter::run(std::ostream &O) {
|
||||
O << " << \"" << std::string(AsmString.begin()+LastEmitted,
|
||||
AsmString.begin()+DollarPos) << "\"";
|
||||
LastEmitted = DollarPos;
|
||||
} else if (AsmString[DollarPos] == '{') {
|
||||
if (inVariant)
|
||||
throw "Nested variants found for instruction '" + I->first + "'!";
|
||||
LastEmitted = DollarPos+1;
|
||||
inVariant = true; // We are now inside of the variant!
|
||||
for (unsigned i = 0; i != Variant; ++i) {
|
||||
// Skip over all of the text for an irrelevant variant here. The
|
||||
// next variant starts at |, or there may not be text for this
|
||||
// variant if we see a }.
|
||||
std::string::size_type NP =
|
||||
AsmString.find_first_of("|}", LastEmitted);
|
||||
if (NP == std::string::npos)
|
||||
throw "Incomplete variant for instruction '" + I->first + "'!";
|
||||
LastEmitted = NP+1;
|
||||
if (AsmString[NP] == '}') {
|
||||
inVariant = false; // No text for this variant.
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else if (AsmString[DollarPos] == '|') {
|
||||
if (!inVariant)
|
||||
throw "'|' character found outside of a variant in instruction '"
|
||||
+ I->first + "'!";
|
||||
// Move to the end of variant list.
|
||||
std::string::size_type NP = AsmString.find('}', LastEmitted);
|
||||
if (NP == std::string::npos)
|
||||
throw "Incomplete variant for instruction '" + I->first + "'!";
|
||||
LastEmitted = NP+1;
|
||||
inVariant = false;
|
||||
} else if (AsmString[DollarPos] == '}') {
|
||||
if (!inVariant)
|
||||
throw "'}' character found outside of a variant in instruction '"
|
||||
+ I->first + "'!";
|
||||
LastEmitted = DollarPos+1;
|
||||
inVariant = false;
|
||||
} else if (DollarPos+1 != AsmString.size() &&
|
||||
AsmString[DollarPos+1] == '$') {
|
||||
O << " << '$'"; // "$$" -> $
|
||||
|
Loading…
Reference in New Issue
Block a user