Merge

--HG--
extra : convert_revision : 8690e31b64235874d74ea4a1123a408610fb115b

1 files changed, 42 insertions, 17 deletions

diff --git a/dev/console.cc b/dev/console.cc
index 08b169bc4..fb74c388a 100644
--- a/dev/console.cc
+++ b/dev/console.cc
@@ -228,27 +228,44 @@ SimConsole::configTerm()
 #define RECEIVE_NONE (ULL(2) << 62)
 #define RECEIVE_ERROR (ULL(3) << 62)
 
-uint64_t
-SimConsole::in()
+bool
+SimConsole::in(uint8_t &c)
 {
-    char c = 0;
-    uint64_t val = 0;
-    if (rxbuf.empty()) {
+    bool empty, ret;
+
+    empty = rxbuf.empty();
+    ret = !empty;
+    if (!empty) {
+        rxbuf.read((char *)&c, 1);
+        empty = rxbuf.empty();
+    }
+
+    if (empty)
         clearInt(ReceiveInterrupt);
-        val |= RECEIVE_NONE;
-        return 0x8;
-    } else {
-        uint64_t val;
-        rxbuf.read(&c, 1);
-        val |= RECEIVE_SUCCESS | c;
+
+    DPRINTF(ConsoleVerbose, "in: \'%c\' %#02x more: %d, return: %d\n",
+            isprint(c) ? c : ' ', c, !empty, ret);
+
+    return ret;
+}
+
+uint64_t
+SimConsole::console_in()
+{
+    uint8_t c;
+    uint64_t value;
+
+    if (in(c)) {
+        value = RECEIVE_SUCCESS | c;
         if (!rxbuf.empty())
-            val |= MORE_PENDING;
+            value  |= MORE_PENDING;
+    } else {
+        value = RECEIVE_NONE;
     }
 
-    DPRINTF(ConsoleVerbose, "in: \'%c\' %#02x retval: %#x\n",
-            isprint(c) ? c : ' ', c, val);
+    DPRINTF(ConsoleVerbose, "console_in: return: %#x\n", value);
 
-    return val;
+    return value;
 }
 
 void
@@ -383,8 +400,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);