diff options
Diffstat (limited to 'utils/TableGen/Record.cpp')
| -rw-r--r-- | utils/TableGen/Record.cpp | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/utils/TableGen/Record.cpp b/utils/TableGen/Record.cpp index a7538731fd..8f31624644 100644 --- a/utils/TableGen/Record.cpp +++ b/utils/TableGen/Record.cpp @@ -13,9 +13,8 @@ #include "Record.h" #include "llvm/Support/DataTypes.h" -#include "llvm/Support/Streams.h" +#include "llvm/Support/Format.h" #include "llvm/ADT/StringExtras.h" -#include <ios> using namespace llvm; @@ -23,7 +22,7 @@ using namespace llvm; // Type implementations //===----------------------------------------------------------------------===// -void RecTy::dump() const { print(*cerr.stream()); } +void RecTy::dump() const { print(errs()); } Init *BitRecTy::convertValue(BitsInit *BI) { if (BI->getNumBits() != 1) return 0; // Only accept if just one bit! @@ -330,7 +329,7 @@ RecTy *llvm::resolveTypes(RecTy *T1, RecTy *T2) { // Initializer implementations //===----------------------------------------------------------------------===// -void Init::dump() const { return print(*cerr.stream()); } +void Init::dump() const { return print(errs()); } Init *BitsInit::convertInitializerBitRange(const std::vector<unsigned> &Bits) { BitsInit *BI = new BitsInit(Bits.size()); @@ -360,7 +359,7 @@ std::string BitsInit::getAsString() const { return Result + " }"; } -bool BitsInit::printInHex(std::ostream &OS) const { +bool BitsInit::printInHex(raw_ostream &OS) const { // First, attempt to convert the value into an integer value... int64_t Result = 0; for (unsigned i = 0, e = getNumBits(); i != e; ++i) @@ -370,11 +369,11 @@ bool BitsInit::printInHex(std::ostream &OS) const { return true; } - OS << "0x" << std::hex << Result << std::dec; + OS << format("0x%x", Result); return false; } -bool BitsInit::printAsVariable(std::ostream &OS) const { +bool BitsInit::printAsVariable(raw_ostream &OS) const { // Get the variable that we may be set equal to... assert(getNumBits() != 0); VarBitInit *FirstBit = dynamic_cast<VarBitInit*>(getBit(0)); @@ -397,7 +396,7 @@ bool BitsInit::printAsVariable(std::ostream &OS) const { return false; } -bool BitsInit::printAsUnset(std::ostream &OS) const { +bool BitsInit::printAsUnset(raw_ostream &OS) const { for (unsigned i = 0, e = getNumBits(); i != e; ++i) if (!dynamic_cast<UnsetInit*>(getBit(i))) return true; @@ -592,7 +591,7 @@ Init *UnOpInit::Fold(Record *CurRec, MultiClass *CurMultiClass) { if (Record *D = Records.getDef(Name)) return new DefInit(D); - cerr << "Variable not defined: '" + Name + "'\n"; + errs() << "Variable not defined: '" + Name + "'\n"; assert(0 && "Variable not found"); return 0; } @@ -771,7 +770,7 @@ Init *BinOpInit::Fold(Record *CurRec, MultiClass *CurMultiClass) { if (Record *D = Records.getDef(Name)) return new DefInit(D); - cerr << "Variable not defined in !nameconcat: '" + Name + "'\n"; + errs() << "Variable not defined in !nameconcat: '" + Name + "'\n"; assert(0 && "Variable not found in !nameconcat"); return 0; } @@ -886,14 +885,14 @@ static Init *ForeachHelper(Init *LHS, Init *MHS, Init *RHS, RecTy *Type, OpInit *RHSo = dynamic_cast<OpInit*>(RHS); if (!RHSo) { - cerr << "!foreach requires an operator\n"; + errs() << "!foreach requires an operator\n"; assert(0 && "No operator for !foreach"); } TypedInit *LHSt = dynamic_cast<TypedInit*>(LHS); if (!LHSt) { - cerr << "!foreach requires typed variable\n"; + errs() << "!foreach requires typed variable\n"; assert(0 && "No typed variable for !foreach"); } @@ -1308,9 +1307,9 @@ RecordVal::RecordVal(const std::string &N, RecTy *T, unsigned P) assert(Value && "Cannot create unset value for current type!"); } -void RecordVal::dump() const { cerr << *this; } +void RecordVal::dump() const { errs() << *this; } -void RecordVal::print(std::ostream &OS, bool PrintSem) const { +void RecordVal::print(raw_ostream &OS, bool PrintSem) const { if (getPrefix()) OS << "field "; OS << *getType() << " " << getName(); @@ -1343,9 +1342,9 @@ void Record::resolveReferencesTo(const RecordVal *RV) { } -void Record::dump() const { cerr << *this; } +void Record::dump() const { errs() << *this; } -std::ostream &llvm::operator<<(std::ostream &OS, const Record &R) { +raw_ostream &llvm::operator<<(raw_ostream &OS, const Record &R) { OS << R.getName(); const std::vector<std::string> &TArgs = R.getTemplateArgs(); @@ -1556,10 +1555,10 @@ std::string Record::getValueAsCode(const std::string &FieldName) const { void MultiClass::dump() const { - cerr << "Record:\n"; + errs() << "Record:\n"; Rec.dump(); - cerr << "Defs:\n"; + errs() << "Defs:\n"; for (RecordVector::const_iterator r = DefPrototypes.begin(), rend = DefPrototypes.end(); r != rend; @@ -1569,9 +1568,9 @@ void MultiClass::dump() const { } -void RecordKeeper::dump() const { cerr << *this; } +void RecordKeeper::dump() const { errs() << *this; } -std::ostream &llvm::operator<<(std::ostream &OS, const RecordKeeper &RK) { +raw_ostream &llvm::operator<<(raw_ostream &OS, const RecordKeeper &RK) { OS << "------------- Classes -----------------\n"; const std::map<std::string, Record*> &Classes = RK.getClasses(); for (std::map<std::string, Record*>::const_iterator I = Classes.begin(), |