Remove unnecessary new lines, changed Deinit to Shutdown
This commit is contained in:
parent
42928659e8
commit
2b7316a379
|
@ -76,7 +76,7 @@ void Config::ReadValues() {
|
||||||
// Miscellaneous
|
// Miscellaneous
|
||||||
Settings::values.log_filter = glfw_config->Get("Miscellaneous", "log_filter", "*:Info");
|
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.use_gdbstub = glfw_config->GetBoolean("Debugging", "use_gdbstub", false);
|
||||||
Settings::values.gdbstub_port = glfw_config->GetInteger("Debugging", "gdbstub_port", 24689);
|
Settings::values.gdbstub_port = glfw_config->GetInteger("Debugging", "gdbstub_port", 24689);
|
||||||
}
|
}
|
||||||
|
|
|
@ -3895,7 +3895,6 @@ unsigned InterpreterMainLoop(ARMul_State* cpu) {
|
||||||
unsigned int addr;
|
unsigned int addr;
|
||||||
unsigned int num_instrs = 0;
|
unsigned int num_instrs = 0;
|
||||||
|
|
||||||
|
|
||||||
int ptr;
|
int ptr;
|
||||||
|
|
||||||
LOAD_NZCVT;
|
LOAD_NZCVT;
|
||||||
|
|
|
@ -186,7 +186,7 @@ static u8 ReadByte() {
|
||||||
size_t received_size = recv(gdbserver_socket, reinterpret_cast<char*>(&c), 1, MSG_WAITALL);
|
size_t received_size = recv(gdbserver_socket, reinterpret_cast<char*>(&c), 1, MSG_WAITALL);
|
||||||
if (received_size != 1) {
|
if (received_size != 1) {
|
||||||
LOG_ERROR(Debug_GDBStub, "recv failed : %ld", received_size);
|
LOG_ERROR(Debug_GDBStub, "recv failed : %ld", received_size);
|
||||||
Deinit();
|
Shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
return c;
|
return c;
|
||||||
|
@ -322,7 +322,7 @@ static void SendReply(const char* reply) {
|
||||||
int sent_size = send(gdbserver_socket, reinterpret_cast<char*>(ptr), left, 0);
|
int sent_size = send(gdbserver_socket, reinterpret_cast<char*>(ptr), left, 0);
|
||||||
if (sent_size < 0) {
|
if (sent_size < 0) {
|
||||||
LOG_ERROR(Debug_GDBStub, "gdb: send failed");
|
LOG_ERROR(Debug_GDBStub, "gdb: send failed");
|
||||||
return Deinit();
|
return Shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
left -= sent_size;
|
left -= sent_size;
|
||||||
|
@ -773,7 +773,7 @@ void HandlePacket() {
|
||||||
HandleSignal();
|
HandleSignal();
|
||||||
break;
|
break;
|
||||||
case 'k':
|
case 'k':
|
||||||
Deinit();
|
Shutdown();
|
||||||
LOG_INFO(Debug_GDBStub, "killed by gdb");
|
LOG_INFO(Debug_GDBStub, "killed by gdb");
|
||||||
return;
|
return;
|
||||||
case 'g':
|
case 'g':
|
||||||
|
@ -829,7 +829,7 @@ void ToggleServer(bool status) {
|
||||||
else {
|
else {
|
||||||
// Stop server
|
// Stop server
|
||||||
if (IsConnected()) {
|
if (IsConnected()) {
|
||||||
Deinit();
|
Shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
g_server_enabled = status;
|
g_server_enabled = status;
|
||||||
|
@ -908,7 +908,7 @@ void Init() {
|
||||||
Init(gdbstub_port);
|
Init(gdbstub_port);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Deinit() {
|
void Shutdown() {
|
||||||
if (!g_server_enabled) {
|
if (!g_server_enabled) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,7 +44,7 @@ void ToggleServer(bool status);
|
||||||
void Init();
|
void Init();
|
||||||
|
|
||||||
/// Stop gdbstub server.
|
/// Stop gdbstub server.
|
||||||
void Deinit();
|
void Shutdown();
|
||||||
|
|
||||||
/// Returns true if there is an active socket connection.
|
/// Returns true if there is an active socket connection.
|
||||||
bool IsConnected();
|
bool IsConnected();
|
||||||
|
|
|
@ -24,13 +24,11 @@ void Init(EmuWindow* emu_window) {
|
||||||
Kernel::Init();
|
Kernel::Init();
|
||||||
HLE::Init();
|
HLE::Init();
|
||||||
VideoCore::Init(emu_window);
|
VideoCore::Init(emu_window);
|
||||||
|
|
||||||
GDBStub::Init();
|
GDBStub::Init();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Shutdown() {
|
void Shutdown() {
|
||||||
GDBStub::Deinit();
|
GDBStub::Shutdown();
|
||||||
|
|
||||||
VideoCore::Shutdown();
|
VideoCore::Shutdown();
|
||||||
HLE::Shutdown();
|
HLE::Shutdown();
|
||||||
Kernel::Shutdown();
|
Kernel::Shutdown();
|
||||||
|
|
Reference in New Issue