Changes in directory llvm/lib/CodeGen:
LiveInterval.cpp updated: 1.41 -> 1.42 MachineBasicBlock.cpp updated: 1.37 -> 1.38 MachineInstr.cpp updated: 1.139 -> 1.140 --- Log message: The best unbreakage yet, addressing Bill's concerns. --- Diffs of the changes: (+30 -49) LiveInterval.cpp | 5 +-- MachineBasicBlock.cpp | 5 --- MachineInstr.cpp | 69 ++++++++++++++++++++------------------------------ 3 files changed, 30 insertions(+), 49 deletions(-) Index: llvm/lib/CodeGen/LiveInterval.cpp diff -u llvm/lib/CodeGen/LiveInterval.cpp:1.41 llvm/lib/CodeGen/LiveInterval.cpp:1.42 --- llvm/lib/CodeGen/LiveInterval.cpp:1.41 Fri Dec 15 16:57:14 2006 +++ llvm/lib/CodeGen/LiveInterval.cpp Fri Dec 15 20:15:42 2006 @@ -512,7 +512,6 @@ } -OStream& llvm::operator<<(OStream& os, const LiveRange &LR) { - if (os.stream()) *os.stream() << LR; - return os; +void LiveRange::print(std::ostream &os) const { + os << *this; } Index: llvm/lib/CodeGen/MachineBasicBlock.cpp diff -u llvm/lib/CodeGen/MachineBasicBlock.cpp:1.37 llvm/lib/CodeGen/MachineBasicBlock.cpp:1.38 --- llvm/lib/CodeGen/MachineBasicBlock.cpp:1.37 Fri Dec 15 16:57:14 2006 +++ llvm/lib/CodeGen/MachineBasicBlock.cpp Fri Dec 15 20:15:42 2006 @@ -31,11 +31,6 @@ return OS; } -OStream& llvm::operator<<(OStream &OS, const MachineBasicBlock &MBB) { - if (OS.stream()) *OS.stream() << MBB; - return OS; -} - // MBBs start out as #-1. When a MBB is added to a MachineFunction, it // gets the next available unique MBB number. If it is removed from a // MachineFunction, it goes back to being #-1. Index: llvm/lib/CodeGen/MachineInstr.cpp diff -u llvm/lib/CodeGen/MachineInstr.cpp:1.139 llvm/lib/CodeGen/MachineInstr.cpp:1.140 --- llvm/lib/CodeGen/MachineInstr.cpp:1.139 Fri Dec 15 16:57:14 2006 +++ llvm/lib/CodeGen/MachineInstr.cpp Fri Dec 15 20:15:42 2006 @@ -304,74 +304,61 @@ OS << "\n"; } -std::ostream &llvm::operator<<(std::ostream &os, const MachineInstr &MI) { +void MachineInstr::print(std::ostream &os) const { // If the instruction is embedded into a basic block, we can find the target // info for the instruction. - if (const MachineBasicBlock *MBB = MI.getParent()) { + if (const MachineBasicBlock *MBB = getParent()) { const MachineFunction *MF = MBB->getParent(); if (MF) - MI.print(os, &MF->getTarget()); + print(os, &MF->getTarget()); else - MI.print(os, 0); - return os; + print(os, 0); } // Otherwise, print it out in the "raw" format without symbolic register names // and such. - os << MI.getInstrDescriptor()->Name; + os << getInstrDescriptor()->Name; - for (unsigned i = 0, N = MI.getNumOperands(); i < N; i++) { - os << "\t" << MI.getOperand(i); - if (MI.getOperand(i).isReg() && MI.getOperand(i).isDef()) + for (unsigned i = 0, N = getNumOperands(); i < N; i++) { + os << "\t" << getOperand(i); + if (getOperand(i).isReg() && getOperand(i).isDef()) os << "<d>"; } - return os << "\n"; + os << "\n"; } -std::ostream &llvm::operator<<(std::ostream &OS, const MachineOperand &MO) { - switch (MO.getType()) { - case MachineOperand::MO_Register: - OutputReg(OS, MO.getReg()); +void MachineOperand::print(std::ostream &OS) const { + switch (getType()) { + case MO_Register: + OutputReg(OS, getReg()); break; - case MachineOperand::MO_Immediate: - OS << (long)MO.getImmedValue(); + case MO_Immediate: + OS << (long)getImmedValue(); break; - case MachineOperand::MO_MachineBasicBlock: + case MO_MachineBasicBlock: OS << "<mbb:" - << ((Value*)MO.getMachineBasicBlock()->getBasicBlock())->getName() - << "@" << (void*)MO.getMachineBasicBlock() << ">"; + << ((Value*)getMachineBasicBlock()->getBasicBlock())->getName() + << "@" << (void*)getMachineBasicBlock() << ">"; break; - case MachineOperand::MO_FrameIndex: - OS << "<fi#" << MO.getFrameIndex() << ">"; + case MO_FrameIndex: + OS << "<fi#" << getFrameIndex() << ">"; break; - case MachineOperand::MO_ConstantPoolIndex: - OS << "<cp#" << MO.getConstantPoolIndex() << ">"; + case MO_ConstantPoolIndex: + OS << "<cp#" << getConstantPoolIndex() << ">"; break; - case MachineOperand::MO_JumpTableIndex: - OS << "<jt#" << MO.getJumpTableIndex() << ">"; + case MO_JumpTableIndex: + OS << "<jt#" << getJumpTableIndex() << ">"; break; - case MachineOperand::MO_GlobalAddress: - OS << "<ga:" << ((Value*)MO.getGlobal())->getName() << ">"; + case MO_GlobalAddress: + OS << "<ga:" << ((Value*)getGlobal())->getName() << ">"; break; - case MachineOperand::MO_ExternalSymbol: - OS << "<es:" << MO.getSymbolName() << ">"; + case MO_ExternalSymbol: + OS << "<es:" << getSymbolName() << ">"; break; default: assert(0 && "Unrecognized operand type"); break; } - - return OS; -} - -OStream& llvm::operator<<(OStream& os, const MachineInstr& minstr) { - if (os.stream()) *os.stream() << minstr; - return os; -} - -OStream& llvm::operator<<(OStream& os, const MachineOperand& mop) { - if (os.stream()) *os.stream() << mop; - return os; } _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits