ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gdb stub config setup fixes

This commit is contained in:
RSDuck 2024-09-11 14:34:58 +02:00
parent f719438a6e
commit 74f479ce6d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/qt_sdl/Config.cpp
View File

@ -71,7 +71,7 @@ DefaultList<int> DefaultInts =
#ifdef GDBSTUB_ENABLED #ifdef GDBSTUB_ENABLED
{"Instance*.Gdb.ARM7.Port", 3334}, {"Instance*.Gdb.ARM7.Port", 3334},
{"Instance*.Gdb.ARM9.Port", 3333}, {"Instance*.Gdb.ARM9.Port", 3333},
#endif, #endif
{"LAN.HostNumPlayers", 16}, {"LAN.HostNumPlayers", 16},
}; };

4
src/frontend/qt_sdl/EmuInstance.cpp
View File

@ -1153,14 +1153,14 @@ bool EmuInstance::updateConsole(UpdateConsoleNDSArgs&& _ndsargs, UpdateConsoleGB
#endif #endif
#ifdef GDBSTUB_ENABLED #ifdef GDBSTUB_ENABLED
Config::Table gdbopt = globalCfg.GetTable("Gdb"); Config::Table gdbopt = localCfg.GetTable("Gdb");
GDBArgs _gdbargs { GDBArgs _gdbargs {
static_cast<u16>(gdbopt.GetInt("ARM7.Port")), static_cast<u16>(gdbopt.GetInt("ARM7.Port")),
static_cast<u16>(gdbopt.GetInt("ARM9.Port")), static_cast<u16>(gdbopt.GetInt("ARM9.Port")),
gdbopt.GetBool("ARM7.BreakOnStartup"), gdbopt.GetBool("ARM7.BreakOnStartup"),
gdbopt.GetBool("ARM9.BreakOnStartup"), gdbopt.GetBool("ARM9.BreakOnStartup"),
}; };
auto gdbargs = gdbopt.GetBool("Enable") ? std::make_optional(_gdbargs) : std::nullopt; auto gdbargs = gdbopt.GetBool("Enabled") ? std::make_optional(_gdbargs) : std::nullopt;
#else #else
optional<GDBArgs> gdbargs = std::nullopt; optional<GDBArgs> gdbargs = std::nullopt;
#endif #endif

4
src/frontend/qt_sdl/EmuSettingsDialog.cpp
View File

@ -95,7 +95,7 @@ EmuSettingsDialog::EmuSettingsDialog(QWidget* parent) : QDialog(parent), ui(new
#endif #endif
#ifdef GDBSTUB_ENABLED #ifdef GDBSTUB_ENABLED
ui->cbGdbEnabled->setChecked(cfg.GetBool("Gdb.Enabled")); ui->cbGdbEnabled->setChecked(instcfg.GetBool("Gdb.Enabled"));
ui->intGdbPortA7->setValue(instcfg.GetInt("Gdb.ARM7.Port")); ui->intGdbPortA7->setValue(instcfg.GetInt("Gdb.ARM7.Port"));
ui->intGdbPortA9->setValue(instcfg.GetInt("Gdb.ARM9.Port")); ui->intGdbPortA9->setValue(instcfg.GetInt("Gdb.ARM9.Port"));
ui->cbGdbBOSA7->setChecked(instcfg.GetBool("Gdb.ARM7.BreakOnStartup")); ui->cbGdbBOSA7->setChecked(instcfg.GetBool("Gdb.ARM7.BreakOnStartup"));
@ -286,7 +286,7 @@ void EmuSettingsDialog::done(int r)
cfg.SetBool("JIT.FastMemory", ui->chkJITFastMemory->isChecked()); cfg.SetBool("JIT.FastMemory", ui->chkJITFastMemory->isChecked());
#endif #endif
#ifdef GDBSTUB_ENABLED #ifdef GDBSTUB_ENABLED
cfg.SetBool("Gdb.Enabled", ui->cbGdbEnabled->isChecked()); instcfg.SetBool("Gdb.Enabled", ui->cbGdbEnabled->isChecked());
instcfg.SetInt("Gdb.ARM7.Port", ui->intGdbPortA7->value()); instcfg.SetInt("Gdb.ARM7.Port", ui->intGdbPortA7->value());
instcfg.SetInt("Gdb.ARM9.Port", ui->intGdbPortA9->value()); instcfg.SetInt("Gdb.ARM9.Port", ui->intGdbPortA9->value());
instcfg.SetBool("Gdb.ARM7.BreakOnStartup", ui->cbGdbBOSA7->isChecked()); instcfg.SetBool("Gdb.ARM7.BreakOnStartup", ui->cbGdbBOSA7->isChecked());