From 70a54c07a0807bf89d1a8b4414e53298c376eb61 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 13 Sep 2009 18:25:37 +0000 Subject: [PATCH] replace printBasicBlockLabel with EmitBasicBlockStart, now that printBasicBlockLabel is only used for starting a MBB. This allows elimination of a bunch of arguments. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@81684 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/CodeGen/AsmPrinter.h | 11 ++++---- lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 25 ++++++++----------- lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp | 2 +- .../Alpha/AsmPrinter/AlphaAsmPrinter.cpp | 2 +- .../AsmPrinter/BlackfinAsmPrinter.cpp | 2 +- .../CellSPU/AsmPrinter/SPUAsmPrinter.cpp | 2 +- .../MSP430/AsmPrinter/MSP430AsmPrinter.cpp | 2 +- lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp | 2 +- .../PIC16/AsmPrinter/PIC16AsmPrinter.cpp | 2 +- .../PowerPC/AsmPrinter/PPCAsmPrinter.cpp | 4 +-- .../Sparc/AsmPrinter/SparcAsmPrinter.cpp | 2 +- .../SystemZ/AsmPrinter/SystemZAsmPrinter.cpp | 2 +- .../X86/AsmPrinter/X86ATTAsmPrinter.cpp | 2 +- .../X86/AsmPrinter/X86IntelAsmPrinter.cpp | 2 +- .../XCore/AsmPrinter/XCoreAsmPrinter.cpp | 2 +- 15 files changed, 30 insertions(+), 34 deletions(-) diff --git a/include/llvm/CodeGen/AsmPrinter.h b/include/llvm/CodeGen/AsmPrinter.h index cd30b39e36b..65090adfc68 100644 --- a/include/llvm/CodeGen/AsmPrinter.h +++ b/include/llvm/CodeGen/AsmPrinter.h @@ -350,12 +350,11 @@ namespace llvm { /// block label. MCSymbol *GetMBBSymbol(unsigned MBBID) const; - /// printBasicBlockLabel - This method prints the label for the specified - /// MachineBasicBlock - void printBasicBlockLabel(const MachineBasicBlock *MBB, - bool printAlign = false, - bool printColon = false, - bool printComment = true) const; + /// EmitBasicBlockStart - This method prints the label for the specified + /// MachineBasicBlock, an alignment (if present) and a comment describing + /// it if appropriate. + void EmitBasicBlockStart(const MachineBasicBlock *MBB, + bool printColon = true) const; protected: /// EmitZeros - Emit a block of zeros. /// diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp index 3af6dbf65c9..c6339ebfc4d 100644 --- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp +++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp @@ -1644,22 +1644,20 @@ MCSymbol *AsmPrinter::GetMBBSymbol(unsigned MBBID) const { } -/// printBasicBlockLabel - This method prints the label for the specified -/// MachineBasicBlock -void AsmPrinter::printBasicBlockLabel(const MachineBasicBlock *MBB, - bool printAlign, bool printColon, - bool printComment) const { - if (printAlign) { - unsigned Align = MBB->getAlignment(); - if (Align) - EmitAlignment(Log2_32(Align)); - } +/// EmitBasicBlockStart - This method prints the label for the specified +/// MachineBasicBlock, an alignment (if present) and a comment describing +/// it if appropriate. +void AsmPrinter::EmitBasicBlockStart(const MachineBasicBlock *MBB, + bool PrintColon) const { + if (unsigned Align = MBB->getAlignment()) + EmitAlignment(Log2_32(Align)); GetMBBSymbol(MBB->getNumber())->print(O, MAI); - if (printColon) + if (PrintColon) O << ':'; - if (printComment) { + + if (VerboseAsm) { if (const BasicBlock *BB = MBB->getBasicBlock()) if (BB->hasName()) { O.PadToColumn(MAI->getCommentColumn()); @@ -1667,8 +1665,7 @@ void AsmPrinter::printBasicBlockLabel(const MachineBasicBlock *MBB, WriteAsOperand(O, BB, /*PrintType=*/false); } - if (printColon) - EmitComments(*MBB); + EmitComments(*MBB); } } diff --git a/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp b/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp index b300a5c1bf8..745faa7f3f5 100644 --- a/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp +++ b/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp @@ -282,7 +282,7 @@ bool ARMAsmPrinter::runOnMachineFunction(MachineFunction &MF) { I != E; ++I) { // Print a label for the basic block. if (I != MF.begin()) { - printBasicBlockLabel(I, true, true, VerboseAsm); + EmitBasicBlockStart(I); O << '\n'; } for (MachineBasicBlock::const_iterator II = I->begin(), E = I->end(); diff --git a/lib/Target/Alpha/AsmPrinter/AlphaAsmPrinter.cpp b/lib/Target/Alpha/AsmPrinter/AlphaAsmPrinter.cpp index 2add269407c..f0b7fd7f615 100644 --- a/lib/Target/Alpha/AsmPrinter/AlphaAsmPrinter.cpp +++ b/lib/Target/Alpha/AsmPrinter/AlphaAsmPrinter.cpp @@ -170,7 +170,7 @@ bool AlphaAsmPrinter::runOnMachineFunction(MachineFunction &MF) { for (MachineFunction::const_iterator I = MF.begin(), E = MF.end(); I != E; ++I) { if (I != MF.begin()) { - printBasicBlockLabel(I, true, true); + EmitBasicBlockStart(I); O << '\n'; } for (MachineBasicBlock::const_iterator II = I->begin(), E = I->end(); diff --git a/lib/Target/Blackfin/AsmPrinter/BlackfinAsmPrinter.cpp b/lib/Target/Blackfin/AsmPrinter/BlackfinAsmPrinter.cpp index 62e28a41104..d83d914ec58 100644 --- a/lib/Target/Blackfin/AsmPrinter/BlackfinAsmPrinter.cpp +++ b/lib/Target/Blackfin/AsmPrinter/BlackfinAsmPrinter.cpp @@ -137,7 +137,7 @@ bool BlackfinAsmPrinter::runOnMachineFunction(MachineFunction &MF) { // This is an entry block or a block that's only reachable via a // fallthrough edge. In non-VerboseAsm mode, don't print the label. } else { - printBasicBlockLabel(I, true, true, VerboseAsm); + EmitBasicBlockStart(I); O << '\n'; } diff --git a/lib/Target/CellSPU/AsmPrinter/SPUAsmPrinter.cpp b/lib/Target/CellSPU/AsmPrinter/SPUAsmPrinter.cpp index b4a9db40884..cc320e5a2bc 100644 --- a/lib/Target/CellSPU/AsmPrinter/SPUAsmPrinter.cpp +++ b/lib/Target/CellSPU/AsmPrinter/SPUAsmPrinter.cpp @@ -463,7 +463,7 @@ bool LinuxAsmPrinter::runOnMachineFunction(MachineFunction &MF) { I != E; ++I) { // Print a label for the basic block. if (I != MF.begin()) { - printBasicBlockLabel(I, true, true); + EmitBasicBlockStart(I); O << '\n'; } for (MachineBasicBlock::const_iterator II = I->begin(), E = I->end(); diff --git a/lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp b/lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp index 50a17549c11..cd0eb9cbde3 100644 --- a/lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp +++ b/lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp @@ -126,7 +126,7 @@ bool MSP430AsmPrinter::runOnMachineFunction(MachineFunction &MF) { // This is an entry block or a block that's only reachable via a // fallthrough edge. In non-VerboseAsm mode, don't print the label. } else { - printBasicBlockLabel(I, true, true, VerboseAsm); + EmitBasicBlockStart(I); O << '\n'; } diff --git a/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp b/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp index 4c7798d0c3c..f4a9b36da8f 100644 --- a/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp +++ b/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp @@ -270,7 +270,7 @@ bool MipsAsmPrinter::runOnMachineFunction(MachineFunction &MF) { // Print a label for the basic block. if (I != MF.begin()) { - printBasicBlockLabel(I, true, true); + EmitBasicBlockStart(I); O << '\n'; } diff --git a/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp b/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp index c1e3b3f295c..abec86509de 100644 --- a/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp +++ b/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp @@ -98,7 +98,7 @@ bool PIC16AsmPrinter::runOnMachineFunction(MachineFunction &MF) { // Print a label for the basic block. if (I != MF.begin()) { - printBasicBlockLabel(I, true); + EmitBasicBlockStart(I, false); O << '\n'; } diff --git a/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp b/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp index e37313823db..f21d371a4c3 100644 --- a/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp +++ b/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp @@ -670,7 +670,7 @@ bool PPCLinuxAsmPrinter::runOnMachineFunction(MachineFunction &MF) { I != E; ++I) { // Print a label for the basic block. if (I != MF.begin()) { - printBasicBlockLabel(I, true, true); + EmitBasicBlockStart(I); O << '\n'; } for (MachineBasicBlock::const_iterator II = I->begin(), E = I->end(); @@ -854,7 +854,7 @@ bool PPCDarwinAsmPrinter::runOnMachineFunction(MachineFunction &MF) { I != E; ++I) { // Print a label for the basic block. if (I != MF.begin()) { - printBasicBlockLabel(I, true, true, VerboseAsm); + EmitBasicBlockStart(I); O << '\n'; } for (MachineBasicBlock::const_iterator II = I->begin(), IE = I->end(); diff --git a/lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp b/lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp index ff63542b703..0d5b70dc899 100644 --- a/lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp +++ b/lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp @@ -122,7 +122,7 @@ bool SparcAsmPrinter::runOnMachineFunction(MachineFunction &MF) { I != E; ++I) { // Print a label for the basic block. if (I != MF.begin()) { - printBasicBlockLabel(I, true, true); + EmitBasicBlockStart(I); O << '\n'; } for (MachineBasicBlock::const_iterator II = I->begin(), E = I->end(); diff --git a/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp b/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp index d3b11160798..82890102544 100644 --- a/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp +++ b/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp @@ -131,7 +131,7 @@ bool SystemZAsmPrinter::runOnMachineFunction(MachineFunction &MF) { // This is an entry block or a block that's only reachable via a // fallthrough edge. In non-VerboseAsm mode, don't print the label. } else { - printBasicBlockLabel(I, true, true, VerboseAsm); + EmitBasicBlockStart(I); O << '\n'; } diff --git a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp index 4cdf875eb6c..8eac2df29b3 100644 --- a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp +++ b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp @@ -245,7 +245,7 @@ bool X86ATTAsmPrinter::runOnMachineFunction(MachineFunction &MF) { // This is an entry block or a block that's only reachable via a // fallthrough edge. In non-VerboseAsm mode, don't print the label. } else { - printBasicBlockLabel(I, true, true, VerboseAsm); + EmitBasicBlockStart(I); O << '\n'; } for (MachineBasicBlock::const_iterator II = I->begin(), IE = I->end(); diff --git a/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp index 4ecab186c74..3c0e12d71d9 100644 --- a/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp +++ b/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp @@ -170,7 +170,7 @@ bool X86IntelAsmPrinter::runOnMachineFunction(MachineFunction &MF) { I != E; ++I) { // Print a label for the basic block if there are any predecessors. if (!I->pred_empty()) { - printBasicBlockLabel(I, true, true); + EmitBasicBlockStart(I); O << '\n'; } for (MachineBasicBlock::const_iterator II = I->begin(), E = I->end(); diff --git a/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp b/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp index 233e762fb48..bdb44efa2ee 100644 --- a/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp +++ b/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp @@ -273,7 +273,7 @@ bool XCoreAsmPrinter::runOnMachineFunction(MachineFunction &MF) // Print a label for the basic block. if (I != MF.begin()) { - printBasicBlockLabel(I, true , true); + EmitBasicBlockStart(I); O << '\n'; } -- 2.34.1