From 5114d756470ff70b0ce8c6f3ff98000462aaef35 Mon Sep 17 00:00:00 2001 From: polaris- Date: Wed, 2 Sep 2015 08:56:38 -0400 Subject: Implement gdbstub --- src/citra/citra.cpp | 3 +++ src/citra/config.cpp | 4 ++++ src/citra/default_ini.h | 5 +++++ 3 files changed, 12 insertions(+) (limited to 'src/citra') diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index 46f4a07c9..b36865395 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp @@ -30,6 +30,8 @@ #include "video_core/video_core.h" +#include "core/gdbstub/gdbstub.h" + static void PrintHelp() { @@ -72,6 +74,7 @@ int main(int argc, char **argv) { Config config; log_filter.ParseFilterString(Settings::values.log_filter); + GDBStub::SetServerPort(static_cast(Settings::values.gdbstub_port)); EmuWindow_GLFW* emu_window = new EmuWindow_GLFW; diff --git a/src/citra/config.cpp b/src/citra/config.cpp index 8a98bda87..af343e9fe 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -75,6 +75,10 @@ void Config::ReadValues() { // Miscellaneous Settings::values.log_filter = glfw_config->Get("Miscellaneous", "log_filter", "*:Info"); + + // GDBStubebugging + Settings::values.use_gdbstub = glfw_config->GetBoolean("Debugging", "use_gdbstub", false); + Settings::values.gdbstub_port = glfw_config->GetInteger("Debugging", "gdbstub_port", 24689); } void Config::Reload() { diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h index 7e5d49729..5ba40a8ed 100644 --- a/src/citra/default_ini.h +++ b/src/citra/default_ini.h @@ -66,6 +66,11 @@ region_value = # A filter which removes logs below a certain logging level. # Examples: *:Debug Kernel.SVC:Trace Service.*:Critical log_filter = *:Info + +[Debugging] +# Port for listening to GDB connections. +use_gdbstub=false +gdbstub_port=24689 )"; } -- cgit v1.2.3 From 31dee93e849d79a91f280faf16941806e3cb3c6b Mon Sep 17 00:00:00 2001 From: polaris- Date: Wed, 2 Sep 2015 08:56:38 -0400 Subject: Implement gdbstub --- src/citra/citra.cpp | 3 +++ src/citra/config.cpp | 4 ++++ src/citra/default_ini.h | 5 +++++ 3 files changed, 12 insertions(+) (limited to 'src/citra') diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index 46f4a07c9..b36865395 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp @@ -30,6 +30,8 @@ #include "video_core/video_core.h" +#include "core/gdbstub/gdbstub.h" + static void PrintHelp() { @@ -72,6 +74,7 @@ int main(int argc, char **argv) { Config config; log_filter.ParseFilterString(Settings::values.log_filter); + GDBStub::SetServerPort(static_cast(Settings::values.gdbstub_port)); EmuWindow_GLFW* emu_window = new EmuWindow_GLFW; diff --git a/src/citra/config.cpp b/src/citra/config.cpp index 8a98bda87..af343e9fe 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -75,6 +75,10 @@ void Config::ReadValues() { // Miscellaneous Settings::values.log_filter = glfw_config->Get("Miscellaneous", "log_filter", "*:Info"); + + // GDBStubebugging + Settings::values.use_gdbstub = glfw_config->GetBoolean("Debugging", "use_gdbstub", false); + Settings::values.gdbstub_port = glfw_config->GetInteger("Debugging", "gdbstub_port", 24689); } void Config::Reload() { diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h index 7e5d49729..5ba40a8ed 100644 --- a/src/citra/default_ini.h +++ b/src/citra/default_ini.h @@ -66,6 +66,11 @@ region_value = # A filter which removes logs below a certain logging level. # Examples: *:Debug Kernel.SVC:Trace Service.*:Critical log_filter = *:Info + +[Debugging] +# Port for listening to GDB connections. +use_gdbstub=false +gdbstub_port=24689 )"; } -- cgit v1.2.3 From 2b7316a379103edf4d22893e0f4432e6415eabfa Mon Sep 17 00:00:00 2001 From: polaris- Date: Sun, 11 Oct 2015 20:07:58 -0400 Subject: Remove unnecessary new lines, changed Deinit to Shutdown --- src/citra/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/citra') diff --git a/src/citra/config.cpp b/src/citra/config.cpp index af343e9fe..2f13c29a2 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -76,7 +76,7 @@ void Config::ReadValues() { // Miscellaneous Settings::values.log_filter = glfw_config->Get("Miscellaneous", "log_filter", "*:Info"); - // GDBStubebugging + // Debugging Settings::values.use_gdbstub = glfw_config->GetBoolean("Debugging", "use_gdbstub", false); Settings::values.gdbstub_port = glfw_config->GetInteger("Debugging", "gdbstub_port", 24689); } -- cgit v1.2.3 From a5ab8accc21e73be9564bebde4d3b20b38d85b6e Mon Sep 17 00:00:00 2001 From: polaris- Date: Wed, 21 Oct 2015 22:19:55 -0400 Subject: Handle changes pointed out in comments on PR --- src/citra/citra.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/citra') diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index bfbb21199..c96fc1374 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp @@ -23,6 +23,7 @@ #include "core/settings.h" #include "core/system.h" #include "core/core.h" +#include "core/gdbstub/gdbstub.h" #include "core/loader/loader.h" #include "citra/config.h" @@ -30,8 +31,6 @@ #include "video_core/video_core.h" -#include "core/gdbstub/gdbstub.h" - static void PrintHelp() { -- cgit v1.2.3