xavi
/
pcsxr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Notify gdb stub whenever a break instruction is executed

This commit is contained in:
Xavier Del Campo Romero 2020-11-03 22:39:00 +01:00
parent 5d8182c246
commit 2dde7bcb26
4 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdbstub/gdbstub

@ -1 +1 @@
Subproject commit 13012701334821cf1038a81920eaafff1921268a Subproject commit 1266e61757af01485f56b4e5bd3969fdaba9c356

19
gdbstub/gdbstub_sys.c
View File

@ -196,15 +196,22 @@ static int wait_hit_or_break(struct msg *msg)
break; break;
} }
} }
else if (msg->type != MSG_TYPE_HIT) { else {
fprintf(stderr, "unexpected msg.type %d\n", msg->type); switch (msg->type) {
return 1; case MSG_TYPE_BREAK:
return 1;
case MSG_TYPE_HIT:
return 0;
default:
fprintf(stderr, "%s:%d:unexpected msg.type %d\n",
__func__, __LINE__, msg->type);
return EOF;
}
} }
else
return 0;
} while (1); } while (1);
return 1; return EOF;
} }
#endif #endif

3
gdbstub/gdbstub_sys.h
View File

@ -66,7 +66,8 @@ struct msg {
MSG_TYPE_SHUTDOWN, MSG_TYPE_SHUTDOWN,
/* Response frames. */ /* Response frames. */
MSG_TYPE_HIT MSG_TYPE_HIT,
MSG_TYPE_BREAK,
} type; } type;
union { union {

15
libpcsxcore/psxinterpreter.c
View File

@ -655,8 +655,10 @@ void psxMTLO() { _rLo_ = _rRs_; } // Lo = Rs
* Special purpose instructions * * Special purpose instructions *
* Format: OP * * Format: OP *
*********************************************************/ *********************************************************/
static void process_gdb(int);
void psxBREAK() { void psxBREAK() {
// Break exception - psx rom doens't handles this // Break exception - psx rom doens't handles this
if (Config.GdbServer) process_gdb(1);
} }
void psxSYSCALL() { void psxSYSCALL() {
@ -1204,7 +1206,7 @@ static void intClear(u32 Addr, u32 Size) {
static void intShutdown() { static void intShutdown() {
} }
static void process_gdb(void) { static void process_gdb(int found_break) {
static int shutdown; static int shutdown;
static u32 tgt_addr; static u32 tgt_addr;
static int step, must_continue; static int step, must_continue;
@ -1215,7 +1217,14 @@ start:
if (shutdown) if (shutdown)
return; return;
if (halt || step || (must_continue && tgt_addr && tgt_addr == psxRegs.pc)) { if (found_break) {
msg.type = MSG_TYPE_BREAK;
gdbstub_sys_send(&msg);
must_continue = 0;
step = 0;
halt = 0;
}
else if (halt || step || (must_continue && tgt_addr && tgt_addr == psxRegs.pc)) {
msg.type = MSG_TYPE_HIT; msg.type = MSG_TYPE_HIT;
#if DEBUG == 1 #if DEBUG == 1
printf("hit address 0x%08X\n", psxRegs.pc); printf("hit address 0x%08X\n", psxRegs.pc);
@ -1276,7 +1285,7 @@ static inline void execI() {
debugI(); debugI();
if (Config.GdbServer) process_gdb(); if (Config.GdbServer) process_gdb(0);
else if (Config.Debug) ProcessDebug(); else if (Config.Debug) ProcessDebug();
psxRegs.pc += 4; psxRegs.pc += 4;