From 72770f5877b08823233746bed629ec5ba4db0e0f Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 3 Oct 2004 20:19:02 +0000 Subject: [PATCH] Correctly parse variant notation llvm-svn: 16637 --- llvm/utils/TableGen/AsmWriterEmitter.cpp | 48 +++++++++++++++++++++--- 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/llvm/utils/TableGen/AsmWriterEmitter.cpp b/llvm/utils/TableGen/AsmWriterEmitter.cpp index 64debe27f804..a2cc21ded5de 100644 --- a/llvm/utils/TableGen/AsmWriterEmitter.cpp +++ b/llvm/utils/TableGen/AsmWriterEmitter.cpp @@ -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 << " << '$'"; // "$$" -> $