From 6345d75729392d9b50383f1b5c7f92d477572290 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Fri, 17 Nov 2006 07:52:03 +0000 Subject: [PATCH] Removed even more std::cerr and #include things. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@31813 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/X86/X86ATTAsmPrinter.cpp | 1 - lib/Target/X86/X86CodeEmitter.cpp | 4 +--- lib/Target/X86/X86ISelDAGToDAG.cpp | 34 ++++++++++++----------------- lib/Target/X86/X86JITInfo.cpp | 11 +++++----- lib/Target/X86/X86TargetMachine.cpp | 1 - 5 files changed, 20 insertions(+), 31 deletions(-) diff --git a/lib/Target/X86/X86ATTAsmPrinter.cpp b/lib/Target/X86/X86ATTAsmPrinter.cpp index 4e47b6a27ce..069eed91d50 100755 --- a/lib/Target/X86/X86ATTAsmPrinter.cpp +++ b/lib/Target/X86/X86ATTAsmPrinter.cpp @@ -23,7 +23,6 @@ #include "llvm/Support/Mangler.h" #include "llvm/Target/TargetAsmInfo.h" #include "llvm/Target/TargetOptions.h" -#include using namespace llvm; /// getSectionForFunction - Return the section that we should emit the diff --git a/lib/Target/X86/X86CodeEmitter.cpp b/lib/Target/X86/X86CodeEmitter.cpp index 2b4328b1612..aa77a25e1b7 100644 --- a/lib/Target/X86/X86CodeEmitter.cpp +++ b/lib/Target/X86/X86CodeEmitter.cpp @@ -26,7 +26,6 @@ #include "llvm/ADT/Statistic.h" #include "llvm/Support/Compiler.h" #include "llvm/Target/TargetOptions.h" -#include using namespace llvm; namespace { @@ -623,8 +622,7 @@ void Emitter::emitInstruction(const MachineInstr &MI) { 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: diff --git a/lib/Target/X86/X86ISelDAGToDAG.cpp b/lib/Target/X86/X86ISelDAGToDAG.cpp index 68b89a4d160..8543295014a 100644 --- a/lib/Target/X86/X86ISelDAGToDAG.cpp +++ b/lib/Target/X86/X86ISelDAGToDAG.cpp @@ -464,12 +464,12 @@ void X86DAGToDAGISel::InstructionSelectBasicBlock(SelectionDAG &DAG) { // 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 @@ SDNode *X86DAGToDAGISel::Select(SDOperand N) { 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 @@ SDNode *X86DAGToDAGISel::Select(SDOperand N) { 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 @@ SDNode *X86DAGToDAGISel::Select(SDOperand N) { 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 *X86DAGToDAGISel::Select(SDOperand N) { 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 *X86DAGToDAGISel::Select(SDOperand N) { 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 diff --git a/lib/Target/X86/X86JITInfo.cpp b/lib/Target/X86/X86JITInfo.cpp index 0e34fe3b216..c37eca7ae71 100644 --- a/lib/Target/X86/X86JITInfo.cpp +++ b/lib/Target/X86/X86JITInfo.cpp @@ -18,7 +18,6 @@ #include "llvm/CodeGen/MachineCodeEmitter.h" #include "llvm/Config/alloca.h" #include -#include using namespace llvm; #ifdef _MSC_VER @@ -195,7 +194,7 @@ extern "C" { #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 @@ extern "C" void X86CompilationCallback2(intptr_t *StackPtr, intptr_t RetAddr) { 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. diff --git a/lib/Target/X86/X86TargetMachine.cpp b/lib/Target/X86/X86TargetMachine.cpp index b4fc79abcae..78f7324c22f 100644 --- a/lib/Target/X86/X86TargetMachine.cpp +++ b/lib/Target/X86/X86TargetMachine.cpp @@ -21,7 +21,6 @@ #include "llvm/Target/TargetOptions.h" #include "llvm/Target/TargetMachineRegistry.h" #include "llvm/Transforms/Scalar.h" -#include using namespace llvm; /// X86TargetMachineModule - Note that this is used on hosts that cannot link -- 2.34.1