[llvm-commits] [llvm] r79800 - in /llvm/trunk/lib/CodeGen/AsmPrinter: DIE.cpp DIE.h DwarfLabel.cpp DwarfLabel.h
Chris Lattner
sabre at nondot.org
Sat Aug 22 18:01:18 PDT 2009
Author: lattner
Date: Sat Aug 22 20:01:17 2009
New Revision: 79800
URL: http://llvm.org/viewvc/llvm-project?rev=79800&view=rev
Log:
convert the DIE printing stuff to use raw_ostream instead of std::ostream.
Tweak #includes.
Modified:
llvm/trunk/lib/CodeGen/AsmPrinter/DIE.cpp
llvm/trunk/lib/CodeGen/AsmPrinter/DIE.h
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfLabel.cpp
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfLabel.h
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DIE.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DIE.cpp?rev=79800&r1=79799&r2=79800&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DIE.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DIE.cpp Sat Aug 22 20:01:17 2009
@@ -17,7 +17,7 @@
#include "llvm/MC/MCAsmInfo.h"
#include "llvm/Target/TargetData.h"
#include "llvm/Support/ErrorHandling.h"
-#include <ostream>
+#include "llvm/Support/Format.h"
using namespace llvm;
//===----------------------------------------------------------------------===//
@@ -76,24 +76,24 @@
}
#ifndef NDEBUG
-void DIEAbbrev::print(std::ostream &O) {
+void DIEAbbrev::print(raw_ostream &O) {
O << "Abbreviation @"
- << std::hex << (intptr_t)this << std::dec
+ << format("0x%lx", (long)(intptr_t)this)
<< " "
<< dwarf::TagString(Tag)
<< " "
<< dwarf::ChildrenString(ChildrenFlag)
- << "\n";
+ << '\n';
for (unsigned i = 0, N = Data.size(); i < N; ++i) {
O << " "
<< dwarf::AttributeString(Data[i].getAttribute())
<< " "
<< dwarf::FormEncodingString(Data[i].getForm())
- << "\n";
+ << '\n';
}
}
-void DIEAbbrev::dump() { print(cerr); }
+void DIEAbbrev::dump() { print(errs()); }
#endif
//===----------------------------------------------------------------------===//
@@ -126,7 +126,7 @@
}
#ifndef NDEBUG
-void DIE::print(std::ostream &O, unsigned IncIndent) {
+void DIE::print(raw_ostream &O, unsigned IncIndent) {
IndentCount += IncIndent;
const std::string Indent(IndentCount, ' ');
bool isBlock = Abbrev.getTag() == 0;
@@ -134,7 +134,7 @@
if (!isBlock) {
O << Indent
<< "Die: "
- << "0x" << std::hex << (intptr_t)this << std::dec
+ << format("0x%lx", (long)(intptr_t)this)
<< ", Offset: " << Offset
<< ", Size: " << Size
<< "\n";
@@ -176,14 +176,14 @@
}
void DIE::dump() {
- print(cerr);
+ print(errs());
}
#endif
#ifndef NDEBUG
void DIEValue::dump() {
- print(cerr);
+ print(errs());
}
#endif
@@ -242,9 +242,9 @@
}
#ifndef NDEBUG
-void DIEInteger::print(std::ostream &O) {
+void DIEInteger::print(raw_ostream &O) {
O << "Int: " << (int64_t)Integer
- << " 0x" << std::hex << Integer << std::dec;
+ << format(" 0x%llx", (unsigned long long)Integer);
}
#endif
@@ -269,7 +269,7 @@
}
#ifndef NDEBUG
-void DIEString::print(std::ostream &O) {
+void DIEString::print(raw_ostream &O) {
O << "Str: \"" << Str << "\"";
}
#endif
@@ -303,7 +303,7 @@
}
#ifndef NDEBUG
-void DIEDwarfLabel::print(std::ostream &O) {
+void DIEDwarfLabel::print(raw_ostream &O) {
O << "Lbl: ";
Label.print(O);
}
@@ -338,7 +338,7 @@
}
#ifndef NDEBUG
-void DIEObjectLabel::print(std::ostream &O) {
+void DIEObjectLabel::print(raw_ostream &O) {
O << "Obj: " << Label;
}
#endif
@@ -378,7 +378,7 @@
}
#ifndef NDEBUG
-void DIESectionOffset::print(std::ostream &O) {
+void DIESectionOffset::print(raw_ostream &O) {
O << "Off: ";
Label.print(O);
O << "-";
@@ -418,7 +418,7 @@
}
#ifndef NDEBUG
-void DIEDelta::print(std::ostream &O) {
+void DIEDelta::print(raw_ostream &O) {
O << "Del: ";
LabelHi.print(O);
O << "-";
@@ -452,8 +452,8 @@
}
#ifndef NDEBUG
-void DIEEntry::print(std::ostream &O) {
- O << "Die: 0x" << std::hex << (intptr_t)Entry << std::dec;
+void DIEEntry::print(raw_ostream &O) {
+ O << format("Die: 0x%lx", (long)(intptr_t)Entry);
}
#endif
@@ -511,7 +511,7 @@
}
#ifndef NDEBUG
-void DIEBlock::print(std::ostream &O) {
+void DIEBlock::print(raw_ostream &O) {
O << "Blk: ";
DIE::print(O, 5);
}
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DIE.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DIE.h?rev=79800&r1=79799&r2=79800&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DIE.h (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DIE.h Sat Aug 22 20:01:17 2009
@@ -19,8 +19,7 @@
#include "llvm/ADT/SmallVector.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/Dwarf.h"
-#include "llvm/Support/raw_ostream.h"
-#include <iosfwd>
+#include <vector>
namespace llvm {
class AsmPrinter;
@@ -103,10 +102,7 @@
void Emit(const AsmPrinter *Asm) const;
#ifndef NDEBUG
- void print(std::ostream *O) {
- if (O) print(*O);
- }
- void print(std::ostream &O);
+ void print(raw_ostream &O);
void dump();
#endif
};
@@ -198,10 +194,7 @@
void Profile(FoldingSetNodeID &ID) ;
#ifndef NDEBUG
- void print(std::ostream *O, unsigned IncIndent = 0) {
- if (O) print(*O, IncIndent);
- }
- void print(std::ostream &O, unsigned IncIndent = 0);
+ void print(raw_ostream &O, unsigned IncIndent = 0);
void dump();
#endif
};
@@ -248,10 +241,7 @@
static bool classof(const DIEValue *) { return true; }
#ifndef NDEBUG
- void print(std::ostream *O) {
- if (O) print(*O);
- }
- virtual void print(std::ostream &O) = 0;
+ virtual void print(raw_ostream &O) = 0;
void dump();
#endif
};
@@ -297,7 +287,7 @@
static bool classof(const DIEValue *I) { return I->getType() == isInteger; }
#ifndef NDEBUG
- virtual void print(std::ostream &O);
+ virtual void print(raw_ostream &O);
#endif
};
@@ -329,7 +319,7 @@
static bool classof(const DIEValue *S) { return S->getType() == isString; }
#ifndef NDEBUG
- virtual void print(std::ostream &O);
+ virtual void print(raw_ostream &O);
#endif
};
@@ -359,7 +349,7 @@
static bool classof(const DIEValue *L) { return L->getType() == isLabel; }
#ifndef NDEBUG
- virtual void print(std::ostream &O);
+ virtual void print(raw_ostream &O);
#endif
};
@@ -392,7 +382,7 @@
}
#ifndef NDEBUG
- virtual void print(std::ostream &O);
+ virtual void print(raw_ostream &O);
#endif
};
@@ -431,7 +421,7 @@
}
#ifndef NDEBUG
- virtual void print(std::ostream &O);
+ virtual void print(raw_ostream &O);
#endif
};
@@ -464,7 +454,7 @@
static bool classof(const DIEValue *D) { return D->getType() == isDelta; }
#ifndef NDEBUG
- virtual void print(std::ostream &O);
+ virtual void print(raw_ostream &O);
#endif
};
@@ -500,7 +490,7 @@
static bool classof(const DIEValue *E) { return E->getType() == isEntry; }
#ifndef NDEBUG
- virtual void print(std::ostream &O);
+ virtual void print(raw_ostream &O);
#endif
};
@@ -544,7 +534,7 @@
static bool classof(const DIEValue *E) { return E->getType() == isBlock; }
#ifndef NDEBUG
- virtual void print(std::ostream &O);
+ virtual void print(raw_ostream &O);
#endif
};
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfLabel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfLabel.cpp?rev=79800&r1=79799&r2=79800&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfLabel.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfLabel.cpp Sat Aug 22 20:01:17 2009
@@ -13,7 +13,7 @@
#include "DwarfLabel.h"
#include "llvm/ADT/FoldingSet.h"
-#include <ostream>
+#include "llvm/Support/raw_ostream.h"
using namespace llvm;
@@ -25,10 +25,7 @@
}
#ifndef NDEBUG
-void DWLabel::print(std::ostream *O) const {
- if (O) print(*O);
-}
-void DWLabel::print(std::ostream &O) const {
+void DWLabel::print(raw_ostream &O) const {
O << "." << Tag;
if (Number) O << Number;
}
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfLabel.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfLabel.h?rev=79800&r1=79799&r2=79800&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfLabel.h (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfLabel.h Sat Aug 22 20:01:17 2009
@@ -14,19 +14,16 @@
#ifndef CODEGEN_ASMPRINTER_DWARFLABEL_H__
#define CODEGEN_ASMPRINTER_DWARFLABEL_H__
-#include "llvm/Support/Compiler.h"
-#include <iosfwd>
-#include <vector>
-
namespace llvm {
class FoldingSetNodeID;
+ class raw_ostream;
//===--------------------------------------------------------------------===//
/// DWLabel - Labels are used to track locations in the assembler file.
/// Labels appear in the form @verbatim <prefix><Tag><Number> @endverbatim,
/// where the tag is a category of label (Ex. location) and number is a value
/// unique in that category.
- class VISIBILITY_HIDDEN DWLabel {
+ class DWLabel {
/// Tag - Label category tag. Should always be a statically declared C
/// string.
///
@@ -47,8 +44,7 @@
void Profile(FoldingSetNodeID &ID) const;
#ifndef NDEBUG
- void print(std::ostream *O) const;
- void print(std::ostream &O) const;
+ void print(raw_ostream &O) const;
#endif
};
} // end llvm namespace
More information about the llvm-commits
mailing list