From 220db2953cfcc5d7c321b590ebd028dba583647b Mon Sep 17 00:00:00 2001 From: Owen Anderson Date: Wed, 21 Sep 2011 17:58:45 +0000 Subject: [PATCH] These do not need to be conditional on the presence of CommentStream, as they have a fallback path now. llvm-svn: 140267 --- lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp | 24 +++++++++---------- .../MBlaze/InstPrinter/MBlazeInstPrinter.cpp | 2 +- .../MSP430/InstPrinter/MSP430InstPrinter.cpp | 2 +- .../Mips/InstPrinter/MipsInstPrinter.cpp | 2 +- .../PowerPC/InstPrinter/PPCInstPrinter.cpp | 8 +++---- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp b/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp index 277d44cfaca..16bb25ab292 100644 --- a/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp +++ b/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp @@ -72,7 +72,7 @@ void ARMInstPrinter::printInst(const MCInst *MI, raw_ostream &O, O << ", " << getRegisterName(MO2.getReg()); assert(ARM_AM::getSORegOffset(MO3.getImm()) == 0); - if (CommentStream) printAnnotation(O, Annot); + printAnnotation(O, Annot); return; } @@ -90,12 +90,12 @@ void ARMInstPrinter::printInst(const MCInst *MI, raw_ostream &O, << ", " << getRegisterName(MO1.getReg()); if (ARM_AM::getSORegShOp(MO2.getImm()) == ARM_AM::rrx) { - if (CommentStream) printAnnotation(O, Annot); + printAnnotation(O, Annot); return; } O << ", #" << translateShiftImm(ARM_AM::getSORegOffset(MO2.getImm())); - if (CommentStream) printAnnotation(O, Annot); + printAnnotation(O, Annot); return; } @@ -109,7 +109,7 @@ void ARMInstPrinter::printInst(const MCInst *MI, raw_ostream &O, O << ".w"; O << '\t'; printRegisterList(MI, 4, O); - if (CommentStream) printAnnotation(O, Annot); + printAnnotation(O, Annot); return; } if (Opcode == ARM::STR_PRE_IMM && MI->getOperand(2).getReg() == ARM::SP && @@ -117,7 +117,7 @@ void ARMInstPrinter::printInst(const MCInst *MI, raw_ostream &O, O << '\t' << "push"; printPredicateOperand(MI, 4, O); O << "\t{" << getRegisterName(MI->getOperand(1).getReg()) << "}"; - if (CommentStream) printAnnotation(O, Annot); + printAnnotation(O, Annot); return; } @@ -130,7 +130,7 @@ void ARMInstPrinter::printInst(const MCInst *MI, raw_ostream &O, O << ".w"; O << '\t'; printRegisterList(MI, 4, O); - if (CommentStream) printAnnotation(O, Annot); + printAnnotation(O, Annot); return; } if (Opcode == ARM::LDR_POST_IMM && MI->getOperand(2).getReg() == ARM::SP && @@ -138,7 +138,7 @@ void ARMInstPrinter::printInst(const MCInst *MI, raw_ostream &O, O << '\t' << "pop"; printPredicateOperand(MI, 5, O); O << "\t{" << getRegisterName(MI->getOperand(0).getReg()) << "}"; - if (CommentStream) printAnnotation(O, Annot); + printAnnotation(O, Annot); return; } @@ -150,7 +150,7 @@ void ARMInstPrinter::printInst(const MCInst *MI, raw_ostream &O, printPredicateOperand(MI, 2, O); O << '\t'; printRegisterList(MI, 4, O); - if (CommentStream) printAnnotation(O, Annot); + printAnnotation(O, Annot); return; } @@ -161,7 +161,7 @@ void ARMInstPrinter::printInst(const MCInst *MI, raw_ostream &O, printPredicateOperand(MI, 2, O); O << '\t'; printRegisterList(MI, 4, O); - if (CommentStream) printAnnotation(O, Annot); + printAnnotation(O, Annot); return; } @@ -180,7 +180,7 @@ void ARMInstPrinter::printInst(const MCInst *MI, raw_ostream &O, if (Writeback) O << "!"; O << ", "; printRegisterList(MI, 3, O); - if (CommentStream) printAnnotation(O, Annot); + printAnnotation(O, Annot); return; } @@ -189,12 +189,12 @@ void ARMInstPrinter::printInst(const MCInst *MI, raw_ostream &O, MI->getOperand(1).getReg() == ARM::R8) { O << "\tnop"; printPredicateOperand(MI, 2, O); - if (CommentStream) printAnnotation(O, Annot); + printAnnotation(O, Annot); return; } printInstruction(MI, O); - if (CommentStream) printAnnotation(O, Annot); + printAnnotation(O, Annot); } void ARMInstPrinter::printOperand(const MCInst *MI, unsigned OpNo, diff --git a/lib/Target/MBlaze/InstPrinter/MBlazeInstPrinter.cpp b/lib/Target/MBlaze/InstPrinter/MBlazeInstPrinter.cpp index f470be30f02..a1f1dbc7a23 100644 --- a/lib/Target/MBlaze/InstPrinter/MBlazeInstPrinter.cpp +++ b/lib/Target/MBlaze/InstPrinter/MBlazeInstPrinter.cpp @@ -28,7 +28,7 @@ using namespace llvm; void MBlazeInstPrinter::printInst(const MCInst *MI, raw_ostream &O, StringRef Annot) { printInstruction(MI, O); - if (CommentStream) printAnnotation(O, Annot); + printAnnotation(O, Annot); } void MBlazeInstPrinter::printOperand(const MCInst *MI, unsigned OpNo, diff --git a/lib/Target/MSP430/InstPrinter/MSP430InstPrinter.cpp b/lib/Target/MSP430/InstPrinter/MSP430InstPrinter.cpp index 10a8f9ac70b..5d6c6ad93db 100644 --- a/lib/Target/MSP430/InstPrinter/MSP430InstPrinter.cpp +++ b/lib/Target/MSP430/InstPrinter/MSP430InstPrinter.cpp @@ -28,7 +28,7 @@ using namespace llvm; void MSP430InstPrinter::printInst(const MCInst *MI, raw_ostream &O, StringRef Annot) { printInstruction(MI, O); - if (CommentStream) printAnnotation(O, Annot); + printAnnotation(O, Annot); } void MSP430InstPrinter::printPCRelImmOperand(const MCInst *MI, unsigned OpNo, diff --git a/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp b/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp index e26fb1474cd..3dafc613448 100644 --- a/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp +++ b/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp @@ -72,7 +72,7 @@ void MipsInstPrinter::printRegName(raw_ostream &OS, unsigned RegNo) const { void MipsInstPrinter::printInst(const MCInst *MI, raw_ostream &O, StringRef Annot) { printInstruction(MI, O); - if (CommentStream) printAnnotation(O, Annot); + printAnnotation(O, Annot); } void MipsInstPrinter::printOperand(const MCInst *MI, unsigned OpNo, diff --git a/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp b/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp index ac5eb77ead4..b6a08354a21 100644 --- a/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp +++ b/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp @@ -52,7 +52,7 @@ void PPCInstPrinter::printInst(const MCInst *MI, raw_ostream &O, printOperand(MI, 1, O); O << ", " << (unsigned int)SH; - if (CommentStream) printAnnotation(O, Annot); + printAnnotation(O, Annot); return; } } @@ -63,7 +63,7 @@ void PPCInstPrinter::printInst(const MCInst *MI, raw_ostream &O, printOperand(MI, 0, O); O << ", "; printOperand(MI, 1, O); - if (CommentStream) printAnnotation(O, Annot); + printAnnotation(O, Annot); return; } @@ -77,13 +77,13 @@ void PPCInstPrinter::printInst(const MCInst *MI, raw_ostream &O, O << ", "; printOperand(MI, 1, O); O << ", " << (unsigned int)SH; - if (CommentStream) printAnnotation(O, Annot); + printAnnotation(O, Annot); return; } } printInstruction(MI, O); - if (CommentStream) printAnnotation(O, Annot); + printAnnotation(O, Annot); }