Moves GDB server to GUI thread (#1022)

obhq · Oct 8, 2024 · 612ca53 · 612ca53
1 parent 7a65dbb
commit 612ca53
Show file tree

Hide file tree

Showing 13 changed files with 609 additions and 301 deletions.
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
@@ -1,5 +1,5 @@
 # External dependencies.
-find_package(Qt6 REQUIRED COMPONENTS Svg Widgets)
+find_package(Qt6 REQUIRED COMPONENTS Network Svg Widgets)
 find_package(Threads REQUIRED)
 
 if(WIN32 OR (UNIX AND NOT APPLE))
@@ -64,7 +64,7 @@ endif()
 
 target_compile_features(obliteration PRIVATE cxx_std_17)
 
-target_link_libraries(obliteration PRIVATE Qt6::Svg Qt6::Widgets)
+target_link_libraries(obliteration PRIVATE Qt6::Network Qt6::Svg Qt6::Widgets)
 target_link_libraries(obliteration PRIVATE Threads::Threads)
 target_link_libraries(obliteration PRIVATE ${LIBGUI})
 

diff --git a/gui/core.h b/gui/core.h
@@ -44,6 +44,11 @@ enum VmmLog {
     VmmLog_Error,
 };
 
+/**
+ * Reason for [`VmmEvent::Breakpoint`].
+ */
+struct KernelStop;
+
 /**
  * Contains settings to launch the kernel.
  */
@@ -86,21 +91,15 @@ struct VmmScreen {
  */
 enum VmmEvent_Tag {
     VmmEvent_Error,
-    VmmEvent_WaitingDebugger,
-    VmmEvent_DebuggerDisconnected,
     VmmEvent_Exiting,
     VmmEvent_Log,
+    VmmEvent_Breakpoint,
 };
 
 struct VmmEvent_Error_Body {
     const struct RustError *reason;
 };
 
-struct VmmEvent_WaitingDebugger_Body {
-    const char *addr;
-    size_t len;
-};
-
 struct VmmEvent_Exiting_Body {
     bool success;
 };
@@ -111,13 +110,38 @@ struct VmmEvent_Log_Body {
     size_t len;
 };
 
+struct VmmEvent_Breakpoint_Body {
+    struct KernelStop *stop;
+};
+
 struct VmmEvent {
     enum VmmEvent_Tag tag;
     union {
         struct VmmEvent_Error_Body error;
-        struct VmmEvent_WaitingDebugger_Body waiting_debugger;
         struct VmmEvent_Exiting_Body exiting;
         struct VmmEvent_Log_Body log;
+        struct VmmEvent_Breakpoint_Body breakpoint;
+    };
+};
+
+/**
+ * Result of [`vmm_dispatch_debug()`].
+ */
+enum DebugResult_Tag {
+    DebugResult_Ok,
+    DebugResult_Disconnected,
+    DebugResult_ReadFailed,
+    DebugResult_Error,
+};
+
+struct DebugResult_Error_Body {
+    struct RustError *reason;
+};
+
+struct DebugResult {
+    enum DebugResult_Tag tag;
+    union {
+        struct DebugResult_Error_Body error;
     };
 };
 
@@ -183,18 +207,26 @@ struct RustError *update_firmware(const char *root,
                                   void *cx,
                                   void (*status)(const char*, uint64_t, uint64_t, void*));
 
-void vmm_free(struct Vmm *vmm);
+struct Vmm *vmm_start(const char *kernel,
+                      const struct VmmScreen *screen,
+                      const struct Profile *profile,
+                      bool (*debug)(void*, const uint8_t*, size_t, int*),
+                      void (*event)(const struct VmmEvent*, void*),
+                      void *cx,
+                      struct RustError **err);
 
-struct Vmm *vmm_run(const char *kernel,
-                    const struct VmmScreen *screen,
-                    const struct Profile *profile,
-                    const char *debug,
-                    void (*event)(const struct VmmEvent*, void*),
-                    void *cx,
-                    struct RustError **err);
+void vmm_free(struct Vmm *vmm);
 
 struct RustError *vmm_draw(struct Vmm *vmm);
 
+struct DebugResult vmm_dispatch_debug(struct Vmm *vmm,
+                                      struct KernelStop *stop,
+                                      bool (*read)(uint8_t*, void*));
+
+void vmm_shutdown(struct Vmm *vmm);
+
+bool vmm_shutting_down(struct Vmm *vmm);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus
diff --git a/gui/main.cpp b/gui/main.cpp
@@ -222,10 +222,8 @@ int main(int argc, char *argv[])
     win.restoreGeometry();
 
     // Run main window.
-    auto debug = args.value(Args::debug);
-
-    if (!debug.isEmpty()) {
-        win.startVmm(debug);
+    if (args.isSet(Args::debug)) {
+        win.startDebug(args.value(Args::debug));
     }
 
     return QApplication::exec();