OmniNX/Atmosphere
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

thermosphere: gdb/debug: avoid pause/unpause race condition in vCont + bugfix

Browse Source
This commit is contained in:
TuxSH
2020-01-30 01:22:37 +00:00
parent 5dd8e3c129
commit 8dc536cc5b
6 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
thermosphere/src/debug_manager.c
View File

@@ -50,7 +50,7 @@ static void debugManagerDoPauseCores(u32 coreList)
do {
desiredList |= readList;
remainingList &= ~readList;
} while (atomic_compare_exchange_weak(&g_debugManager.pausedCoreList, &readList, desiredList));
} while (!atomic_compare_exchange_weak(&g_debugManager.pausedCoreList, &readList, desiredList));
if (remainingList != BIT(currentCoreCtx->coreId)) {
// We need to notify other cores...
@@ -116,10 +116,13 @@ void debugManagerPauseCores(u32 coreList)
restoreInterruptFlags(flags);
}
void debugManagerUnpauseCores(u32 coreList, u32 singleStepList)
void debugManagerSetSingleStepCoreList(u32 coreList)
{
singleStepList &= coreList;
atomic_store(&g_debugManager.singleStepCoreList, coreList);
}
void debugManagerUnpauseCores(u32 coreList)
{
FOREACH_BIT (tmp, coreId, coreList) {
if (&g_debugManager.debugEventInfos[coreId].handled) {
// Discard already handled debug events
@@ -127,8 +130,6 @@ void debugManagerUnpauseCores(u32 coreList, u32 singleStepList)
}
}
// Since we're using a debugger lock, a simple stlr should be fine...
atomic_store(&g_debugManager.singleStepCoreList, singleStepList);
atomic_fetch_and(&g_debugManager.pausedCoreList, ~coreList);
__sev();
@@ -198,7 +199,18 @@ void debugManagerBreakCores(u32 coreList)
if (coreList & ~BIT(coreId)) {
generateSgiForList(ThermosphereSgi_ReportDebuggerBreak, coreList & ~BIT(coreId));
}
if (coreList & BIT(coreId)) {
if (coreList & BIT(coreId) && !debugManagerIsCorePaused(coreId)) {
debugManagerReportEvent(DBGEVENT_DEBUGGER_BREAK);
}
}
void debugManagerContinueCores(u32 coreList)
{
u32 coreId = currentCoreCtx->coreId;
if (coreList & ~BIT(coreId)) {
generateSgiForList(ThermosphereSgi_DebuggerContinue, coreList & ~BIT(coreId));
}
if (coreList & BIT(coreId) && debugManagerIsCorePaused(coreId)) {
debugManagerUnpauseCores(BIT(coreId));
}
}