Some more work after integration of PR debugger-always-enabled.

- In the ask dialogs show debugger choice only if it is active. - In logfunctions fatal() method check if debugger is active.
bochs-emu · Nov 29, 2024 · 89f86ab · 89f86ab
1 parent 00bc229
commit 89f86ab
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 14 deletions.
diff --git a/bochs/gui/sdl2.cc b/bochs/gui/sdl2.cc
@@ -1457,7 +1457,7 @@ int sdl2_ask_dialog(BxEvent *event)
     i = 2;
   }
 #if BX_DEBUGGER || BX_GDBSTUB
-  if (mode == BX_LOG_DLG_ASK) {
+  if ((mode == BX_LOG_DLG_ASK) && (bx_dbg.debugger_active || BX_GDBSTUB)) {
     buttondata[i].flags = 0;
     buttondata[i].buttonid = BX_LOG_ASK_CHOICE_ENTER_DEBUG;
     buttondata[i].text = "Debugger";

diff --git a/bochs/gui/siminterface.cc b/bochs/gui/siminterface.cc
@@ -169,6 +169,7 @@ class bx_real_sim_c : public bx_simulator_interface_c {
   virtual bool is_pci_device(const char *name);
   virtual bool is_agp_device(const char *name);
 #if BX_DEBUGGER
+  virtual bool debugger_active() {return bx_dbg.debugger_active;}
   virtual void debug_break();
   virtual void debug_interpret_cmd(char *cmd);
   virtual char *debug_get_next_command();

diff --git a/bochs/gui/siminterface.h b/bochs/gui/siminterface.h
@@ -717,6 +717,7 @@ class BOCHSAPI bx_simulator_interface_c {
   // return 1 if device is connected to the AGP slot
   virtual bool is_agp_device(const char *name) {return 0;}
 #if BX_DEBUGGER
+  virtual bool debugger_active() {return false;}
   // for debugger: same behavior as pressing control-C
   virtual void debug_break() {}
   virtual void debug_interpret_cmd(char *cmd) {}

diff --git a/bochs/gui/textconfig.cc b/bochs/gui/textconfig.cc
@@ -54,7 +54,6 @@ extern "C" {
 #endif
 
 #include "osdep.h"
-#include "bx_debug/debug.h"
 #include "param_names.h"
 #include "logio.h"
 #include "paramtree.h"
@@ -768,12 +767,12 @@ void bx_plugin_ctrl()
   }
 }
 
-const char *log_action_ask_choices[] = { "cont", "alwayscont", "die", "abort", "debug" };
-int log_action_n_choices = 4 + (BX_DEBUGGER||BX_GDBSTUB?1:0);
-
 BxEvent *
 textconfig_notify_callback(void *unused, BxEvent *event)
 {
+  const char *log_action_ask_choices[] = { "cont", "alwayscont", "die", "abort", "debug" };
+  int log_action_n_choices = 4 + (SIM->debugger_active()||BX_GDBSTUB?1:0);
+
   event->retcode = -1;
   switch (event->type)
   {
@@ -798,7 +797,9 @@ textconfig_notify_callback(void *unused, BxEvent *event)
         fprintf(stderr, "  abort      - dump core %s\n",
                 BX_HAVE_ABORT ? "" : "(Disabled)");
 #if BX_DEBUGGER
-        fprintf(stderr, "  debug      - continue and return to bochs debugger\n");
+        if (SIM->debugger_active()) {
+          fprintf(stderr, "  debug      - continue and return to bochs debugger\n");
+        }
 #endif
 #if BX_GDBSTUB
         fprintf(stderr, "  debug      - hand control to gdb\n");

diff --git a/bochs/gui/win32config.cc b/bochs/gui/win32config.cc
@@ -122,7 +122,9 @@ static BOOL CALLBACK LogAskProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lPara
         SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_ADDSTRING, 0, (LPARAM)"Kill simulation");
         SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_ADDSTRING, 0, (LPARAM)"Abort (dump core)");
 #if BX_DEBUGGER
-        SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_ADDSTRING, 0, (LPARAM)"Continue and return to debugger");
+        if (bx_dbg.debugger_active) {
+          SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_ADDSTRING, 0, (LPARAM)"Continue and return to debugger");
+        }
 #endif
         SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_SETCURSEL, 2, 0);
       } else {

diff --git a/bochs/gui/x.cc b/bochs/gui/x.cc
@@ -2596,9 +2596,11 @@ int x11_ask_dialog(BxEvent *event)
   }
   if (mode == BX_LOG_DLG_ASK) {
 #if BX_DEBUGGER || BX_GDBSTUB
-    buttons.btn[i].label = "Debugger";
-    buttons.btn[i].code = BX_LOG_ASK_CHOICE_ENTER_DEBUG;
-    i++;
+    if (bx_dbg.debugger_active) {
+      buttons.btn[i].label = "Debugger";
+      buttons.btn[i].code = BX_LOG_ASK_CHOICE_ENTER_DEBUG;
+      i++;
+    }
 #endif
 #if BX_HAVE_ABORT
     buttons.btn[i].label = "Dump Core";

diff --git a/bochs/logio.cc b/bochs/logio.cc
@@ -682,11 +682,14 @@ void logfunctions::fatal(int level, const char *prefix, const char *fmt, va_list
     fprintf(stderr, "%s", exit_msg);
     fprintf(stderr, "\n%s\n", divider);
   }
-#if !BX_DEBUGGER
-  BX_EXIT(exit_status);
-#else
-  bx_dbg_exit(exit_status);
+#if BX_DEBUGGER
+  if (bx_dbg.debugger_active) {
+    bx_dbg_exit(exit_status);
+  } else
 #endif
+  {
+    BX_EXIT(exit_status);
+  }
   // not safe to use BX_* log functions in here.
   fprintf(stderr, "fatal() should never return, but it just did\n");
 }