Separate gdb output

mls-m5 · Nov 2, 2023 · 6673217 · 6673217
1 parent 814f82c
commit 6673217
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 3 deletions.
diff --git a/src/plugin/gdbdebugger.cpp b/src/plugin/gdbdebugger.cpp
@@ -39,6 +39,11 @@ void GdbDebugger::applicationOutputCallback(
     _applicationOutputCallback = f;
 }
 
+void GdbDebugger::debuggerOutputCallback(
+    std::function<void(std::string_view)> f) {
+    _debuggerOutputCallback = f;
+}
+
 void GdbDebugger::gdbStatusCallback(std::function<void(std::string_view)> f) {
     _gdbStatusCallback = f;
 }
@@ -228,12 +233,39 @@ void GdbDebugger::inputThread(std::istream &in) {
             changeState({});
         }
 
-        //        std::cout << line << std::endl;
-
         if (_applicationOutputCallback) {
             // TODO: Separate applcation output from gdb output with gdb tty
             // command and special pipes
-            _applicationOutputCallback(line);
+
+            bool isGdbOutput = false;
+
+            if (!line.empty()) {
+                auto first = line.front();
+                switch (first) {
+                case '^':
+                case '*':
+                case '+':
+                case '=':
+                case '~':
+                case '@':
+                case '&':
+                    isGdbOutput = true;
+                    break;
+                default:
+                    break;
+                }
+            }
+
+            if (line.starts_with("(gdb)")) {
+                isGdbOutput = true;
+            }
+
+            if (isGdbOutput) {
+                _debuggerOutputCallback(line);
+            }
+            else {
+                _applicationOutputCallback(line);
+            }
         }
 
         // Implement the regex logic here:

diff --git a/src/plugin/gdbdebugger.h b/src/plugin/gdbdebugger.h
@@ -30,6 +30,8 @@ class GdbDebugger : public IDebugger {
     /// Application output
     void applicationOutputCallback(
         std::function<void(std::string_view)>) override;
+    /// Only messages from the debugger
+    void debuggerOutputCallback(std::function<void(std::string_view)>) override;
 
     void gdbStatusCallback(std::function<void(std::string_view)>) override;
     void stateCallback(std::function<void(DebuggerState)>) override;
@@ -59,6 +61,7 @@ class GdbDebugger : public IDebugger {
 
     std::function<void(DebuggerState state)> _callback;
     std::function<void(std::string_view)> _applicationOutputCallback;
+    std::function<void(std::string_view)> _debuggerOutputCallback;
     std::function<void(std::string_view)> _gdbStatusCallback;
 
     void inputThread(std::istream &in);

diff --git a/src/plugin/idebugger.h b/src/plugin/idebugger.h
@@ -49,6 +49,8 @@ class IDebugger {
 
     virtual void applicationOutputCallback(
         std::function<void(std::string_view)>) = 0;
+    virtual void debuggerOutputCallback(
+        std::function<void(std::string_view)>) = 0;
     virtual void stateCallback(std::function<void(DebuggerState)>) = 0;
     virtual void gdbStatusCallback(std::function<void(std::string_view)>) = 0;
 

diff --git a/src/plugin/rundebug.cpp b/src/plugin/rundebug.cpp
@@ -3,6 +3,7 @@
 #include "core/ijobqueue.h"
 #include "plugin/idebugger.h"
 #include "script/ienvironment.h"
+#include "syntax/palette.h"
 #include "text/fstring.h"
 #include "views/editor.h"
 #include "views/mainwindow.h"
@@ -22,6 +23,15 @@ void debug(std::shared_ptr<IEnvironment> env) {
             env->console().cursor(cursor);
         });
     };
+    auto printDebug = [wenv = env->weak_from_this()](std::string_view str) {
+        auto env = wenv.lock();
+        env->context().guiQueue().addTask([env, str = std::string{str}] {
+            env->console().buffer().pushBack(FString{str, Palette::comment});
+            auto cursor = env->console().buffer().end();
+            //            cursor.x(0);
+            //            env->console().cursor(cursor);
+        });
+    };
 
     auto statusMessage = [wenv = env->weak_from_this()](std::string_view str) {
         auto env = wenv.lock();
@@ -53,6 +63,7 @@ void debug(std::shared_ptr<IEnvironment> env) {
     debugger->command(env->project().settings().debug.command);
     debugger->workingDirectory(env->project().settings().debug.workingDir);
     debugger->applicationOutputCallback(print);
+    debugger->debuggerOutputCallback(printDebug);
     debugger->gdbStatusCallback(statusMessage);
     debugger->stateCallback(stateCallback);