LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Fix thumb breakpoint handling

Browse Source
This commit is contained in:
TuxSH 2017-09-24 17:58:23 +02:00
parent f27cdb4543
commit 8e31784996
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sysmodules/rosalina/source/gdb/breakpoints.c
View File

@ -68,14 +68,17 @@ int GDB_GetBreakpointInstruction(u32 *instruction, GDBContext *ctx, u32 address)
int GDB_AddBreakpoint(GDBContext *ctx, u32 address, bool thumb, bool persist) int GDB_AddBreakpoint(GDBContext *ctx, u32 address, bool thumb, bool persist)
{ {
if(!thumb && (address & 3) != 0)
return -EINVAL;
address &= ~1;
u32 id = GDB_FindClosestBreakpointSlot(ctx, address); u32 id = GDB_FindClosestBreakpointSlot(ctx, address);
if(id != ctx->nbBreakpoints && ctx->breakpoints[id].instructionSize != 0 && ctx->breakpoints[id].address == address) if(id != ctx->nbBreakpoints && ctx->breakpoints[id].instructionSize != 0 && ctx->breakpoints[id].address == address)
return 0; return 0;
else if(ctx->nbBreakpoints == MAX_BREAKPOINT) else if(ctx->nbBreakpoints == MAX_BREAKPOINT)
return -EBUSY; return -EBUSY;
else if((thumb && (address & 1) != 0) || (!thumb && (address & 3) != 0))
return -EINVAL;
for(u32 i = ctx->nbBreakpoints; i > id && i != 0; i--) for(u32 i = ctx->nbBreakpoints; i > id && i != 0; i--)
ctx->breakpoints[i] = ctx->breakpoints[i - 1]; ctx->breakpoints[i] = ctx->breakpoints[i - 1];
@ -111,6 +114,11 @@ int GDB_DisableBreakpointById(GDBContext *ctx, u32 id)
int GDB_RemoveBreakpoint(GDBContext *ctx, u32 address) int GDB_RemoveBreakpoint(GDBContext *ctx, u32 address)
{ {
if(!thumb && (address & 3) != 0)
return -EINVAL;
address &= ~1;
u32 id = GDB_FindClosestBreakpointSlot(ctx, address); u32 id = GDB_FindClosestBreakpointSlot(ctx, address);
if(id == ctx->nbBreakpoints || ctx->breakpoints[id].address != address) if(id == ctx->nbBreakpoints || ctx->breakpoints[id].address != address)
return -EINVAL; return -EINVAL;