summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpolaris- <nagatospam@gmail.com>2015-10-12 02:07:58 +0200
committerpolaris- <nagatospam@gmail.com>2015-10-12 02:07:58 +0200
commit2b7316a379103edf4d22893e0f4432e6415eabfa (patch)
treefc4f6cc31b7288689726fbe379755a610a854b7f
parentUse BreakpointAddress struct instead of passing address directly (diff)
downloadyuzu-2b7316a379103edf4d22893e0f4432e6415eabfa.tar
yuzu-2b7316a379103edf4d22893e0f4432e6415eabfa.tar.gz
yuzu-2b7316a379103edf4d22893e0f4432e6415eabfa.tar.bz2
yuzu-2b7316a379103edf4d22893e0f4432e6415eabfa.tar.lz
yuzu-2b7316a379103edf4d22893e0f4432e6415eabfa.tar.xz
yuzu-2b7316a379103edf4d22893e0f4432e6415eabfa.tar.zst
yuzu-2b7316a379103edf4d22893e0f4432e6415eabfa.zip
-rw-r--r--src/citra/config.cpp2
-rw-r--r--src/core/arm/dyncom/arm_dyncom_interpreter.cpp1
-rw-r--r--src/core/gdbstub/gdbstub.cpp10
-rw-r--r--src/core/gdbstub/gdbstub.h2
-rw-r--r--src/core/system.cpp4
5 files changed, 8 insertions, 11 deletions
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);
}
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
index 88be27ab2..96c88c83a 100644
--- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
+++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
@@ -3895,7 +3895,6 @@ unsigned InterpreterMainLoop(ARMul_State* cpu) {
unsigned int addr;
unsigned int num_instrs = 0;
-
int ptr;
LOAD_NZCVT;
diff --git a/src/core/gdbstub/gdbstub.cpp b/src/core/gdbstub/gdbstub.cpp
index 25ce63b29..15e6f36a0 100644
--- a/src/core/gdbstub/gdbstub.cpp
+++ b/src/core/gdbstub/gdbstub.cpp
@@ -186,7 +186,7 @@ static u8 ReadByte() {
size_t received_size = recv(gdbserver_socket, reinterpret_cast<char*>(&c), 1, MSG_WAITALL);
if (received_size != 1) {
LOG_ERROR(Debug_GDBStub, "recv failed : %ld", received_size);
- Deinit();
+ Shutdown();
}
return c;
@@ -322,7 +322,7 @@ static void SendReply(const char* reply) {
int sent_size = send(gdbserver_socket, reinterpret_cast<char*>(ptr), left, 0);
if (sent_size < 0) {
LOG_ERROR(Debug_GDBStub, "gdb: send failed");
- return Deinit();
+ return Shutdown();
}
left -= sent_size;
@@ -773,7 +773,7 @@ void HandlePacket() {
HandleSignal();
break;
case 'k':
- Deinit();
+ Shutdown();
LOG_INFO(Debug_GDBStub, "killed by gdb");
return;
case 'g':
@@ -829,7 +829,7 @@ void ToggleServer(bool status) {
else {
// Stop server
if (IsConnected()) {
- Deinit();
+ Shutdown();
}
g_server_enabled = status;
@@ -908,7 +908,7 @@ void Init() {
Init(gdbstub_port);
}
-void Deinit() {
+void Shutdown() {
if (!g_server_enabled) {
return;
}
diff --git a/src/core/gdbstub/gdbstub.h b/src/core/gdbstub/gdbstub.h
index da238f349..aff705a32 100644
--- a/src/core/gdbstub/gdbstub.h
+++ b/src/core/gdbstub/gdbstub.h
@@ -44,7 +44,7 @@ void ToggleServer(bool status);
void Init();
/// Stop gdbstub server.
-void Deinit();
+void Shutdown();
/// Returns true if there is an active socket connection.
bool IsConnected();
diff --git a/src/core/system.cpp b/src/core/system.cpp
index 421fc48a7..7e9c56538 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -24,13 +24,11 @@ void Init(EmuWindow* emu_window) {
Kernel::Init();
HLE::Init();
VideoCore::Init(emu_window);
-
GDBStub::Init();
}
void Shutdown() {
- GDBStub::Deinit();
-
+ GDBStub::Shutdown();
VideoCore::Shutdown();
HLE::Shutdown();
Kernel::Shutdown();