diff options
| author | Xavier Del Campo Romero <xavi.dcr@tutanota.com> | 2020-05-23 18:06:48 +0200 |
|---|---|---|
| committer | Xavier Del Campo Romero <xavi.dcr@tutanota.com> | 2020-05-23 19:03:11 +0200 |
| commit | 850010a96b6cbc3eae03edd891e50325e017b678 (patch) | |
| tree | 391100fb00f0bf3fe7aae8c9a574c72d8ce9b17b /gui | |
| parent | 470da05658a97a51bd2ad2db7834bcc13dd995fd (diff) | |
| download | pcsxr-850010a96b6cbc3eae03edd891e50325e017b678.tar.gz | |
Replaced in-house gdb stub by MIT-licensed implementation
Imported from a fork of https://github.com/mborgerson/gdbstub
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/ConfDlg.c | 6 | ||||
| -rw-r--r-- | gui/LnxMain.c | 10 |
2 files changed, 7 insertions, 9 deletions
diff --git a/gui/ConfDlg.c b/gui/ConfDlg.c index 2e16be08..f41dd9ed 100644 --- a/gui/ConfDlg.c +++ b/gui/ConfDlg.c @@ -32,6 +32,7 @@ #include "ConfDlg.h" #include "../libpcsxcore/plugins.h" +#include "../gdbstub/gdbstub_sys.h" static void OnBiosPath_Changed(GtkWidget *wdg, gpointer data); static void OnConf_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data); @@ -929,9 +930,8 @@ void OnCpu_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data) { else StopDebugger(); } - if (Config.GdbServer) { - GdbStartServer(); - } + if (Config.GdbServer) + dbg_start(); t = Config.Cpu; Config.Cpu = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Cpu"))); diff --git a/gui/LnxMain.c b/gui/LnxMain.c index 19187836..12aeb5fc 100644 --- a/gui/LnxMain.c +++ b/gui/LnxMain.c @@ -32,6 +32,7 @@ #include <dirent.h> #include <sys/stat.h> #include "../libpcsxcore/sio.h" +#include "../gdbstub/gdbstub_sys.h" #include "Linux.h" #include "ConfDlg.h" @@ -490,13 +491,10 @@ int SysInit() { LoadMcds(Config.Mcd1, Config.Mcd2); /* TODO Do we need to have this here, or in the calling main() function?? */ - if (Config.Debug) { + if (Config.Debug) StartDebugger(); - } - - if (Config.GdbServer) { - GdbStartServer(); - } + else if (Config.GdbServer) + dbg_start(); return 0; } |