mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-06-06 09:31:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

thermosphere: fix break/continue (?), fix attach/detach

Browse source
This commit is contained in:
TuxSH 2020-01-31 01:12:59 +00:00
parent f0b9162d5e
commit 175f16627b
5 changed files with 54 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
thermosphere/src/gdb/debug.c
View file

@ -31,13 +31,13 @@ static bool GDB_PreprocessDebugEvent(GDBContext *ctx, DebugEventInfo *info)
switch (info->type) {
case DBGEVENT_CORE_ON: {
shouldSignal = ctx->catchThreadEvents;
if (!info->handled) {
if (!info->preprocessed) {
ctx->attachedCoreList |= BIT(info->coreId);
}
break;
}
case DBGEVENT_CORE_OFF: {
if (!info->handled) {
if (!info->preprocessed) {
u32 newLst = ctx->attachedCoreList & ~BIT(info->coreId);
if (ctx->selectedThreadId == info->coreId && newLst != 0) {
ctx->selectedThreadId = __builtin_ctz(newLst);
@ -46,7 +46,7 @@ static bool GDB_PreprocessDebugEvent(GDBContext *ctx, DebugEventInfo *info)
ctx->attachedCoreList = newLst;
shouldSignal = ctx->catchThreadEvents || newLst == 0;
} else {
shouldSignal = ctx->catchThreadEvents;
shouldSignal = ctx->catchThreadEvents || ctx->attachedCoreList == 0;
}
break;
}
@ -56,7 +56,7 @@ static bool GDB_PreprocessDebugEvent(GDBContext *ctx, DebugEventInfo *info)
break;
}
info->handled = true;
info->preprocessed = true;
restoreInterruptFlags(irqFlags);
return shouldSignal;
}
@ -287,7 +287,14 @@ void GDB_BreakAllCores(GDBContext *ctx)
if (ctx->flags & GDB_FLAG_NONSTOP) {
debugManagerBreakCores(ctx->attachedCoreList);
} else {
debugManagerBreakCores(BIT(currentCoreCtx->coreId));
// Break all cores too, but mark everything but the first has handled
debugManagerBreakCores(ctx->attachedCoreList);
u32 rem = ctx->attachedCoreList & ~BIT(currentCoreCtx->coreId);
FOREACH_BIT (tmp, coreId, rem) {
DebugEventInfo *info = debugManagerGetCoreDebugEvent(coreId);
info->handled = true;
info->preprocessed = true;
}
}
}