mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-21 15:33:22 +02:00
Merge pull request #5207 from FearlessTobi/remove-gdb-config
yuzu: Remove gdbstub configuration
This commit is contained in:
commit
d5984284ed
@ -72,8 +72,6 @@ void LogSettings() {
|
|||||||
log_setting("DataStorage_UseVirtualSd", values.use_virtual_sd);
|
log_setting("DataStorage_UseVirtualSd", values.use_virtual_sd);
|
||||||
log_setting("DataStorage_NandDir", Common::FS::GetUserPath(Common::FS::UserPath::NANDDir));
|
log_setting("DataStorage_NandDir", Common::FS::GetUserPath(Common::FS::UserPath::NANDDir));
|
||||||
log_setting("DataStorage_SdmcDir", Common::FS::GetUserPath(Common::FS::UserPath::SDMCDir));
|
log_setting("DataStorage_SdmcDir", Common::FS::GetUserPath(Common::FS::UserPath::SDMCDir));
|
||||||
log_setting("Debugging_UseGdbstub", values.use_gdbstub);
|
|
||||||
log_setting("Debugging_GdbstubPort", values.gdbstub_port);
|
|
||||||
log_setting("Debugging_ProgramArgs", values.program_args);
|
log_setting("Debugging_ProgramArgs", values.program_args);
|
||||||
log_setting("Services_BCATBackend", values.bcat_backend);
|
log_setting("Services_BCATBackend", values.bcat_backend);
|
||||||
log_setting("Services_BCATBoxcatLocal", values.bcat_boxcat_local);
|
log_setting("Services_BCATBoxcatLocal", values.bcat_boxcat_local);
|
||||||
|
@ -637,8 +637,6 @@ void Config::ReadDebuggingValues() {
|
|||||||
// Intentionally not using the QT default setting as this is intended to be changed in the ini
|
// Intentionally not using the QT default setting as this is intended to be changed in the ini
|
||||||
Settings::values.record_frame_times =
|
Settings::values.record_frame_times =
|
||||||
qt_config->value(QStringLiteral("record_frame_times"), false).toBool();
|
qt_config->value(QStringLiteral("record_frame_times"), false).toBool();
|
||||||
Settings::values.use_gdbstub = ReadSetting(QStringLiteral("use_gdbstub"), false).toBool();
|
|
||||||
Settings::values.gdbstub_port = ReadSetting(QStringLiteral("gdbstub_port"), 24689).toInt();
|
|
||||||
Settings::values.program_args =
|
Settings::values.program_args =
|
||||||
ReadSetting(QStringLiteral("program_args"), QString{}).toString().toStdString();
|
ReadSetting(QStringLiteral("program_args"), QString{}).toString().toStdString();
|
||||||
Settings::values.dump_exefs = ReadSetting(QStringLiteral("dump_exefs"), false).toBool();
|
Settings::values.dump_exefs = ReadSetting(QStringLiteral("dump_exefs"), false).toBool();
|
||||||
@ -1236,8 +1234,6 @@ void Config::SaveDebuggingValues() {
|
|||||||
|
|
||||||
// Intentionally not using the QT default setting as this is intended to be changed in the ini
|
// Intentionally not using the QT default setting as this is intended to be changed in the ini
|
||||||
qt_config->setValue(QStringLiteral("record_frame_times"), Settings::values.record_frame_times);
|
qt_config->setValue(QStringLiteral("record_frame_times"), Settings::values.record_frame_times);
|
||||||
WriteSetting(QStringLiteral("use_gdbstub"), Settings::values.use_gdbstub, false);
|
|
||||||
WriteSetting(QStringLiteral("gdbstub_port"), Settings::values.gdbstub_port, 24689);
|
|
||||||
WriteSetting(QStringLiteral("program_args"),
|
WriteSetting(QStringLiteral("program_args"),
|
||||||
QString::fromStdString(Settings::values.program_args), QString{});
|
QString::fromStdString(Settings::values.program_args), QString{});
|
||||||
WriteSetting(QStringLiteral("dump_exefs"), Settings::values.dump_exefs, false);
|
WriteSetting(QStringLiteral("dump_exefs"), Settings::values.dump_exefs, false);
|
||||||
|
@ -28,9 +28,6 @@ ConfigureDebug::ConfigureDebug(QWidget* parent) : QWidget(parent), ui(new Ui::Co
|
|||||||
ConfigureDebug::~ConfigureDebug() = default;
|
ConfigureDebug::~ConfigureDebug() = default;
|
||||||
|
|
||||||
void ConfigureDebug::SetConfiguration() {
|
void ConfigureDebug::SetConfiguration() {
|
||||||
ui->toggle_gdbstub->setChecked(Settings::values.use_gdbstub);
|
|
||||||
ui->gdbport_spinbox->setEnabled(Settings::values.use_gdbstub);
|
|
||||||
ui->gdbport_spinbox->setValue(Settings::values.gdbstub_port);
|
|
||||||
ui->toggle_console->setEnabled(!Core::System::GetInstance().IsPoweredOn());
|
ui->toggle_console->setEnabled(!Core::System::GetInstance().IsPoweredOn());
|
||||||
ui->toggle_console->setChecked(UISettings::values.show_console);
|
ui->toggle_console->setChecked(UISettings::values.show_console);
|
||||||
ui->log_filter_edit->setText(QString::fromStdString(Settings::values.log_filter));
|
ui->log_filter_edit->setText(QString::fromStdString(Settings::values.log_filter));
|
||||||
@ -45,8 +42,6 @@ void ConfigureDebug::SetConfiguration() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void ConfigureDebug::ApplyConfiguration() {
|
void ConfigureDebug::ApplyConfiguration() {
|
||||||
Settings::values.use_gdbstub = ui->toggle_gdbstub->isChecked();
|
|
||||||
Settings::values.gdbstub_port = ui->gdbport_spinbox->value();
|
|
||||||
UISettings::values.show_console = ui->toggle_console->isChecked();
|
UISettings::values.show_console = ui->toggle_console->isChecked();
|
||||||
Settings::values.log_filter = ui->log_filter_edit->text().toStdString();
|
Settings::values.log_filter = ui->log_filter_edit->text().toStdString();
|
||||||
Settings::values.program_args = ui->homebrew_args_edit->text().toStdString();
|
Settings::values.program_args = ui->homebrew_args_edit->text().toStdString();
|
||||||
|
@ -7,64 +7,13 @@
|
|||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>400</width>
|
<width>400</width>
|
||||||
<height>467</height>
|
<height>486</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>Form</string>
|
<string>Form</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_1">
|
<layout class="QVBoxLayout" name="verticalLayout_1">
|
||||||
<item>
|
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
|
||||||
<item>
|
|
||||||
<widget class="QGroupBox" name="groupBox">
|
|
||||||
<property name="title">
|
|
||||||
<string>GDB</string>
|
|
||||||
</property>
|
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_1">
|
|
||||||
<item>
|
|
||||||
<widget class="QCheckBox" name="toggle_gdbstub">
|
|
||||||
<property name="text">
|
|
||||||
<string>Enable GDB Stub</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<spacer name="horizontalSpacer">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>40</width>
|
|
||||||
<height>20</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="label_1">
|
|
||||||
<property name="text">
|
|
||||||
<string>Port:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QSpinBox" name="gdbport_spinbox">
|
|
||||||
<property name="maximum">
|
|
||||||
<number>65536</number>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
<item>
|
||||||
<widget class="QGroupBox" name="groupBox_2">
|
<widget class="QGroupBox" name="groupBox_2">
|
||||||
<property name="title">
|
<property name="title">
|
||||||
@ -258,8 +207,6 @@
|
|||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<tabstops>
|
<tabstops>
|
||||||
<tabstop>toggle_gdbstub</tabstop>
|
|
||||||
<tabstop>gdbport_spinbox</tabstop>
|
|
||||||
<tabstop>log_filter_edit</tabstop>
|
<tabstop>log_filter_edit</tabstop>
|
||||||
<tabstop>toggle_console</tabstop>
|
<tabstop>toggle_console</tabstop>
|
||||||
<tabstop>open_log_button</tabstop>
|
<tabstop>open_log_button</tabstop>
|
||||||
@ -269,22 +216,5 @@
|
|||||||
<tabstop>quest_flag</tabstop>
|
<tabstop>quest_flag</tabstop>
|
||||||
</tabstops>
|
</tabstops>
|
||||||
<resources/>
|
<resources/>
|
||||||
<connections>
|
<connections/>
|
||||||
<connection>
|
|
||||||
<sender>toggle_gdbstub</sender>
|
|
||||||
<signal>toggled(bool)</signal>
|
|
||||||
<receiver>gdbport_spinbox</receiver>
|
|
||||||
<slot>setEnabled(bool)</slot>
|
|
||||||
<hints>
|
|
||||||
<hint type="sourcelabel">
|
|
||||||
<x>84</x>
|
|
||||||
<y>157</y>
|
|
||||||
</hint>
|
|
||||||
<hint type="destinationlabel">
|
|
||||||
<x>342</x>
|
|
||||||
<y>158</y>
|
|
||||||
</hint>
|
|
||||||
</hints>
|
|
||||||
</connection>
|
|
||||||
</connections>
|
|
||||||
</ui>
|
</ui>
|
||||||
|
@ -429,9 +429,6 @@ void Config::ReadValues() {
|
|||||||
// Debugging
|
// Debugging
|
||||||
Settings::values.record_frame_times =
|
Settings::values.record_frame_times =
|
||||||
sdl2_config->GetBoolean("Debugging", "record_frame_times", false);
|
sdl2_config->GetBoolean("Debugging", "record_frame_times", false);
|
||||||
Settings::values.use_gdbstub = sdl2_config->GetBoolean("Debugging", "use_gdbstub", false);
|
|
||||||
Settings::values.gdbstub_port =
|
|
||||||
static_cast<u16>(sdl2_config->GetInteger("Debugging", "gdbstub_port", 24689));
|
|
||||||
Settings::values.program_args = sdl2_config->Get("Debugging", "program_args", "");
|
Settings::values.program_args = sdl2_config->Get("Debugging", "program_args", "");
|
||||||
Settings::values.dump_exefs = sdl2_config->GetBoolean("Debugging", "dump_exefs", false);
|
Settings::values.dump_exefs = sdl2_config->GetBoolean("Debugging", "dump_exefs", false);
|
||||||
Settings::values.dump_nso = sdl2_config->GetBoolean("Debugging", "dump_nso", false);
|
Settings::values.dump_nso = sdl2_config->GetBoolean("Debugging", "dump_nso", false);
|
||||||
|
@ -318,9 +318,6 @@ log_filter = *:Trace
|
|||||||
[Debugging]
|
[Debugging]
|
||||||
# Record frame time data, can be found in the log directory. Boolean value
|
# Record frame time data, can be found in the log directory. Boolean value
|
||||||
record_frame_times =
|
record_frame_times =
|
||||||
# Port for listening to GDB connections.
|
|
||||||
use_gdbstub=false
|
|
||||||
gdbstub_port=24689
|
|
||||||
# Determines whether or not yuzu will dump the ExeFS of all games it attempts to load while loading them
|
# Determines whether or not yuzu will dump the ExeFS of all games it attempts to load while loading them
|
||||||
dump_exefs=false
|
dump_exefs=false
|
||||||
# Determines whether or not yuzu will dump all NSOs it attempts to load while loading them
|
# Determines whether or not yuzu will dump all NSOs it attempts to load while loading them
|
||||||
|
@ -64,7 +64,6 @@ __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
|
|||||||
static void PrintHelp(const char* argv0) {
|
static void PrintHelp(const char* argv0) {
|
||||||
std::cout << "Usage: " << argv0
|
std::cout << "Usage: " << argv0
|
||||||
<< " [options] <filename>\n"
|
<< " [options] <filename>\n"
|
||||||
"-g, --gdbport=NUMBER Enable gdb stub on port NUMBER\n"
|
|
||||||
"-f, --fullscreen Start in fullscreen mode\n"
|
"-f, --fullscreen Start in fullscreen mode\n"
|
||||||
"-h, --help Display this help and exit\n"
|
"-h, --help Display this help and exit\n"
|
||||||
"-v, --version Output version information and exit\n"
|
"-v, --version Output version information and exit\n"
|
||||||
@ -96,8 +95,6 @@ int main(int argc, char** argv) {
|
|||||||
Config config;
|
Config config;
|
||||||
|
|
||||||
int option_index = 0;
|
int option_index = 0;
|
||||||
bool use_gdbstub = Settings::values.use_gdbstub;
|
|
||||||
u32 gdb_port = static_cast<u32>(Settings::values.gdbstub_port);
|
|
||||||
|
|
||||||
InitializeLogging();
|
InitializeLogging();
|
||||||
|
|
||||||
@ -116,26 +113,17 @@ int main(int argc, char** argv) {
|
|||||||
bool fullscreen = false;
|
bool fullscreen = false;
|
||||||
|
|
||||||
static struct option long_options[] = {
|
static struct option long_options[] = {
|
||||||
{"gdbport", required_argument, 0, 'g'}, {"fullscreen", no_argument, 0, 'f'},
|
{"fullscreen", no_argument, 0, 'f'},
|
||||||
{"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'v'},
|
{"help", no_argument, 0, 'h'},
|
||||||
{"program", optional_argument, 0, 'p'}, {0, 0, 0, 0},
|
{"version", no_argument, 0, 'v'},
|
||||||
|
{"program", optional_argument, 0, 'p'},
|
||||||
|
{0, 0, 0, 0},
|
||||||
};
|
};
|
||||||
|
|
||||||
while (optind < argc) {
|
while (optind < argc) {
|
||||||
int arg = getopt_long(argc, argv, "g:fhvp::", long_options, &option_index);
|
int arg = getopt_long(argc, argv, "g:fhvp::", long_options, &option_index);
|
||||||
if (arg != -1) {
|
if (arg != -1) {
|
||||||
switch (static_cast<char>(arg)) {
|
switch (static_cast<char>(arg)) {
|
||||||
case 'g':
|
|
||||||
errno = 0;
|
|
||||||
gdb_port = strtoul(optarg, &endarg, 0);
|
|
||||||
use_gdbstub = true;
|
|
||||||
if (endarg == optarg)
|
|
||||||
errno = EINVAL;
|
|
||||||
if (errno != 0) {
|
|
||||||
perror("--gdbport");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case 'f':
|
case 'f':
|
||||||
fullscreen = true;
|
fullscreen = true;
|
||||||
LOG_INFO(Frontend, "Starting in fullscreen mode...");
|
LOG_INFO(Frontend, "Starting in fullscreen mode...");
|
||||||
@ -177,8 +165,6 @@ int main(int argc, char** argv) {
|
|||||||
InputCommon::InputSubsystem input_subsystem;
|
InputCommon::InputSubsystem input_subsystem;
|
||||||
|
|
||||||
// Apply the command line arguments
|
// Apply the command line arguments
|
||||||
Settings::values.gdbstub_port = gdb_port;
|
|
||||||
Settings::values.use_gdbstub = use_gdbstub;
|
|
||||||
Settings::Apply(system);
|
Settings::Apply(system);
|
||||||
|
|
||||||
std::unique_ptr<EmuWindow_SDL2> emu_window;
|
std::unique_ptr<EmuWindow_SDL2> emu_window;
|
||||||
|
@ -158,7 +158,6 @@ void Config::ReadValues() {
|
|||||||
Settings::values.use_dev_keys = sdl2_config->GetBoolean("Miscellaneous", "use_dev_keys", false);
|
Settings::values.use_dev_keys = sdl2_config->GetBoolean("Miscellaneous", "use_dev_keys", false);
|
||||||
|
|
||||||
// Debugging
|
// Debugging
|
||||||
Settings::values.use_gdbstub = false;
|
|
||||||
Settings::values.program_args = "";
|
Settings::values.program_args = "";
|
||||||
Settings::values.dump_exefs = sdl2_config->GetBoolean("Debugging", "dump_exefs", false);
|
Settings::values.dump_exefs = sdl2_config->GetBoolean("Debugging", "dump_exefs", false);
|
||||||
Settings::values.dump_nso = sdl2_config->GetBoolean("Debugging", "dump_nso", false);
|
Settings::values.dump_nso = sdl2_config->GetBoolean("Debugging", "dump_nso", false);
|
||||||
|
@ -162,7 +162,6 @@ int main(int argc, char** argv) {
|
|||||||
|
|
||||||
Core::System& system{Core::System::GetInstance()};
|
Core::System& system{Core::System::GetInstance()};
|
||||||
|
|
||||||
Settings::values.use_gdbstub = false;
|
|
||||||
Settings::Apply(system);
|
Settings::Apply(system);
|
||||||
|
|
||||||
const auto emu_window{std::make_unique<EmuWindow_SDL2_Hide>()};
|
const auto emu_window{std::make_unique<EmuWindow_SDL2_Hide>()};
|
||||||
|
Loading…
Reference in New Issue
Block a user