Get rid of outputStream... wasn't really being used

(except for warn()) and new -r/-e options make it
not worth fixing.

diff --git a/src/base/misc.cc b/src/base/misc.cc
index afb48ca801064a19d7229e03b8750d229984d6ec..0ab1d6041f1594bce0e98e296260ef0abac2ff8e 100644 (file)
--- a/src/base/misc.cc
+++ b/src/base/misc.cc
@@ -129,6 +129,4 @@ __warn(const char *func, const char *file, int line, const char *fmt,
 #endif
 
     ccprintf(cerr, format.c_str(), args);
-    if (simout.isFile(*outputStream))
-        ccprintf(*outputStream, format.c_str(), args);
 }

diff --git a/src/python/swig/core.i b/src/python/swig/core.i
index 3d360c01714f7ed56f4dffcb4b9edaae63438df3..b0773ca68bea89ddbc77641b84a85b07f7842062 100644 (file)
--- a/src/python/swig/core.i
+++ b/src/python/swig/core.i
@@ -52,7 +52,6 @@ inline void disableAllListeners() { ListenSocket::disableAll(); }
 %include "sim/host.hh"
 
 void setOutputDir(const std::string &dir);
-void setOutputFile(const std::string &file);
 void SimStartup();
 void doExitCleanup();
 void disableAllListeners();

diff --git a/src/sim/core.cc b/src/sim/core.cc
index 75f1f384c6a49be90ce6f2f52760810a5a077432..8342b674003d7cb407c11a149760cb083ce277e1 100644 (file)
--- a/src/sim/core.cc
+++ b/src/sim/core.cc
@@ -97,14 +97,6 @@ setOutputDir(const string &dir)
     simout.setDirectory(dir);
 }
 
-ostream *outputStream;
-
-void
-setOutputFile(const string &file)
-{
-    outputStream = simout.find(file);
-}
-
 /**
  * Queue of C++ callbacks to invoke on simulator exit.
  */

diff --git a/src/sim/core.hh b/src/sim/core.hh
index fb7f921f47b84bd6866a7447c9273dd4abcd9843..50cb2ef59a11b22182b49b73cc1701ab8ab39cf3 100644 (file)
--- a/src/sim/core.hh
+++ b/src/sim/core.hh
@@ -68,11 +68,6 @@ extern Tick ps;
 
 void setClockFrequency(Tick ticksPerSecond);
 
-/// Output stream for simulator messages (e.g., cprintf()).  Also used
-/// as default stream for tracing and DPRINTF() messages (unless
-/// overridden with trace:file option).
-extern std::ostream *outputStream;
-void setOutputFile(const std::string &file);
 void setOutputDir(const std::string &dir);
 
 struct Callback;