summaryrefslogtreecommitdiff
path: root/dev/console.cc
diff options
context:
space:
mode:
Diffstat (limited to 'dev/console.cc')
-rw-r--r--dev/console.cc12
1 files changed, 10 insertions, 2 deletions
diff --git a/dev/console.cc b/dev/console.cc
index f4156207d..3fa51a414 100644
--- a/dev/console.cc
+++ b/dev/console.cc
@@ -383,8 +383,16 @@ END_INIT_SIM_OBJECT_PARAMS(SimConsole)
CREATE_SIM_OBJECT(SimConsole)
{
string filename = output;
- if (!filename.empty() && append_name)
- filename += "." + getInstanceName();
+ if (filename.empty()) {
+ if (!outputDirectory.empty())
+ filename = outputDirectory + getInstanceName();
+ } else {
+ if (append_name)
+ filename += "." + getInstanceName();
+ if (!outputDirectory.empty())
+ filename = outputDirectory + filename;
+ }
+
SimConsole *console = new SimConsole(getInstanceName(), filename, number);
((ConsoleListener *)listener)->add(console);
((SimConsole *)console)->initInt(intr_control);