X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=dev%2Fsimconsole.cc;h=94fd9ec1fc3adfcba93312d2a3d84c6ddeac58d4;hb=91601f44948060939527bad44e82b1379168fc6c;hp=b2afb3f842ac76039950e01cb431906e9667c1ba;hpb=f267dc4a8729179ed99ec591af2ba434cb644755;p=gem5.git

diff --git a/dev/simconsole.cc b/dev/simconsole.cc
index b2afb3f84..94fd9ec1f 100644
--- a/dev/simconsole.cc
+++ b/dev/simconsole.cc
@@ -43,14 +43,14 @@
 #include <string>
 
 #include "base/misc.hh"
+#include "base/output.hh"
 #include "base/socket.hh"
 #include "base/trace.hh"
+#include "dev/platform.hh"
 #include "dev/simconsole.hh"
+#include "dev/uart.hh"
 #include "mem/functional_mem/memory_control.hh"
 #include "sim/builder.hh"
-#include "targetarch/ev5.hh"
-#include "dev/uart.hh"
-#include "dev/platform.hh"
 
 using namespace std;
 
@@ -72,7 +72,7 @@ SimConsole::Event::process(int revent)
         cons->detach();
 }
 
-SimConsole::SimConsole(const string &name, std::ostream *os, int num)
+SimConsole::SimConsole(const string &name, ostream *os, int num)
     : SimObject(name), event(NULL), number(num), in_fd(-1), out_fd(-1),
       listener(NULL), txbuf(16384), rxbuf(16384), outfile(os)
 #if TRACING_ON == 1
@@ -86,8 +86,6 @@ SimConsole::SimConsole(const string &name, std::ostream *os, int num)
 SimConsole::~SimConsole()
 {
     close();
-    if (outfile)
-        closeOutputStream(outfile);
 }
 
 void
@@ -314,18 +312,16 @@ END_INIT_SIM_OBJECT_PARAMS(SimConsole)
 
 CREATE_SIM_OBJECT(SimConsole)
 {
-    string filename;
+    string filename = output;
+    ostream *stream = NULL;
 
-    if (!output.isValid()) {
-        filename = getInstanceName();
-    } else if (append_name) {
-        filename = (string)output + "." + getInstanceName();
-    } else {
-        filename = output;
+    if (!filename.empty()) {
+        if (append_name)
+            filename += "." + getInstanceName();
+        stream = simout.find(filename);
     }
 
-    SimConsole *console = new SimConsole(getInstanceName(),
-                                         makeOutputStream(filename), number);
+    SimConsole *console = new SimConsole(getInstanceName(), stream, number);
     ((ConsoleListener *)listener)->add(console);
 
     return console;