- fix: Debugger not responding when debugging with gdb > 14.

royqh1979 · Dec 28, 2024 · f13ae94 · f13ae94
1 parent dabdc27
commit f13ae94
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -23,6 +23,7 @@ Red Panda C++ Version 3.3
   - fix: Only press space key can exit consolepauser in linux. (by CyanoHao)
   - fix: command line parameter escaping for consolepauser in windows. (by CyanoHao)
   - enhancement: Localization for consolepauser.
+  - fix: Debugger not responding when debugging with gdb > 14.
 
 Red Panda C++ Version 3.2
 

diff --git a/RedPandaIDE/debugger/debugger.cpp b/RedPandaIDE/debugger/debugger.cpp
@@ -1025,7 +1025,7 @@ void Debugger::syncFinishedParsing()
                 for (const QString& line:mClient->consoleOutput()) {
                     pMainWindow->addDebugOutput(line);
                 }
-                pMainWindow->addDebugOutput("(gdb)");
+                //pMainWindow->addDebugOutput("(gdb)");
             }
         }
     }

diff --git a/RedPandaIDE/debugger/gdbmidebugger.cpp b/RedPandaIDE/debugger/gdbmidebugger.cpp
@@ -150,7 +150,7 @@ void GDBMIDebuggerClient::run()
         readed = mProcess->readAll();
         buffer += readed;
 
-        if (readed.endsWith("\n")&& outputTerminated(buffer)) {
+        if (readed.endsWith("\n")) {
             processDebugOutput(buffer);
             buffer.clear();
             // mCmdRunning = false;
@@ -329,15 +329,15 @@ QStringList GDBMIDebuggerClient::tokenize(const QString &s) const
     return result;
 }
 
-bool GDBMIDebuggerClient::outputTerminated(const QByteArray &text) const
-{
-    QStringList lines = textToLines(QString::fromUtf8(text));
-    foreach (const QString& line,lines) {
-        if (line.trimmed() == "(gdb)")
-            return true;
-    }
-    return false;
-}
+//bool GDBMIDebuggerClient::outputTerminated(const QByteArray &text) const
+//{
+//    QStringList lines = textToLines(QString::fromUtf8(text));
+//    foreach (const QString& line,lines) {
+//        if (line.trimmed() == "(gdb)")
+//            return true;
+//    }
+//    return false;
+//}
 
 void GDBMIDebuggerClient::handleBreakpoint(const GDBMIResultParser::ParseObject& breakpoint)
 {
@@ -928,6 +928,10 @@ void GDBMIDebuggerClient::processDebugOutput(const QByteArray& debugOutput)
          case '+': // status async output
          case '=': // notify async output
              break;
+         case '(':
+             if (line.startsWith("(gdb)"))
+                 mConsoleOutput.append(line);
+             break;
          }
     }
     emit parseFinished();

diff --git a/RedPandaIDE/debugger/gdbmidebugger.h b/RedPandaIDE/debugger/gdbmidebugger.h
@@ -97,7 +97,7 @@ class GDBMIDebuggerClient: public DebuggerClient {
     void runNextCmd();
 private:
     QStringList tokenize(const QString& s) const;
-    bool outputTerminated(const QByteArray& text) const;
+    //bool outputTerminated(const QByteArray& text) const;
     void handleBreakpoint(const GDBMIResultParser::ParseObject& breakpoint);
     void handleCreateVar(const GDBMIResultParser::ParseObject &multiVars);
     void handleFrame(const GDBMIResultParser::ParseValue &frame);