From: Eric Christopher Date: Mon, 18 Apr 2011 21:28:11 +0000 (+0000) Subject: Invert the meaning of printAliasInstr's return value. It now returns X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=721ef66d17978a7474bc2bde5a0ce2996615a7ce;p=oota-llvm.git Invert the meaning of printAliasInstr's return value. It now returns true on success and false on failure. Update callers. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@129722 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp b/lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp index 69a069e438b..dd6e3533849 100644 --- a/lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp +++ b/lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp @@ -42,7 +42,8 @@ X86ATTInstPrinter::X86ATTInstPrinter(TargetMachine &TM, const MCAsmInfo &MAI) } void X86ATTInstPrinter::printInst(const MCInst *MI, raw_ostream &OS) { - if (printAliasInstr(MI, OS)) + // Try to print any aliases first. + if (!printAliasInstr(MI, OS)) printInstruction(MI, OS); // If verbose assembly is enabled, we can print some informative comments. diff --git a/lib/Target/X86/InstPrinter/X86ATTInstPrinter.h b/lib/Target/X86/InstPrinter/X86ATTInstPrinter.h index f24674f68e3..8d69391c968 100644 --- a/lib/Target/X86/InstPrinter/X86ATTInstPrinter.h +++ b/lib/Target/X86/InstPrinter/X86ATTInstPrinter.h @@ -31,6 +31,8 @@ public: // Methods used to print the alias of an instruction. unsigned ComputeAvailableFeatures(const X86Subtarget *Subtarget) const; + // Autogenerated by tblgen, returns true if we successfully printed an + // alias. bool printAliasInstr(const MCInst *MI, raw_ostream &OS); // Autogenerated by tblgen. diff --git a/utils/TableGen/AsmWriterEmitter.cpp b/utils/TableGen/AsmWriterEmitter.cpp index f9686fd9b5a..2b1a4cc8a3d 100644 --- a/utils/TableGen/AsmWriterEmitter.cpp +++ b/utils/TableGen/AsmWriterEmitter.cpp @@ -975,11 +975,11 @@ void AsmWriterEmitter::EmitPrintAliasInstruction(raw_ostream &O) { CasesO << '\n'; } - CasesO.indent(4) << "return true;\n"; + CasesO.indent(4) << "return false;\n"; } if (CasesO.str().empty() || !isMC) { - O << " return true;\n"; + O << " return false;\n"; O << "}\n\n"; O << "#endif // PRINT_ALIAS_INSTR\n"; return; @@ -990,7 +990,7 @@ void AsmWriterEmitter::EmitPrintAliasInstruction(raw_ostream &O) { if (NeedAvailableFeatures) O.indent(2) << "unsigned AvailableFeatures = getAvailableFeatures();\n\n"; O.indent(2) << "switch (MI->getOpcode()) {\n"; - O.indent(2) << "default: return true;\n"; + O.indent(2) << "default: return false;\n"; O << CasesO.str(); O.indent(2) << "}\n\n"; @@ -1019,7 +1019,7 @@ void AsmWriterEmitter::EmitPrintAliasInstruction(raw_ostream &O) { O << " }\n"; O << " }\n\n"; - O << " return false;\n"; + O << " return true;\n"; O << "}\n\n"; O << "#endif // PRINT_ALIAS_INSTR\n";