Changes in directory llvm/lib/Target/X86:
X86ATTAsmPrinter.cpp updated: 1.72 -> 1.73 X86CodeEmitter.cpp updated: 1.122 -> 1.123 X86ISelDAGToDAG.cpp updated: 1.127 -> 1.128 X86JITInfo.cpp updated: 1.31 -> 1.32 X86TargetMachine.cpp updated: 1.127 -> 1.128 --- Log message: Removed even more std::cerr and #include <iostream> things. --- Diffs of the changes: (+20 -31) X86ATTAsmPrinter.cpp | 1 - X86CodeEmitter.cpp | 4 +--- X86ISelDAGToDAG.cpp | 34 ++++++++++++++-------------------- X86JITInfo.cpp | 11 +++++------ X86TargetMachine.cpp | 1 - 5 files changed, 20 insertions(+), 31 deletions(-) Index: llvm/lib/Target/X86/X86ATTAsmPrinter.cpp diff -u llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.72 llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.73 --- llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.72 Tue Oct 31 14:12:30 2006 +++ llvm/lib/Target/X86/X86ATTAsmPrinter.cpp Fri Nov 17 01:52:03 2006 @@ -23,7 +23,6 @@ #include "llvm/Support/Mangler.h" #include "llvm/Target/TargetAsmInfo.h" #include "llvm/Target/TargetOptions.h" -#include <iostream> using namespace llvm; /// getSectionForFunction - Return the section that we should emit the Index: llvm/lib/Target/X86/X86CodeEmitter.cpp diff -u llvm/lib/Target/X86/X86CodeEmitter.cpp:1.122 llvm/lib/Target/X86/X86CodeEmitter.cpp:1.123 --- llvm/lib/Target/X86/X86CodeEmitter.cpp:1.122 Thu Nov 9 19:28:43 2006 +++ llvm/lib/Target/X86/X86CodeEmitter.cpp Fri Nov 17 01:52:03 2006 @@ -26,7 +26,6 @@ #include "llvm/ADT/Statistic.h" #include "llvm/Support/Compiler.h" #include "llvm/Target/TargetOptions.h" -#include <iostream> using namespace llvm; namespace { @@ -623,8 +622,7 @@ default: assert(0 && "psuedo instructions should be removed before code emission"); case TargetInstrInfo::INLINEASM: - std::cerr << "JIT does not support inline asm!\n"; - abort(); + assert(0 && "JIT does not support inline asm!\n"); case X86::IMPLICIT_USE: case X86::IMPLICIT_DEF: case X86::IMPLICIT_DEF_GR8: Index: llvm/lib/Target/X86/X86ISelDAGToDAG.cpp diff -u llvm/lib/Target/X86/X86ISelDAGToDAG.cpp:1.127 llvm/lib/Target/X86/X86ISelDAGToDAG.cpp:1.128 --- llvm/lib/Target/X86/X86ISelDAGToDAG.cpp:1.127 Mon Nov 13 17:36:35 2006 +++ llvm/lib/Target/X86/X86ISelDAGToDAG.cpp Fri Nov 17 01:52:03 2006 @@ -464,12 +464,12 @@ // Codegen the basic block. #ifndef NDEBUG - DEBUG(std::cerr << "===== Instruction selection begins:\n"); + DOUT << "===== Instruction selection begins:\n"; Indent = 0; #endif DAG.setRoot(SelectRoot(DAG.getRoot())); #ifndef NDEBUG - DEBUG(std::cerr << "===== Instruction selection ends:\n"); + DOUT << "===== Instruction selection ends:\n"; #endif DAG.RemoveDeadNodes(); @@ -966,19 +966,17 @@ unsigned Opcode = Node->getOpcode(); #ifndef NDEBUG - DEBUG(std::cerr << std::string(Indent, ' ')); - DEBUG(std::cerr << "Selecting: "); + DOUT << std::string(Indent, ' ') << "Selecting: "; DEBUG(Node->dump(CurDAG)); - DEBUG(std::cerr << "\n"); + DOUT << "\n"; Indent += 2; #endif if (Opcode >= ISD::BUILTIN_OP_END && Opcode < X86ISD::FIRST_NUMBER) { #ifndef NDEBUG - DEBUG(std::cerr << std::string(Indent-2, ' ')); - DEBUG(std::cerr << "== "); + DOUT << std::string(Indent-2, ' ') << "== "; DEBUG(Node->dump(CurDAG)); - DEBUG(std::cerr << "\n"); + DOUT << "\n"; Indent -= 2; #endif return NULL; // Already selected. @@ -1106,10 +1104,9 @@ ReplaceUses(N1.getValue(1), Result.getValue(1)); #ifndef NDEBUG - DEBUG(std::cerr << std::string(Indent-2, ' ')); - DEBUG(std::cerr << "=> "); + DOUT << std::string(Indent-2, ' ') << "=> "; DEBUG(Result.Val->dump(CurDAG)); - DEBUG(std::cerr << "\n"); + DOUT << "\n"; Indent -= 2; #endif return NULL; @@ -1218,10 +1215,9 @@ ReplaceUses(N1.getValue(1), Result.getValue(1)); #ifndef NDEBUG - DEBUG(std::cerr << std::string(Indent-2, ' ')); - DEBUG(std::cerr << "=> "); + DOUT << std::string(Indent-2, ' ') << "=> "; DEBUG(Result.Val->dump(CurDAG)); - DEBUG(std::cerr << "\n"); + DOUT << "\n"; Indent -= 2; #endif @@ -1252,10 +1248,9 @@ SDNode *ResNode = CurDAG->getTargetNode(Opc2, NVT, Tmp); #ifndef NDEBUG - DEBUG(std::cerr << std::string(Indent-2, ' ')); - DEBUG(std::cerr << "=> "); + DOUT << std::string(Indent-2, ' ') << "=> "; DEBUG(ResNode->dump(CurDAG)); - DEBUG(std::cerr << "\n"); + DOUT << "\n"; Indent -= 2; #endif return ResNode; @@ -1268,13 +1263,12 @@ SDNode *ResNode = SelectCode(N); #ifndef NDEBUG - DEBUG(std::cerr << std::string(Indent-2, ' ')); - DEBUG(std::cerr << "=> "); + DOUT << std::string(Indent-2, ' ') << "=> "; if (ResNode == NULL || ResNode == N.Val) DEBUG(N.Val->dump(CurDAG)); else DEBUG(ResNode->dump(CurDAG)); - DEBUG(std::cerr << "\n"); + DOUT << "\n"; Indent -= 2; #endif Index: llvm/lib/Target/X86/X86JITInfo.cpp diff -u llvm/lib/Target/X86/X86JITInfo.cpp:1.31 llvm/lib/Target/X86/X86JITInfo.cpp:1.32 --- llvm/lib/Target/X86/X86JITInfo.cpp:1.31 Thu Nov 16 14:13:34 2006 +++ llvm/lib/Target/X86/X86JITInfo.cpp Fri Nov 17 01:52:03 2006 @@ -18,7 +18,6 @@ #include "llvm/CodeGen/MachineCodeEmitter.h" #include "llvm/Config/alloca.h" #include <cstdlib> -#include <iostream> using namespace llvm; #ifdef _MSC_VER @@ -195,7 +194,7 @@ #else // Not an i386 host void X86CompilationCallback() { - std::cerr << "Cannot call X86CompilationCallback() on a non-x86 arch!\n"; + assert(0 && "Cannot call X86CompilationCallback() on a non-x86 arch!\n"); abort(); } #endif @@ -225,10 +224,10 @@ RetAddr -= 4; // Backtrack to the reference itself... #if 0 - DEBUG(std::cerr << "In callback! Addr=" << (void*)RetAddr - << " ESP=" << (void*)StackPtr - << ": Resolving call to function: " - << TheVM->getFunctionReferencedName((void*)RetAddr) << "\n"); + DOUT << "In callback! Addr=" << (void*)RetAddr + << " ESP=" << (void*)StackPtr + << ": Resolving call to function: " + << TheVM->getFunctionReferencedName((void*)RetAddr) << "\n"; #endif // Sanity check to make sure this really is a call instruction. Index: llvm/lib/Target/X86/X86TargetMachine.cpp diff -u llvm/lib/Target/X86/X86TargetMachine.cpp:1.127 llvm/lib/Target/X86/X86TargetMachine.cpp:1.128 --- llvm/lib/Target/X86/X86TargetMachine.cpp:1.127 Fri Sep 8 01:48:29 2006 +++ llvm/lib/Target/X86/X86TargetMachine.cpp Fri Nov 17 01:52:03 2006 @@ -21,7 +21,6 @@ #include "llvm/Target/TargetOptions.h" #include "llvm/Target/TargetMachineRegistry.h" #include "llvm/Transforms/Scalar.h" -#include <iostream> using namespace llvm; /// X86TargetMachineModule - Note that this is used on hosts that cannot link _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits