ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7313 from PoroCYon/master 

Rename SIGTRAP, SIGTERM etc. to GDB_SIGTRAP etc.
This commit is contained in:
Pierre Bourdon 2018-08-11 01:40:14 +02:00 committed by GitHub
parent 185f971e2a 26a9ab5b19
commit b382310367
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/PowerPC/GDBStub.cpp
View File

@ -252,7 +252,7 @@ static void gdb_read_command()
else if (c == 0x03) else if (c == 0x03)
{ {
CPU::Break(); CPU::Break();
gdb_signal(SIGTRAP); gdb_signal(GDB_SIGTRAP);
return; return;
} }
else if (c != GDB_STUB_START) else if (c != GDB_STUB_START)

11
Source/Core/Core/PowerPC/GDBStub.h
View File

@ -8,12 +8,15 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#ifdef _WIN32 #if defined(_WIN32) || !defined(MSG_WAITALL)
#define SIGTRAP 5 #define MSG_WAITALL (8)
#define SIGTERM 15
#define MSG_WAITALL 8
#endif #endif
typedef enum {
GDB_SIGTRAP = 5,
GDB_SIGTERM = 15,
} gdb_signals;
typedef enum { typedef enum {
GDB_BP_TYPE_NONE = 0, GDB_BP_TYPE_NONE = 0,
GDB_BP_TYPE_X, GDB_BP_TYPE_X,

2
Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp
View File

@ -117,7 +117,7 @@ int Interpreter::SingleStepInner()
{ {
Host_UpdateDisasmDialog(); Host_UpdateDisasmDialog();
gdb_signal(SIGTRAP); gdb_signal(GDB_SIGTRAP);
gdb_handle_exception(); gdb_handle_exception();
} }
#endif #endif