From: Chris Lattner Date: Sun, 1 Aug 2004 08:22:29 +0000 (+0000) Subject: Get rid of 3 of the 4 'printimplicit' flags. Implicit operands are now X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1626c507e8e478ad372187f8380e65bb3cfcaeff;p=oota-llvm.git Get rid of 3 of the 4 'printimplicit' flags. Implicit operands are now explicitly listed in the asm string. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@15397 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Target/X86/X86AsmPrinter.cpp b/lib/Target/X86/X86AsmPrinter.cpp index 09913c27189..5bc4a488891 100644 --- a/lib/Target/X86/X86AsmPrinter.cpp +++ b/lib/Target/X86/X86AsmPrinter.cpp @@ -115,10 +115,7 @@ namespace { } } - void printImplUsesBefore(const TargetInstrDescriptor &Desc); - bool printImplDefsBefore(const TargetInstrDescriptor &Desc); bool printImplUsesAfter(const TargetInstrDescriptor &Desc, const bool LC); - bool printImplDefsAfter(const TargetInstrDescriptor &Desc, const bool LC); void printMachineInstruction(const MachineInstr *MI); void printOp(const MachineOperand &MO, bool elideOffsetKeyword = false); void printMemReference(const MachineInstr *MI, unsigned Op); @@ -538,44 +535,6 @@ void X86AsmPrinter::printMemReference(const MachineInstr *MI, unsigned Op) { O << "]"; } - -/// printImplUsesBefore - Emit the implicit-use registers for the instruction -/// described by DESC, if its PrintImplUsesBefore flag is set. -/// -void X86AsmPrinter::printImplUsesBefore(const TargetInstrDescriptor &Desc) { - const MRegisterInfo &RI = *TM.getRegisterInfo(); - if (Desc.TSFlags & X86II::PrintImplUsesBefore) { - for (const unsigned *p = Desc.ImplicitUses; *p; ++p) { - // Bug Workaround: See note in X86AsmPrinter::doInitialization about %. - O << "%" << RI.get(*p).Name << ", "; - } - } -} - -/// printImplDefsBefore - Emit the implicit-def registers for the instruction -/// described by DESC, if its PrintImplUsesBefore flag is set. Return true if -/// we printed any registers. -/// -bool X86AsmPrinter::printImplDefsBefore(const TargetInstrDescriptor &Desc) { - bool Printed = false; - const MRegisterInfo &RI = *TM.getRegisterInfo(); - if (Desc.TSFlags & X86II::PrintImplDefsBefore) { - const unsigned *p = Desc.ImplicitDefs; - if (*p) { - O << (Printed ? ", %" : "%") << RI.get (*p).Name; - Printed = true; - ++p; - } - while (*p) { - // Bug Workaround: See note in X86AsmPrinter::doInitialization about %. - O << ", %" << RI.get(*p).Name; - ++p; - } - } - return Printed; -} - - /// printImplUsesAfter - Emit the implicit-use registers for the instruction /// described by DESC, if its PrintImplUsesAfter flag is set. /// @@ -608,38 +567,6 @@ bool X86AsmPrinter::printImplUsesAfter(const TargetInstrDescriptor &Desc, return false; } -/// printImplDefsAfter - Emit the implicit-definition registers for the -/// instruction described by DESC, if its PrintImplDefsAfter flag is set. -/// -/// Inputs: -/// Comma - List of registers will need a leading comma. -/// Desc - Description of the Instruction -/// -/// Return value: -/// true - Emitted one or more registers. -/// false - Emitted no registers. -/// -bool X86AsmPrinter::printImplDefsAfter(const TargetInstrDescriptor &Desc, - const bool Comma = true) { - const MRegisterInfo &RI = *TM.getRegisterInfo(); - if (Desc.TSFlags & X86II::PrintImplDefsAfter) { - bool emitted = false; - const unsigned *p = Desc.ImplicitDefs; - if (*p) { - O << (Comma ? ", %" : "%") << RI.get (*p).Name; - emitted = true; - ++p; - } - while (*p) { - // Bug Workaround: See note in X86AsmPrinter::doInitialization about %. - O << ", %" << RI.get(*p).Name; - ++p; - } - return emitted; - } - return false; -} - /// printMachineInstruction -- Print out a single X86 LLVM instruction /// MI in Intel syntax to the current output stream. /// @@ -703,14 +630,11 @@ void X86AsmPrinter::printMachineInstruction(const MachineInstr *MI) { "Illegal raw instruction!"); O << TII.getName(MI->getOpcode()) << " "; - bool LeadingComma = printImplDefsBefore(Desc); - + bool LeadingComma = false; if (MI->getNumOperands() == 1) { - if (LeadingComma) O << ", "; printOp(MI->getOperand(0), true); // Don't print "OFFSET"... LeadingComma = true; } - LeadingComma = printImplDefsAfter(Desc, LeadingComma) || LeadingComma; printImplUsesAfter(Desc, LeadingComma); O << "\n"; return; @@ -739,8 +663,6 @@ void X86AsmPrinter::printMachineInstruction(const MachineInstr *MI) { O << TII.getName(MI->getOpcode()) << " "; - printImplUsesBefore(Desc); // fcmov* - printOp(MI->getOperand(0)); if (MI->getNumOperands() == 2 && (!MI->getOperand(1).isRegister() ||