summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar FearlessTobi2020-12-19 19:19:42 +0100
committerGravatar FearlessTobi2020-12-19 19:19:42 +0100
commit10b0ab792681b27664030d53d8e1ff610d0010cf (patch)
treef4b0dbe676403bc83ee895684c475e56340c1fc4 /src
parentMerge pull request #5205 from Morph1984/oss-extended-plus-minus (diff)
downloadyuzu-10b0ab792681b27664030d53d8e1ff610d0010cf.tar.gz
yuzu-10b0ab792681b27664030d53d8e1ff610d0010cf.tar.xz
yuzu-10b0ab792681b27664030d53d8e1ff610d0010cf.zip
yuzu: Remove gdbstub configuration
The gdbstub itself was removed with https://github.com/yuzu-emu/yuzu/pull/5028. This PR just removes the remaining gdb configuration code from the emulator and the UI.
Diffstat (limited to '')
-rw-r--r--src/core/settings.cpp2
-rw-r--r--src/yuzu/configuration/config.cpp4
-rw-r--r--src/yuzu/configuration/configure_debug.cpp5
-rw-r--r--src/yuzu/configuration/configure_debug.ui74
-rw-r--r--src/yuzu_cmd/config.cpp3
-rw-r--r--src/yuzu_cmd/default_ini.h3
-rw-r--r--src/yuzu_cmd/yuzu.cpp24
-rw-r--r--src/yuzu_tester/config.cpp1
-rw-r--r--src/yuzu_tester/yuzu.cpp1
9 files changed, 7 insertions, 110 deletions
diff --git a/src/core/settings.cpp b/src/core/settings.cpp
index e9997a263..47d9ecf9a 100644
--- a/src/core/settings.cpp
+++ b/src/core/settings.cpp
@@ -72,8 +72,6 @@ void LogSettings() {
72 log_setting("DataStorage_UseVirtualSd", values.use_virtual_sd); 72 log_setting("DataStorage_UseVirtualSd", values.use_virtual_sd);
73 log_setting("DataStorage_NandDir", Common::FS::GetUserPath(Common::FS::UserPath::NANDDir)); 73 log_setting("DataStorage_NandDir", Common::FS::GetUserPath(Common::FS::UserPath::NANDDir));
74 log_setting("DataStorage_SdmcDir", Common::FS::GetUserPath(Common::FS::UserPath::SDMCDir)); 74 log_setting("DataStorage_SdmcDir", Common::FS::GetUserPath(Common::FS::UserPath::SDMCDir));
75 log_setting("Debugging_UseGdbstub", values.use_gdbstub);
76 log_setting("Debugging_GdbstubPort", values.gdbstub_port);
77 log_setting("Debugging_ProgramArgs", values.program_args); 75 log_setting("Debugging_ProgramArgs", values.program_args);
78 log_setting("Services_BCATBackend", values.bcat_backend); 76 log_setting("Services_BCATBackend", values.bcat_backend);
79 log_setting("Services_BCATBoxcatLocal", values.bcat_boxcat_local); 77 log_setting("Services_BCATBoxcatLocal", values.bcat_boxcat_local);
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 0ec5b861a..9fb254986 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -637,8 +637,6 @@ void Config::ReadDebuggingValues() {
637 // Intentionally not using the QT default setting as this is intended to be changed in the ini 637 // Intentionally not using the QT default setting as this is intended to be changed in the ini
638 Settings::values.record_frame_times = 638 Settings::values.record_frame_times =
639 qt_config->value(QStringLiteral("record_frame_times"), false).toBool(); 639 qt_config->value(QStringLiteral("record_frame_times"), false).toBool();
640 Settings::values.use_gdbstub = ReadSetting(QStringLiteral("use_gdbstub"), false).toBool();
641 Settings::values.gdbstub_port = ReadSetting(QStringLiteral("gdbstub_port"), 24689).toInt();
642 Settings::values.program_args = 640 Settings::values.program_args =
643 ReadSetting(QStringLiteral("program_args"), QString{}).toString().toStdString(); 641 ReadSetting(QStringLiteral("program_args"), QString{}).toString().toStdString();
644 Settings::values.dump_exefs = ReadSetting(QStringLiteral("dump_exefs"), false).toBool(); 642 Settings::values.dump_exefs = ReadSetting(QStringLiteral("dump_exefs"), false).toBool();
@@ -1236,8 +1234,6 @@ void Config::SaveDebuggingValues() {
1236 1234
1237 // Intentionally not using the QT default setting as this is intended to be changed in the ini 1235 // Intentionally not using the QT default setting as this is intended to be changed in the ini
1238 qt_config->setValue(QStringLiteral("record_frame_times"), Settings::values.record_frame_times); 1236 qt_config->setValue(QStringLiteral("record_frame_times"), Settings::values.record_frame_times);
1239 WriteSetting(QStringLiteral("use_gdbstub"), Settings::values.use_gdbstub, false);
1240 WriteSetting(QStringLiteral("gdbstub_port"), Settings::values.gdbstub_port, 24689);
1241 WriteSetting(QStringLiteral("program_args"), 1237 WriteSetting(QStringLiteral("program_args"),
1242 QString::fromStdString(Settings::values.program_args), QString{}); 1238 QString::fromStdString(Settings::values.program_args), QString{});
1243 WriteSetting(QStringLiteral("dump_exefs"), Settings::values.dump_exefs, false); 1239 WriteSetting(QStringLiteral("dump_exefs"), Settings::values.dump_exefs, false);
diff --git a/src/yuzu/configuration/configure_debug.cpp b/src/yuzu/configuration/configure_debug.cpp
index 027099ab7..121873f95 100644
--- a/src/yuzu/configuration/configure_debug.cpp
+++ b/src/yuzu/configuration/configure_debug.cpp
@@ -28,9 +28,6 @@ ConfigureDebug::ConfigureDebug(QWidget* parent) : QWidget(parent), ui(new Ui::Co
28ConfigureDebug::~ConfigureDebug() = default; 28ConfigureDebug::~ConfigureDebug() = default;
29 29
30void ConfigureDebug::SetConfiguration() { 30void ConfigureDebug::SetConfiguration() {
31 ui->toggle_gdbstub->setChecked(Settings::values.use_gdbstub);
32 ui->gdbport_spinbox->setEnabled(Settings::values.use_gdbstub);
33 ui->gdbport_spinbox->setValue(Settings::values.gdbstub_port);
34 ui->toggle_console->setEnabled(!Core::System::GetInstance().IsPoweredOn()); 31 ui->toggle_console->setEnabled(!Core::System::GetInstance().IsPoweredOn());
35 ui->toggle_console->setChecked(UISettings::values.show_console); 32 ui->toggle_console->setChecked(UISettings::values.show_console);
36 ui->log_filter_edit->setText(QString::fromStdString(Settings::values.log_filter)); 33 ui->log_filter_edit->setText(QString::fromStdString(Settings::values.log_filter));
@@ -45,8 +42,6 @@ void ConfigureDebug::SetConfiguration() {
45} 42}
46 43
47void ConfigureDebug::ApplyConfiguration() { 44void ConfigureDebug::ApplyConfiguration() {
48 Settings::values.use_gdbstub = ui->toggle_gdbstub->isChecked();
49 Settings::values.gdbstub_port = ui->gdbport_spinbox->value();
50 UISettings::values.show_console = ui->toggle_console->isChecked(); 45 UISettings::values.show_console = ui->toggle_console->isChecked();
51 Settings::values.log_filter = ui->log_filter_edit->text().toStdString(); 46 Settings::values.log_filter = ui->log_filter_edit->text().toStdString();
52 Settings::values.program_args = ui->homebrew_args_edit->text().toStdString(); 47 Settings::values.program_args = ui->homebrew_args_edit->text().toStdString();
diff --git a/src/yuzu/configuration/configure_debug.ui b/src/yuzu/configuration/configure_debug.ui
index 6f94fe304..9186aa732 100644
--- a/src/yuzu/configuration/configure_debug.ui
+++ b/src/yuzu/configuration/configure_debug.ui
@@ -7,7 +7,7 @@
7 <x>0</x> 7 <x>0</x>
8 <y>0</y> 8 <y>0</y>
9 <width>400</width> 9 <width>400</width>
10 <height>467</height> 10 <height>486</height>
11 </rect> 11 </rect>
12 </property> 12 </property>
13 <property name="windowTitle"> 13 <property name="windowTitle">
@@ -15,57 +15,6 @@
15 </property> 15 </property>
16 <layout class="QVBoxLayout" name="verticalLayout_1"> 16 <layout class="QVBoxLayout" name="verticalLayout_1">
17 <item> 17 <item>
18 <layout class="QVBoxLayout" name="verticalLayout_2">
19 <item>
20 <widget class="QGroupBox" name="groupBox">
21 <property name="title">
22 <string>GDB</string>
23 </property>
24 <layout class="QVBoxLayout" name="verticalLayout_3">
25 <item>
26 <layout class="QHBoxLayout" name="horizontalLayout_1">
27 <item>
28 <widget class="QCheckBox" name="toggle_gdbstub">
29 <property name="text">
30 <string>Enable GDB Stub</string>
31 </property>
32 </widget>
33 </item>
34 <item>
35 <spacer name="horizontalSpacer">
36 <property name="orientation">
37 <enum>Qt::Horizontal</enum>
38 </property>
39 <property name="sizeHint" stdset="0">
40 <size>
41 <width>40</width>
42 <height>20</height>
43 </size>
44 </property>
45 </spacer>
46 </item>
47 <item>
48 <widget class="QLabel" name="label_1">
49 <property name="text">
50 <string>Port:</string>
51 </property>
52 </widget>
53 </item>
54 <item>
55 <widget class="QSpinBox" name="gdbport_spinbox">
56 <property name="maximum">
57 <number>65536</number>
58 </property>
59 </widget>
60 </item>
61 </layout>
62 </item>
63 </layout>
64 </widget>
65 </item>
66 </layout>
67 </item>
68 <item>
69 <widget class="QGroupBox" name="groupBox_2"> 18 <widget class="QGroupBox" name="groupBox_2">
70 <property name="title"> 19 <property name="title">
71 <string>Logging</string> 20 <string>Logging</string>
@@ -258,8 +207,6 @@
258 </layout> 207 </layout>
259 </widget> 208 </widget>
260 <tabstops> 209 <tabstops>
261 <tabstop>toggle_gdbstub</tabstop>
262 <tabstop>gdbport_spinbox</tabstop>
263 <tabstop>log_filter_edit</tabstop> 210 <tabstop>log_filter_edit</tabstop>
264 <tabstop>toggle_console</tabstop> 211 <tabstop>toggle_console</tabstop>
265 <tabstop>open_log_button</tabstop> 212 <tabstop>open_log_button</tabstop>
@@ -269,22 +216,5 @@
269 <tabstop>quest_flag</tabstop> 216 <tabstop>quest_flag</tabstop>
270 </tabstops> 217 </tabstops>
271 <resources/> 218 <resources/>
272 <connections> 219 <connections/>
273 <connection>
274 <sender>toggle_gdbstub</sender>
275 <signal>toggled(bool)</signal>
276 <receiver>gdbport_spinbox</receiver>
277 <slot>setEnabled(bool)</slot>
278 <hints>
279 <hint type="sourcelabel">
280 <x>84</x>
281 <y>157</y>
282 </hint>
283 <hint type="destinationlabel">
284 <x>342</x>
285 <y>158</y>
286 </hint>
287 </hints>
288 </connection>
289 </connections>
290</ui> 220</ui>
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp
index b70f71a08..38075c345 100644
--- a/src/yuzu_cmd/config.cpp
+++ b/src/yuzu_cmd/config.cpp
@@ -429,9 +429,6 @@ void Config::ReadValues() {
429 // Debugging 429 // Debugging
430 Settings::values.record_frame_times = 430 Settings::values.record_frame_times =
431 sdl2_config->GetBoolean("Debugging", "record_frame_times", false); 431 sdl2_config->GetBoolean("Debugging", "record_frame_times", false);
432 Settings::values.use_gdbstub = sdl2_config->GetBoolean("Debugging", "use_gdbstub", false);
433 Settings::values.gdbstub_port =
434 static_cast<u16>(sdl2_config->GetInteger("Debugging", "gdbstub_port", 24689));
435 Settings::values.program_args = sdl2_config->Get("Debugging", "program_args", ""); 432 Settings::values.program_args = sdl2_config->Get("Debugging", "program_args", "");
436 Settings::values.dump_exefs = sdl2_config->GetBoolean("Debugging", "dump_exefs", false); 433 Settings::values.dump_exefs = sdl2_config->GetBoolean("Debugging", "dump_exefs", false);
437 Settings::values.dump_nso = sdl2_config->GetBoolean("Debugging", "dump_nso", false); 434 Settings::values.dump_nso = sdl2_config->GetBoolean("Debugging", "dump_nso", false);
diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h
index bcbbcd4ca..2d4b98d9a 100644
--- a/src/yuzu_cmd/default_ini.h
+++ b/src/yuzu_cmd/default_ini.h
@@ -318,9 +318,6 @@ log_filter = *:Trace
318[Debugging] 318[Debugging]
319# Record frame time data, can be found in the log directory. Boolean value 319# Record frame time data, can be found in the log directory. Boolean value
320record_frame_times = 320record_frame_times =
321# Port for listening to GDB connections.
322use_gdbstub=false
323gdbstub_port=24689
324# Determines whether or not yuzu will dump the ExeFS of all games it attempts to load while loading them 321# Determines whether or not yuzu will dump the ExeFS of all games it attempts to load while loading them
325dump_exefs=false 322dump_exefs=false
326# Determines whether or not yuzu will dump all NSOs it attempts to load while loading them 323# Determines whether or not yuzu will dump all NSOs it attempts to load while loading them
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp
index c2efe1ee6..1ebc04af5 100644
--- a/src/yuzu_cmd/yuzu.cpp
+++ b/src/yuzu_cmd/yuzu.cpp
@@ -64,7 +64,6 @@ __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
64static void PrintHelp(const char* argv0) { 64static void PrintHelp(const char* argv0) {
65 std::cout << "Usage: " << argv0 65 std::cout << "Usage: " << argv0
66 << " [options] <filename>\n" 66 << " [options] <filename>\n"
67 "-g, --gdbport=NUMBER Enable gdb stub on port NUMBER\n"
68 "-f, --fullscreen Start in fullscreen mode\n" 67 "-f, --fullscreen Start in fullscreen mode\n"
69 "-h, --help Display this help and exit\n" 68 "-h, --help Display this help and exit\n"
70 "-v, --version Output version information and exit\n" 69 "-v, --version Output version information and exit\n"
@@ -96,8 +95,6 @@ int main(int argc, char** argv) {
96 Config config; 95 Config config;
97 96
98 int option_index = 0; 97 int option_index = 0;
99 bool use_gdbstub = Settings::values.use_gdbstub;
100 u32 gdb_port = static_cast<u32>(Settings::values.gdbstub_port);
101 98
102 InitializeLogging(); 99 InitializeLogging();
103 100
@@ -116,26 +113,17 @@ int main(int argc, char** argv) {
116 bool fullscreen = false; 113 bool fullscreen = false;
117 114
118 static struct option long_options[] = { 115 static struct option long_options[] = {
119 {"gdbport", required_argument, 0, 'g'}, {"fullscreen", no_argument, 0, 'f'}, 116 {"fullscreen", no_argument, 0, 'f'},
120 {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'v'}, 117 {"help", no_argument, 0, 'h'},
121 {"program", optional_argument, 0, 'p'}, {0, 0, 0, 0}, 118 {"version", no_argument, 0, 'v'},
119 {"program", optional_argument, 0, 'p'},
120 {0, 0, 0, 0},
122 }; 121 };
123 122
124 while (optind < argc) { 123 while (optind < argc) {
125 int arg = getopt_long(argc, argv, "g:fhvp::", long_options, &option_index); 124 int arg = getopt_long(argc, argv, "g:fhvp::", long_options, &option_index);
126 if (arg != -1) { 125 if (arg != -1) {
127 switch (static_cast<char>(arg)) { 126 switch (static_cast<char>(arg)) {
128 case 'g':
129 errno = 0;
130 gdb_port = strtoul(optarg, &endarg, 0);
131 use_gdbstub = true;
132 if (endarg == optarg)
133 errno = EINVAL;
134 if (errno != 0) {
135 perror("--gdbport");
136 exit(1);
137 }
138 break;
139 case 'f': 127 case 'f':
140 fullscreen = true; 128 fullscreen = true;
141 LOG_INFO(Frontend, "Starting in fullscreen mode..."); 129 LOG_INFO(Frontend, "Starting in fullscreen mode...");
@@ -177,8 +165,6 @@ int main(int argc, char** argv) {
177 InputCommon::InputSubsystem input_subsystem; 165 InputCommon::InputSubsystem input_subsystem;
178 166
179 // Apply the command line arguments 167 // Apply the command line arguments
180 Settings::values.gdbstub_port = gdb_port;
181 Settings::values.use_gdbstub = use_gdbstub;
182 Settings::Apply(system); 168 Settings::Apply(system);
183 169
184 std::unique_ptr<EmuWindow_SDL2> emu_window; 170 std::unique_ptr<EmuWindow_SDL2> emu_window;
diff --git a/src/yuzu_tester/config.cpp b/src/yuzu_tester/config.cpp
index b6cdc7c1c..91684e96e 100644
--- a/src/yuzu_tester/config.cpp
+++ b/src/yuzu_tester/config.cpp
@@ -158,7 +158,6 @@ void Config::ReadValues() {
158 Settings::values.use_dev_keys = sdl2_config->GetBoolean("Miscellaneous", "use_dev_keys", false); 158 Settings::values.use_dev_keys = sdl2_config->GetBoolean("Miscellaneous", "use_dev_keys", false);
159 159
160 // Debugging 160 // Debugging
161 Settings::values.use_gdbstub = false;
162 Settings::values.program_args = ""; 161 Settings::values.program_args = "";
163 Settings::values.dump_exefs = sdl2_config->GetBoolean("Debugging", "dump_exefs", false); 162 Settings::values.dump_exefs = sdl2_config->GetBoolean("Debugging", "dump_exefs", false);
164 Settings::values.dump_nso = sdl2_config->GetBoolean("Debugging", "dump_nso", false); 163 Settings::values.dump_nso = sdl2_config->GetBoolean("Debugging", "dump_nso", false);
diff --git a/src/yuzu_tester/yuzu.cpp b/src/yuzu_tester/yuzu.cpp
index 50bd7ae41..6435ffabb 100644
--- a/src/yuzu_tester/yuzu.cpp
+++ b/src/yuzu_tester/yuzu.cpp
@@ -162,7 +162,6 @@ int main(int argc, char** argv) {
162 162
163 Core::System& system{Core::System::GetInstance()}; 163 Core::System& system{Core::System::GetInstance()};
164 164
165 Settings::values.use_gdbstub = false;
166 Settings::Apply(system); 165 Settings::Apply(system);
167 166
168 const auto emu_window{std::make_unique<EmuWindow_SDL2_Hide>()}; 167 const auto emu_window{std::make_unique<EmuWindow_SDL2_Hide>()};