Changes in directory llvm/lib/ExecutionEngine/Interpreter:
Execution.cpp updated: 1.148 -> 1.149
ExternalFunctions.cpp updated: 1.89 -> 1.90
---
Log message:
Removed #include <iostream> and replaced streams with llvm streams.
---
Diffs of the changes: (+36 -35)
Execution.cpp | 58 +++++++++++++++++++++++++-------------------------
ExternalFunctions.cpp | 13 ++++++-----
2 files changed, 36 insertions(+), 35 deletions(-)
Index: llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
diff -u llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.148
llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.149
--- llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.148 Sun Nov 26
19:05:10 2006
+++ llvm/lib/ExecutionEngine/Interpreter/Execution.cpp Mon Nov 27 17:54:50 2006
@@ -187,7 +187,7 @@
getOperandValue(CE->getOperand(1), SF),
getOperandValue(CE->getOperand(2), SF));
default:
- std::cerr << "Unhandled ConstantExpr: " << *CE << "\n";
+ llvm_cerr << "Unhandled ConstantExpr: " << *CE << "\n";
abort();
return GenericValue();
}
@@ -235,7 +235,7 @@
IMPLEMENT_BINARY_OPERATOR(+, Float);
IMPLEMENT_BINARY_OPERATOR(+, Double);
default:
- std::cout << "Unhandled type for Add instruction: " << *Ty << "\n";
+ llvm_cerr << "Unhandled type for Add instruction: " << *Ty << "\n";
abort();
}
return Dest;
@@ -256,7 +256,7 @@
IMPLEMENT_BINARY_OPERATOR(-, Float);
IMPLEMENT_BINARY_OPERATOR(-, Double);
default:
- std::cout << "Unhandled type for Sub instruction: " << *Ty << "\n";
+ llvm_cerr << "Unhandled type for Sub instruction: " << *Ty << "\n";
abort();
}
return Dest;
@@ -277,7 +277,7 @@
IMPLEMENT_BINARY_OPERATOR(*, Float);
IMPLEMENT_BINARY_OPERATOR(*, Double);
default:
- std::cout << "Unhandled type for Mul instruction: " << *Ty << "\n";
+ llvm_cerr << "Unhandled type for Mul instruction: " << *Ty << "\n";
abort();
}
return Dest;
@@ -295,7 +295,7 @@
IMPLEMENT_SIGNLESS_BINOP(/, UInt, Int);
IMPLEMENT_SIGNLESS_BINOP(/, ULong, Long);
default:
- std::cout << "Unhandled type for UDiv instruction: " << *Ty << "\n";
+ llvm_cerr << "Unhandled type for UDiv instruction: " << *Ty << "\n";
abort();
}
return Dest;
@@ -310,7 +310,7 @@
IMPLEMENT_SIGNLESS_BINOP(/, Int, UInt);
IMPLEMENT_SIGNLESS_BINOP(/, Long, ULong);
default:
- std::cout << "Unhandled type for SDiv instruction: " << *Ty << "\n";
+ llvm_cerr << "Unhandled type for SDiv instruction: " << *Ty << "\n";
abort();
}
return Dest;
@@ -323,7 +323,7 @@
IMPLEMENT_BINARY_OPERATOR(/, Float);
IMPLEMENT_BINARY_OPERATOR(/, Double);
default:
- std::cout << "Unhandled type for Div instruction: " << *Ty << "\n";
+ llvm_cerr << "Unhandled type for Div instruction: " << *Ty << "\n";
abort();
}
return Dest;
@@ -338,7 +338,7 @@
IMPLEMENT_SIGNLESS_BINOP(%, UInt, Int);
IMPLEMENT_SIGNLESS_BINOP(%, ULong, Long);
default:
- std::cout << "Unhandled type for URem instruction: " << *Ty << "\n";
+ llvm_cerr << "Unhandled type for URem instruction: " << *Ty << "\n";
abort();
}
return Dest;
@@ -353,7 +353,7 @@
IMPLEMENT_SIGNLESS_BINOP(%, Int, UInt);
IMPLEMENT_SIGNLESS_BINOP(%, Long, ULong);
default:
- std::cout << "Unhandled type for Rem instruction: " << *Ty << "\n";
+ llvm_cerr << "Unhandled type for Rem instruction: " << *Ty << "\n";
abort();
}
return Dest;
@@ -370,7 +370,7 @@
Dest.DoubleVal = fmod(Src1.DoubleVal, Src2.DoubleVal);
break;
default:
- std::cout << "Unhandled type for Rem instruction: " << *Ty << "\n";
+ llvm_cerr << "Unhandled type for Rem instruction: " << *Ty << "\n";
abort();
}
return Dest;
@@ -390,7 +390,7 @@
IMPLEMENT_BINARY_OPERATOR(&, ULong);
IMPLEMENT_BINARY_OPERATOR(&, Long);
default:
- std::cout << "Unhandled type for And instruction: " << *Ty << "\n";
+ llvm_cerr << "Unhandled type for And instruction: " << *Ty << "\n";
abort();
}
return Dest;
@@ -410,7 +410,7 @@
IMPLEMENT_BINARY_OPERATOR(|, ULong);
IMPLEMENT_BINARY_OPERATOR(|, Long);
default:
- std::cout << "Unhandled type for Or instruction: " << *Ty << "\n";
+ llvm_cerr << "Unhandled type for Or instruction: " << *Ty << "\n";
abort();
}
return Dest;
@@ -430,7 +430,7 @@
IMPLEMENT_BINARY_OPERATOR(^, ULong);
IMPLEMENT_BINARY_OPERATOR(^, Long);
default:
- std::cout << "Unhandled type for Xor instruction: " << *Ty << "\n";
+ llvm_cerr << "Unhandled type for Xor instruction: " << *Ty << "\n";
abort();
}
return Dest;
@@ -464,7 +464,7 @@
IMPLEMENT_SETCC(==, Double);
IMPLEMENT_POINTERSETCC(==);
default:
- std::cout << "Unhandled type for SetEQ instruction: " << *Ty << "\n";
+ llvm_cerr << "Unhandled type for SetEQ instruction: " << *Ty << "\n";
abort();
}
return Dest;
@@ -487,7 +487,7 @@
IMPLEMENT_POINTERSETCC(!=);
default:
- std::cout << "Unhandled type for SetNE instruction: " << *Ty << "\n";
+ llvm_cerr << "Unhandled type for SetNE instruction: " << *Ty << "\n";
abort();
}
return Dest;
@@ -509,7 +509,7 @@
IMPLEMENT_SETCC(<=, Double);
IMPLEMENT_POINTERSETCC(<=);
default:
- std::cout << "Unhandled type for SetLE instruction: " << *Ty << "\n";
+ llvm_cerr << "Unhandled type for SetLE instruction: " << *Ty << "\n";
abort();
}
return Dest;
@@ -531,7 +531,7 @@
IMPLEMENT_SETCC(>=, Double);
IMPLEMENT_POINTERSETCC(>=);
default:
- std::cout << "Unhandled type for SetGE instruction: " << *Ty << "\n";
+ llvm_cerr << "Unhandled type for SetGE instruction: " << *Ty << "\n";
abort();
}
return Dest;
@@ -553,7 +553,7 @@
IMPLEMENT_SETCC(<, Double);
IMPLEMENT_POINTERSETCC(<);
default:
- std::cout << "Unhandled type for SetLT instruction: " << *Ty << "\n";
+ llvm_cerr << "Unhandled type for SetLT instruction: " << *Ty << "\n";
abort();
}
return Dest;
@@ -575,7 +575,7 @@
IMPLEMENT_SETCC(>, Double);
IMPLEMENT_POINTERSETCC(>);
default:
- std::cout << "Unhandled type for SetGT instruction: " << *Ty << "\n";
+ llvm_cerr << "Unhandled type for SetGT instruction: " << *Ty << "\n";
abort();
}
return Dest;
@@ -608,7 +608,7 @@
case Instruction::SetLT: R = executeSetLTInst(Src1, Src2, Ty); break;
case Instruction::SetGT: R = executeSetGTInst(Src1, Src2, Ty); break;
default:
- std::cout << "Don't know how to handle this binary operator!\n-->" << I;
+ llvm_cerr << "Don't know how to handle this binary operator!\n-->" << I;
abort();
}
@@ -709,7 +709,7 @@
}
void Interpreter::visitUnreachableInst(UnreachableInst &I) {
- std::cerr << "ERROR: Program executed an 'unreachable' instruction!\n";
+ llvm_cerr << "ERROR: Program executed an 'unreachable' instruction!\n";
abort();
}
@@ -977,7 +977,7 @@
IMPLEMENT_SHIFT(<<, ULong);
IMPLEMENT_SHIFT(<<, Long);
default:
- std::cout << "Unhandled type for Shl instruction: " << *Ty << "\n";
+ llvm_cerr << "Unhandled type for Shl instruction: " << *Ty << "\n";
}
return Dest;
}
@@ -991,7 +991,7 @@
IMPLEMENT_SIGNLESS_SHIFT(>>, UInt, Int);
IMPLEMENT_SIGNLESS_SHIFT(>>, ULong, Long);
default:
- std::cout << "Unhandled type for LShr instruction: " << *Ty << "\n";
+ llvm_cerr << "Unhandled type for LShr instruction: " << *Ty << "\n";
abort();
}
return Dest;
@@ -1006,7 +1006,7 @@
IMPLEMENT_SIGNLESS_SHIFT(>>, Int, UInt);
IMPLEMENT_SIGNLESS_SHIFT(>>, Long, ULong);
default:
- std::cout << "Unhandled type for AShr instruction: " << *Ty << "\n";
+ llvm_cerr << "Unhandled type for AShr instruction: " << *Ty << "\n";
abort();
}
return Dest;
@@ -1064,14 +1064,14 @@
IMPLEMENT_CAST(DESTTY, DESTCTY, Float); \
IMPLEMENT_CAST(DESTTY, DESTCTY, Double) \
default: \
- std::cout << "Unhandled cast: " \
+ llvm_cerr << "Unhandled cast: " \
<< *SrcTy << " to " << *DstTy << "\n"; \
abort(); \
} \
break
#define IMPLEMENT_CAST_END \
- default: std::cout \
+ default: llvm_cerr \
<< "Unhandled dest type for cast instruction: " \
<< *DstTy << "\n"; \
abort(); \
@@ -1225,7 +1225,7 @@
IMPLEMENT_CAST_END
break;
default:
- std::cout
+ llvm_cerr
<< "Invalid cast opcode for cast instruction: " << opcode << "\n";
abort();
}
@@ -1265,7 +1265,7 @@
IMPLEMENT_VAARG(Double);
IMPLEMENT_VAARG(Bool);
default:
- std::cout << "Unhandled dest type for vaarg instruction: " << *Ty << "\n";
+ llvm_cerr << "Unhandled dest type for vaarg instruction: " << *Ty << "\n";
abort();
}
@@ -1328,7 +1328,7 @@
// Track the number of dynamic instructions executed.
++NumDynamicInsts;
- DEBUG(std::cerr << "About to interpret: " << I);
+ DOUT << "About to interpret: " << I;
visit(I); // Dispatch to one of the visit* methods...
}
}
Index: llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
diff -u llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp:1.89
llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp:1.90
--- llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp:1.89 Wed Nov
8 13:16:44 2006
+++ llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp Mon Nov 27
17:54:50 2006
@@ -22,6 +22,7 @@
#include "Interpreter.h"
#include "llvm/DerivedTypes.h"
#include "llvm/Module.h"
+#include "llvm/Support/Streams.h"
#include "llvm/System/DynamicLibrary.h"
#include "llvm/Target/TargetData.h"
#include <csignal>
@@ -91,7 +92,7 @@
std::map<const Function *, ExFunc>::iterator FI = Functions.find(F);
ExFunc Fn = (FI == Functions.end()) ? lookupFunction(F) : FI->second;
if (Fn == 0) {
- std::cout << "Tried to execute an unknown external function: "
+ llvm_cerr << "Tried to execute an unknown external function: "
<< F->getType()->getDescription() << " " << F->getName() << "\n";
if (F->getName() == "__main")
return GenericValue();
@@ -112,19 +113,19 @@
// void putchar(sbyte)
GenericValue lle_Vb_putchar(FunctionType *M, const vector<GenericValue> &Args)
{
- std::cout << Args[0].SByteVal;
+ llvm_cout << Args[0].SByteVal;
return GenericValue();
}
// int putchar(int)
GenericValue lle_ii_putchar(FunctionType *M, const vector<GenericValue> &Args)
{
- std::cout << ((char)Args[0].IntVal) << std::flush;
+ llvm_cout << ((char)Args[0].IntVal) << std::flush;
return Args[0];
}
// void putchar(ubyte)
GenericValue lle_VB_putchar(FunctionType *M, const vector<GenericValue> &Args)
{
- std::cout << Args[0].SByteVal << std::flush;
+ llvm_cout << Args[0].SByteVal << std::flush;
return Args[0];
}
@@ -330,7 +331,7 @@
sprintf(Buffer, FmtBuf, (void*)GVTOP(Args[ArgNo++])); break;
case 's':
sprintf(Buffer, FmtBuf, (char*)GVTOP(Args[ArgNo++])); break;
- default: std::cout << "<unknown printf code '" << *FmtStr << "'!>";
+ default: llvm_cerr << "<unknown printf code '" << *FmtStr << "'!>";
ArgNo++; break;
}
strcpy(OutputBuffer, Buffer);
@@ -348,7 +349,7 @@
NewArgs.push_back(PTOGV(Buffer));
NewArgs.insert(NewArgs.end(), Args.begin(), Args.end());
GenericValue GV = lle_X_sprintf(M, NewArgs);
- std::cout << Buffer;
+ llvm_cout << Buffer;
return GV;
}
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
