[llvm-commits] [llvm] r79246 - in /llvm/trunk: include/llvm/Support/FormattedStream.h lib/CodeGen/AsmPrinter/AsmPrinter.cpp lib/Support/FormattedStream.cpp lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp lib/VMCore/AsmWriter.cpp utils/TableGen/AsmWriterEmitter.cpp
Chris Lattner
sabre at nondot.org
Mon Aug 17 08:48:09 PDT 2009
Author: lattner
Date: Mon Aug 17 10:48:08 2009
New Revision: 79246
URL: http://llvm.org/viewvc/llvm-project?rev=79246&view=rev
Log:
the MinPad argument to PadToColumn only really makes sense to be 1,
just remove the argument and replace it with 1.
Modified:
llvm/trunk/include/llvm/Support/FormattedStream.h
llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
llvm/trunk/lib/Support/FormattedStream.cpp
llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
llvm/trunk/lib/VMCore/AsmWriter.cpp
llvm/trunk/utils/TableGen/AsmWriterEmitter.cpp
Modified: llvm/trunk/include/llvm/Support/FormattedStream.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/FormattedStream.h?rev=79246&r1=79245&r2=79246&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/FormattedStream.h (original)
+++ llvm/trunk/include/llvm/Support/FormattedStream.h Mon Aug 17 10:48:08 2009
@@ -119,13 +119,12 @@
Scanned = begin();
}
- /// PadToColumn - Align the output to some column number.
+ /// PadToColumn - Align the output to some column number. If the current
+ /// column is already equal to or more than NewCol, PadToColumn inserts one
+ /// space.
///
/// \param NewCol - The column to move to.
- /// \param MinPad - The minimum space to give after the most
- /// recent I/O, even if the current column + minpad > newcol.
- ///
- void PadToColumn(unsigned NewCol, unsigned MinPad = 0);
+ void PadToColumn(unsigned NewCol);
private:
void releaseStream() {
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp?rev=79246&r1=79245&r2=79246&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp Mon Aug 17 10:48:08 2009
@@ -333,7 +333,7 @@
O << TAI->getPrivateGlobalPrefix() << "CPI" << getFunctionNumber() << '_'
<< CPI << ':';
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString() << " constant ";
WriteTypeSymbolic(O, CPE.getType(), MF->getFunction()->getParent());
}
@@ -606,7 +606,7 @@
void AsmPrinter::EOL(const std::string &Comment) const {
if (VerboseAsm && !Comment.empty()) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< ' '
<< Comment;
@@ -616,7 +616,7 @@
void AsmPrinter::EOL(const char* Comment) const {
if (VerboseAsm && *Comment) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< ' '
<< Comment;
@@ -1020,21 +1020,21 @@
if (TAI->getData64bitsDirective(AddrSpace)) {
O << TAI->getData64bitsDirective(AddrSpace) << i;
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString() << " double " << Val;
}
O << '\n';
} else if (TD->isBigEndian()) {
O << TAI->getData32bitsDirective(AddrSpace) << unsigned(i >> 32);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< " most significant word of double " << Val;
}
O << '\n';
O << TAI->getData32bitsDirective(AddrSpace) << unsigned(i);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< " least significant word of double " << Val;
}
@@ -1042,14 +1042,14 @@
} else {
O << TAI->getData32bitsDirective(AddrSpace) << unsigned(i);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< " least significant word of double " << Val;
}
O << '\n';
O << TAI->getData32bitsDirective(AddrSpace) << unsigned(i >> 32);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< " most significant word of double " << Val;
}
@@ -1061,7 +1061,7 @@
O << TAI->getData32bitsDirective(AddrSpace)
<< CFP->getValueAPF().bitcastToAPInt().getZExtValue();
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString() << " float " << Val;
}
O << '\n';
@@ -1079,7 +1079,7 @@
if (TD->isBigEndian()) {
O << TAI->getData16bitsDirective(AddrSpace) << uint16_t(p[1]);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< " most significant halfword of x86_fp80 ~"
<< DoubleVal.convertToDouble();
@@ -1087,25 +1087,25 @@
O << '\n';
O << TAI->getData16bitsDirective(AddrSpace) << uint16_t(p[0] >> 48);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString() << " next halfword";
}
O << '\n';
O << TAI->getData16bitsDirective(AddrSpace) << uint16_t(p[0] >> 32);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString() << " next halfword";
}
O << '\n';
O << TAI->getData16bitsDirective(AddrSpace) << uint16_t(p[0] >> 16);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString() << " next halfword";
}
O << '\n';
O << TAI->getData16bitsDirective(AddrSpace) << uint16_t(p[0]);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< " least significant halfword";
}
@@ -1113,7 +1113,7 @@
} else {
O << TAI->getData16bitsDirective(AddrSpace) << uint16_t(p[0]);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< " least significant halfword of x86_fp80 ~"
<< DoubleVal.convertToDouble();
@@ -1121,28 +1121,28 @@
O << '\n';
O << TAI->getData16bitsDirective(AddrSpace) << uint16_t(p[0] >> 16);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< " next halfword";
}
O << '\n';
O << TAI->getData16bitsDirective(AddrSpace) << uint16_t(p[0] >> 32);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< " next halfword";
}
O << '\n';
O << TAI->getData16bitsDirective(AddrSpace) << uint16_t(p[0] >> 48);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< " next halfword";
}
O << '\n';
O << TAI->getData16bitsDirective(AddrSpace) << uint16_t(p[1]);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< " most significant halfword";
}
@@ -1159,28 +1159,28 @@
if (TD->isBigEndian()) {
O << TAI->getData32bitsDirective(AddrSpace) << uint32_t(p[0] >> 32);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< " most significant word of ppc_fp128";
}
O << '\n';
O << TAI->getData32bitsDirective(AddrSpace) << uint32_t(p[0]);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< " next word";
}
O << '\n';
O << TAI->getData32bitsDirective(AddrSpace) << uint32_t(p[1] >> 32);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< " next word";
}
O << '\n';
O << TAI->getData32bitsDirective(AddrSpace) << uint32_t(p[1]);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< " least significant word";
}
@@ -1188,28 +1188,28 @@
} else {
O << TAI->getData32bitsDirective(AddrSpace) << uint32_t(p[1]);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< " least significant word of ppc_fp128";
}
O << '\n';
O << TAI->getData32bitsDirective(AddrSpace) << uint32_t(p[1] >> 32);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< " next word";
}
O << '\n';
O << TAI->getData32bitsDirective(AddrSpace) << uint32_t(p[0]);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< " next word";
}
O << '\n';
O << TAI->getData32bitsDirective(AddrSpace) << uint32_t(p[0] >> 32);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< " most significant word";
}
@@ -1242,14 +1242,14 @@
else if (TD->isBigEndian()) {
O << TAI->getData32bitsDirective(AddrSpace) << unsigned(Val >> 32);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< " most significant half of i64 " << Val;
}
O << '\n';
O << TAI->getData32bitsDirective(AddrSpace) << unsigned(Val);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< " least significant half of i64 " << Val;
}
@@ -1257,14 +1257,14 @@
} else {
O << TAI->getData32bitsDirective(AddrSpace) << unsigned(Val);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< " least significant half of i64 " << Val;
}
O << '\n';
O << TAI->getData32bitsDirective(AddrSpace) << unsigned(Val >> 32);
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< " most significant half of i64 " << Val;
}
@@ -1308,7 +1308,7 @@
if (const ConstantInt *CI = dyn_cast<ConstantInt>(CV)) {
SmallString<40> S;
CI->getValue().toStringUnsigned(S, 16);
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString() << " 0x" << S.c_str();
}
}
@@ -1574,7 +1574,7 @@
/// that is an implicit def.
void AsmPrinter::printImplicitDef(const MachineInstr *MI) const {
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString() << " implicit-def: "
<< TRI->getAsmName(MI->getOperand(0).getReg()) << '\n';
}
@@ -1635,7 +1635,7 @@
if (printComment) {
if (const BasicBlock *BB = MBB->getBasicBlock())
if (BB->hasName()) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString() << ' ';
WriteAsOperand(O, BB, /*PrintType=*/false);
}
@@ -1769,8 +1769,8 @@
DebugLocTuple DLT = MF->getDebugLocTuple(MI.getDebugLoc());
- // Print source line info
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ // Print source line info.
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString() << " SrcLine ";
if (DLT.CompileUnit->hasInitializer()) {
Constant *Name = DLT.CompileUnit->getInitializer();
@@ -1791,7 +1791,7 @@
DebugLocTuple DLT = MF->getDebugLocTuple(MI.getDebugLoc());
// Print source line info
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString() << " SrcLine ";
if (DLT.CompileUnit->hasInitializer()) {
Constant *Name = DLT.CompileUnit->getInitializer();
@@ -1817,11 +1817,11 @@
if (loop) {
// Print a newline after bb# annotation.
O << "\n";
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString() << " Loop Depth " << loop->getLoopDepth()
<< '\n';
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
MachineBasicBlock *Header = loop->getHeader();
assert(Header && "No header for loop");
@@ -1837,7 +1837,7 @@
if (loop->empty()) {
O << '\n';
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString() << " Inner Loop";
}
@@ -1849,7 +1849,7 @@
assert(Header && "No header for loop");
O << '\n';
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString() << Indent(CurLoop->getLoopDepth()-1)
<< " Inside Loop BB" << getFunctionNumber() << "_"
<< Header->getNumber() << " Depth " << CurLoop->getLoopDepth();
@@ -1868,7 +1868,7 @@
assert(Header && "No header for loop");
O << '\n';
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString() << Indent((*cl)->getLoopDepth()-1)
<< " Child Loop BB" << getFunctionNumber() << "_"
Modified: llvm/trunk/lib/Support/FormattedStream.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/FormattedStream.cpp?rev=79246&r1=79245&r2=79246&view=diff
==============================================================================
--- llvm/trunk/lib/Support/FormattedStream.cpp (original)
+++ llvm/trunk/lib/Support/FormattedStream.cpp Mon Aug 17 10:48:08 2009
@@ -51,21 +51,20 @@
/// \param MinPad - The minimum space to give after the most recent
/// I/O, even if the current column + minpad > newcol.
///
-void formatted_raw_ostream::PadToColumn(unsigned NewCol, unsigned MinPad) {
+void formatted_raw_ostream::PadToColumn(unsigned NewCol) {
// Figure out what's in the buffer and add it to the column count.
ComputeColumn();
// Output spaces until we reach the desired column.
unsigned num = NewCol - ColumnScanned;
- if (NewCol < ColumnScanned || num < MinPad)
- num = MinPad;
+ if (NewCol < ColumnScanned || num < 1)
+ num = 1;
// Keep a buffer of spaces handy to speed up processing.
const char *Spaces = " "
" ";
assert(num < MAX_COLUMN_PAD && "Unexpectedly large column padding");
-
write(Spaces, num);
}
Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp?rev=79246&r1=79245&r2=79246&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp Mon Aug 17 10:48:08 2009
@@ -217,7 +217,7 @@
O << CurrentFnName << ':';
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString() << ' ';
WriteAsOperand(O, F, /*PrintType=*/false, F->getParent());
}
@@ -921,7 +921,7 @@
EmitAlignment(Align, GVar);
O << name << ":";
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString() << ' ';
WriteAsOperand(O, GVar, /*PrintType=*/false, GVar->getParent());
}
@@ -943,7 +943,7 @@
O << ',' << (TAI->getAlignmentIsInBytes() ? (1 << Align) : Align);
}
if (VerboseAsm) {
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString() << ' ';
WriteAsOperand(O, GVar, /*PrintType=*/false, GVar->getParent());
}
@@ -987,7 +987,7 @@
EmitAlignment(Align, GVar);
O << name << ":";
if (VerboseAsm){
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString() << ' ';
WriteAsOperand(O, GVar, /*PrintType=*/false, GVar->getParent());
}
Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp?rev=79246&r1=79245&r2=79246&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp Mon Aug 17 10:48:08 2009
@@ -524,7 +524,7 @@
O << name << ":";
if (VerboseAsm)
- O.PadToColumn(TAI->getCommentColumn(), 1);
+ O.PadToColumn(TAI->getCommentColumn());
O << TAI->getCommentString()
<< " " << GV->getName();
O << '\n';
Modified: llvm/trunk/lib/VMCore/AsmWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/AsmWriter.cpp?rev=79246&r1=79245&r2=79246&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/AsmWriter.cpp (original)
+++ llvm/trunk/lib/VMCore/AsmWriter.cpp Mon Aug 17 10:48:08 2009
@@ -1690,11 +1690,11 @@
}
if (BB->getParent() == 0) {
- Out.PadToColumn(50, 1);
+ Out.PadToColumn(50);
Out << "; Error: Block without parent!";
} else if (BB != &BB->getParent()->getEntryBlock()) { // Not the entry block?
// Output predecessors for the block...
- Out.PadToColumn(50, 1);
+ Out.PadToColumn(50);
Out << ";";
pred_const_iterator PI = pred_begin(BB), PE = pred_end(BB);
@@ -1729,7 +1729,7 @@
///
void AssemblyWriter::printInfoComment(const Value &V) {
if (V.getType() != Type::getVoidTy(V.getContext())) {
- Out.PadToColumn(50, 1);
+ Out.PadToColumn(50);
Out << "; <";
TypePrinter.print(V.getType(), Out);
Out << "> [#uses=" << V.getNumUses() << ']'; // Output # uses
Modified: llvm/trunk/utils/TableGen/AsmWriterEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/AsmWriterEmitter.cpp?rev=79246&r1=79245&r2=79246&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/AsmWriterEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/AsmWriterEmitter.cpp Mon Aug 17 10:48:08 2009
@@ -177,7 +177,7 @@
CurColumn++ * OperandSpacing;
Operands.push_back(
AsmWriterOperand("O.PadToColumn(" +
- utostr(DestColumn) + ",1);\n",
+ utostr(DestColumn) + ");\n",
AsmWriterOperand::isLiteralStatementOperand));
}
break;
@@ -211,7 +211,7 @@
unsigned DestColumn = FirstOperandColumn +
CurColumn++ * OperandSpacing;
Operands.push_back(
- AsmWriterOperand("O.PadToColumn(" + utostr(DestColumn) + ", 1);\n",
+ AsmWriterOperand("O.PadToColumn(" + utostr(DestColumn) + ");\n",
AsmWriterOperand::isLiteralStatementOperand));
break;
} else if (std::string("${|}\\").find(AsmString[DollarPos+1])
More information about the llvm-commits
mailing list