anod/Luma3DS-autorun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdb: use 'swbreak' for bkpt too

Browse Source
This commit is contained in:
TuxSH 2022-06-03 22:18:10 +01:00
parent 4de0375bde
commit e5e09c1e13
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sysmodules/rosalina/source/gdb/debug.c
View File

@ -546,20 +546,13 @@ int GDB_SendStopReply(GDBContext *ctx, const DebugEventInfo *info)
switch(exc.stop_point.type) switch(exc.stop_point.type)
{ {
case STOPPOINT_SVC_FF: case STOPPOINT_SVC_FF:
{
GDB_ParseCommonThreadInfo(buffer, ctx, SIGTRAP);
return GDB_SendFormattedPacket(ctx, "%sswbreak:;", buffer);
break;
}
case STOPPOINT_BREAKPOINT: case STOPPOINT_BREAKPOINT:
{ {
// Note: this includes both "bkpt" and hw breakpoints, but we never use the latter... // Note: STOPPOINT_BREAKPOINT includes both "bkpt" and hw breakpoints, but we never use the latter...
// However, since our GDB executable only knows about svc 0xFF as sw breakpoint for the 3DS ABI, // Use swbreak as a reason for both 'svc 0xFF' and 'bkpt' too (GDB doc mention we should use 'swbreak'
// we can use swbreak as reason (it'll dismiss the bkpt instruction and try to auto-step over it). // even if the breakpoint was already present/hardcoded).
GDB_ParseCommonThreadInfo(buffer, ctx, SIGTRAP); GDB_ParseCommonThreadInfo(buffer, ctx, SIGTRAP);
return GDB_SendFormattedPacket(ctx, "%s", buffer); return GDB_SendFormattedPacket(ctx, "%sswbreak:;", buffer);
break;
} }
case STOPPOINT_WATCHPOINT: case STOPPOINT_WATCHPOINT:
@ -571,7 +564,6 @@ int GDB_SendStopReply(GDBContext *ctx, const DebugEventInfo *info)
GDB_ParseCommonThreadInfo(buffer, ctx, SIGTRAP); GDB_ParseCommonThreadInfo(buffer, ctx, SIGTRAP);
return GDB_SendFormattedPacket(ctx, "%s%swatch:%08lx;", buffer, kinds[(u32)kind], exc.stop_point.fault_information); return GDB_SendFormattedPacket(ctx, "%s%swatch:%08lx;", buffer, kinds[(u32)kind], exc.stop_point.fault_information);
break;
} }
default: default: