Removed even more std::cerr and #include <iostream> things.

llvm-svn: 31813

llvm/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 <iostream>
 using namespace llvm;
 
 /// getSectionForFunction - Return the section that we should emit the

llvm/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 <iostream>
 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";
+      assert(0 && "JIT does not support inline asm!\n");
-      abort();
     case X86::IMPLICIT_USE:
     case X86::IMPLICIT_DEF:
     case X86::IMPLICIT_DEF_GR8:

llvm/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, ' '));
+  DOUT << std::string(Indent, ' ') << "Selecting: ";
-  DEBUG(std::cerr << "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, ' '));
+    DOUT << std::string(Indent-2, ' ') << "== ";
-    DEBUG(std::cerr << "== ");
     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, ' '));
+      DOUT << std::string(Indent-2, ' ') << "=> ";
-      DEBUG(std::cerr << "=> ");
       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, ' '));
+      DOUT << std::string(Indent-2, ' ') << "=> ";
-      DEBUG(std::cerr << "=> ");
       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, ' '));
+        DOUT << std::string(Indent-2, ' ') << "=> ";
-        DEBUG(std::cerr << "=> ");
         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, ' '));
+  DOUT << std::string(Indent-2, ' ') << "=> ";
-  DEBUG(std::cerr << "=> ");
   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
 

llvm/lib/Target/X86/X86JITInfo.cpp

@@ -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 @@ 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
+  DOUT << "In callback! Addr=" << (void*)RetAddr
-                  << " ESP=" << (void*)StackPtr
+       << " ESP=" << (void*)StackPtr
-                  << ": Resolving call to function: "
+       << ": Resolving call to function: "
-                  << TheVM->getFunctionReferencedName((void*)RetAddr) << "\n");
+       << TheVM->getFunctionReferencedName((void*)RetAddr) << "\n";
 #endif
 
   // Sanity check to make sure this really is a call instruction.

llvm/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 <iostream>
 using namespace llvm;
 
 /// X86TargetMachineModule - Note that this is used on hosts that cannot link