nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-23 04:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

thermosphere: fix software breakpoints

Browse source
This commit is contained in:
TuxSH 2020-02-02 22:55:01 +00:00
parent 307d2361ff
commit 84ee01797a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
thermosphere/src/software_breakpoints.c
View file

@ -58,7 +58,7 @@ static size_t findClosestSoftwareBreakpointSlot(uintptr_t address)
static inline bool doApplySoftwareBreakpoint(size_t id) static inline bool doApplySoftwareBreakpoint(size_t id)
{ {
SoftwareBreakpoint *bp = &g_softwareBreakpointManager.breakpoints[id]; SoftwareBreakpoint *bp = &g_softwareBreakpointManager.breakpoints[id];
u32 brkInst = 0xF2000000 | bp->uid; u32 brkInst = 0xD4200000 | (bp->uid << 5);
size_t sz = guestReadWriteMemory(bp->address, 4, &bp->savedInstruction, &brkInst); size_t sz = guestReadWriteMemory(bp->address, 4, &bp->savedInstruction, &brkInst);
bp->applied = sz == 4; bp->applied = sz == 4;
@ -181,7 +181,7 @@ int addSoftwareBreakpoint(uintptr_t addr, bool persistent)
bp->address = addr; bp->address = addr;
bp->persistent = persistent; bp->persistent = persistent;
bp->applied = false; bp->applied = false;
bp->uid = 0x2000 + g_softwareBreakpointManager.bpUniqueCounter++; bp->uid = (u16)(0x2000 + g_softwareBreakpointManager.bpUniqueCounter++);
int rc = applySoftwareBreakpoint(id) ? 0 : -EFAULT; int rc = applySoftwareBreakpoint(id) ? 0 : -EFAULT;
recursiveSpinlockUnlock(&g_softwareBreakpointManager.lock); recursiveSpinlockUnlock(&g_softwareBreakpointManager.lock);

2
thermosphere/src/software_breakpoints.h
View file

@ -27,7 +27,7 @@
typedef struct SoftwareBreakpoint { typedef struct SoftwareBreakpoint {
uintptr_t address; // VA uintptr_t address; // VA
u32 savedInstruction; u32 savedInstruction;
u32 uid; u16 uid;
bool persistent; bool persistent;
bool applied; bool applied;
atomic_bool triedToApplyOrRevert; atomic_bool triedToApplyOrRevert;