nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-11-15 09:36:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

thermosphere: fix watchpoint creation, fix wp&bp allocation

Browse source
This commit is contained in:
TuxSH 2020-02-03 22:12:43 +00:00
parent be6253d6ad
commit 5de560be30
4 changed files with 33 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
thermosphere/src/breakpoints.c
View file

@ -30,7 +30,8 @@ void initBreakpoints(void)
if (currentCoreCtx->isBootCore && !currentCoreCtx->warmboot) { if (currentCoreCtx->isBootCore && !currentCoreCtx->warmboot) {
size_t num = ((GET_SYSREG(id_aa64dfr0_el1) >> 12) & 0xF) + 1; size_t num = ((GET_SYSREG(id_aa64dfr0_el1) >> 12) & 0xF) + 1;
g_breakpointManager.maxBreakpoints = (u32)num; g_breakpointManager.maxBreakpoints = (u32)num;
g_breakpointManager.allocationBitmap = BIT(num) - 1; g_breakpointManager.freeBitmap = BIT(num) - 1;
g_breakpointManager.usedBitmap = 0;
} }
loadBreakpointRegs(g_breakpointManager.breakpoints, g_breakpointManager.maxBreakpoints); loadBreakpointRegs(g_breakpointManager.breakpoints, g_breakpointManager.maxBreakpoints);
@ -54,11 +55,12 @@ static inline void commitAndBroadcastBreakpoints(void)
static DebugRegisterPair *allocateBreakpoint(void) static DebugRegisterPair *allocateBreakpoint(void)
{ {
u32 pos = __builtin_ffs(g_breakpointManager.allocationBitmap); u32 pos = __builtin_ffs(g_breakpointManager.freeBitmap);
if (pos == 0) { if (pos == 0) {
return NULL; return NULL;
} else { } else {
g_breakpointManager.allocationBitmap &= ~BIT(pos - 1); g_breakpointManager.freeBitmap &= ~BIT(pos - 1);
g_breakpointManager.usedBitmap |= BIT(pos - 1);
return &g_breakpointManager.breakpoints[pos - 1]; return &g_breakpointManager.breakpoints[pos - 1];
} }
} }
@ -66,21 +68,15 @@ static DebugRegisterPair *allocateBreakpoint(void)
static void freeBreakpoint(u32 pos) static void freeBreakpoint(u32 pos)
{ {
memset(&g_breakpointManager.breakpoints[pos], 0, sizeof(DebugRegisterPair)); memset(&g_breakpointManager.breakpoints[pos], 0, sizeof(DebugRegisterPair));
g_breakpointManager.allocationBitmap |= BIT(pos); g_breakpointManager.freeBitmap |= BIT(pos);
g_breakpointManager.usedBitmap &= ~BIT(pos);
} }
static DebugRegisterPair *findBreakpoint(uintptr_t addr) static DebugRegisterPair *findBreakpoint(uintptr_t addr)
{ {
u16 bitmap = ~g_breakpointManager.allocationBitmap & 0xFFFF; FOREACH_BIT (tmp, i, g_breakpointManager.usedBitmap) {
while (bitmap != 0) { if (g_breakpointManager.breakpoints[i - 1].vr == addr) {
u32 pos = __builtin_ffs(bitmap); return &g_breakpointManager.breakpoints[i - 1];
if (pos == 0) {
return NULL;
} else {
bitmap &= ~BIT(pos - 1);
if (g_breakpointManager.breakpoints[pos - 1].vr == addr) {
return &g_breakpointManager.breakpoints[pos - 1];
}
} }
} }
@ -100,6 +96,11 @@ int addBreakpoint(uintptr_t addr)
return -EINVAL; return -EINVAL;
} }
// Oops
if (g_breakpointManager.freeBitmap == 0) {
return -EBUSY;
}
// Breakpoint already added // Breakpoint already added
if (findBreakpoint(addr) != NULL) { if (findBreakpoint(addr) != NULL) {
recursiveSpinlockUnlock(&g_breakpointManager.lock); recursiveSpinlockUnlock(&g_breakpointManager.lock);
@ -149,7 +150,8 @@ int removeBreakpoint(uintptr_t addr)
int removeAllBreakpoints(void) int removeAllBreakpoints(void)
{ {
recursiveSpinlockLock(&g_breakpointManager.lock); recursiveSpinlockLock(&g_breakpointManager.lock);
g_breakpointManager.allocationBitmap = BIT(g_breakpointManager.maxBreakpoints) - 1; g_breakpointManager.freeBitmap |= g_breakpointManager.usedBitmap;
g_breakpointManager.usedBitmap = 0;
memset(g_breakpointManager.breakpoints, 0, sizeof(g_breakpointManager.breakpoints)); memset(g_breakpointManager.breakpoints, 0, sizeof(g_breakpointManager.breakpoints));
commitAndBroadcastBreakpoints(); commitAndBroadcastBreakpoints();

3
thermosphere/src/breakpoints.h
View file

@ -27,7 +27,8 @@ typedef struct BreakpointManager {
DebugRegisterPair breakpoints[MAX_BCR]; DebugRegisterPair breakpoints[MAX_BCR];
RecursiveSpinlock lock; RecursiveSpinlock lock;
u32 maxBreakpoints; u32 maxBreakpoints;
u16 allocationBitmap; u16 freeBitmap;
u16 usedBitmap;
} BreakpointManager; } BreakpointManager;
extern BreakpointManager g_breakpointManager; extern BreakpointManager g_breakpointManager;

22
thermosphere/src/watchpoints.c
View file

@ -32,7 +32,8 @@ void initWatchpoints(void)
if (currentCoreCtx->isBootCore && !currentCoreCtx->warmboot) { if (currentCoreCtx->isBootCore && !currentCoreCtx->warmboot) {
size_t num = ((GET_SYSREG(id_aa64dfr0_el1) >> 20) & 0xF) + 1; size_t num = ((GET_SYSREG(id_aa64dfr0_el1) >> 20) & 0xF) + 1;
g_watchpointManager.maxWatchpoints = (u32)num; g_watchpointManager.maxWatchpoints = (u32)num;
g_watchpointManager.allocationBitmap = BIT(num) - 1; g_watchpointManager.freeBitmap = BIT(num) - 1;
g_watchpointManager.usedBitmap = 0;
} }
loadWatchpointRegs(g_watchpointManager.watchpoints, g_watchpointManager.maxWatchpoints); loadWatchpointRegs(g_watchpointManager.watchpoints, g_watchpointManager.maxWatchpoints);
@ -56,11 +57,12 @@ static inline void commitAndBroadcastWatchpoints(void)
static DebugRegisterPair *allocateWatchpoint(void) static DebugRegisterPair *allocateWatchpoint(void)
{ {
u32 pos = __builtin_ffs(g_watchpointManager.allocationBitmap); u32 pos = __builtin_ffs(g_watchpointManager.freeBitmap);
if (pos == 0) { if (pos == 0) {
return NULL; return NULL;
} else { } else {
g_watchpointManager.allocationBitmap &= ~BIT(pos - 1); g_watchpointManager.freeBitmap &= ~BIT(pos - 1);
g_watchpointManager.usedBitmap |= BIT(pos - 1);
return &g_watchpointManager.watchpoints[pos - 1]; return &g_watchpointManager.watchpoints[pos - 1];
} }
} }
@ -68,7 +70,8 @@ static DebugRegisterPair *allocateWatchpoint(void)
static void freeWatchpoint(u32 pos) static void freeWatchpoint(u32 pos)
{ {
memset(&g_watchpointManager.watchpoints[pos], 0, sizeof(DebugRegisterPair)); memset(&g_watchpointManager.watchpoints[pos], 0, sizeof(DebugRegisterPair));
g_watchpointManager.allocationBitmap |= BIT(pos); g_watchpointManager.freeBitmap |= BIT(pos);
g_watchpointManager.usedBitmap &= ~BIT(pos);
} }
static inline bool isRangeMaskWatchpoint(uintptr_t addr, size_t size) static inline bool isRangeMaskWatchpoint(uintptr_t addr, size_t size)
@ -81,8 +84,7 @@ static inline bool isRangeMaskWatchpoint(uintptr_t addr, size_t size)
// Size = 0 means nonstrict // Size = 0 means nonstrict
static DebugRegisterPair *findWatchpoint(uintptr_t addr, size_t size, WatchpointLoadStoreControl direction) static DebugRegisterPair *findWatchpoint(uintptr_t addr, size_t size, WatchpointLoadStoreControl direction)
{ {
u64 bitmap = ~g_watchpointManager.allocationBitmap & 0xFFFF; FOREACH_BIT (tmp, i, g_watchpointManager.usedBitmap) {
FOREACH_BIT (tmp, i, bitmap) {
DebugRegisterPair *wp = &g_watchpointManager.watchpoints[i]; DebugRegisterPair *wp = &g_watchpointManager.watchpoints[i];
size_t off; size_t off;
@ -146,7 +148,7 @@ int addWatchpoint(uintptr_t addr, size_t size, WatchpointLoadStoreControl direct
recursiveSpinlockLock(&g_watchpointManager.lock); recursiveSpinlockLock(&g_watchpointManager.lock);
if (g_watchpointManager.allocationBitmap == 0) { if (g_watchpointManager.freeBitmap == 0) {
recursiveSpinlockUnlock(&g_watchpointManager.lock); recursiveSpinlockUnlock(&g_watchpointManager.lock);
return -EBUSY; return -EBUSY;
} }
@ -166,9 +168,8 @@ int addWatchpoint(uintptr_t addr, size_t size, WatchpointLoadStoreControl direct
wp->cr.mask = (u32)__builtin_ffsl(size) - 1; wp->cr.mask = (u32)__builtin_ffsl(size) - 1;
} else { } else {
size_t off = addr & 7ull; size_t off = addr & 7ull;
size_t sz = 8 - off;
wp->vr = addr & ~7ul; wp->vr = addr & ~7ul;
wp->cr.bas = MASK2(off + sz, off); wp->cr.bas = MASK2(off + size, off);
} }
wp->cr.linked = false; wp->cr.linked = false;
@ -213,7 +214,8 @@ int removeAllWatchpoints(void)
recursiveSpinlockLock(&g_watchpointManager.lock); recursiveSpinlockLock(&g_watchpointManager.lock);
g_watchpointManager.allocationBitmap = BIT(g_watchpointManager.maxWatchpoints) - 1; g_watchpointManager.freeBitmap |= g_watchpointManager.usedBitmap;
g_watchpointManager.usedBitmap = 0;
memset(g_watchpointManager.watchpoints, 0, sizeof(g_watchpointManager.watchpoints)); memset(g_watchpointManager.watchpoints, 0, sizeof(g_watchpointManager.watchpoints));
commitAndBroadcastWatchpoints(); commitAndBroadcastWatchpoints();

3
thermosphere/src/watchpoints.h
View file

@ -27,7 +27,8 @@ typedef struct WatchpointManager {
DebugRegisterPair watchpoints[MAX_WCR]; DebugRegisterPair watchpoints[MAX_WCR];
RecursiveSpinlock lock; RecursiveSpinlock lock;
u32 maxWatchpoints; u32 maxWatchpoints;
u16 allocationBitmap; u16 freeBitmap;
u16 usedBitmap;
} WatchpointManager; } WatchpointManager;
void initWatchpoints(void); void initWatchpoints(void);