mirror of
https://github.com/Atmosphere-NX/Atmosphere
synced 2024-12-22 20:31:14 +00:00
thermosphere: fix reporting logic of initial break event
This commit is contained in:
parent
7acd5a9ec7
commit
cb4d898579
3 changed files with 10 additions and 7 deletions
|
@ -169,7 +169,8 @@ DebugEventInfo *debugManagerGetCoreDebugEvent(u32 coreId)
|
||||||
void debugManagerReportEvent(DebugEventType type, ...)
|
void debugManagerReportEvent(DebugEventType type, ...)
|
||||||
{
|
{
|
||||||
u64 flags = maskIrq();
|
u64 flags = maskIrq();
|
||||||
if (!atomic_load(&g_debugManager.reportingEnabled)) {
|
bool reportingEnabled = atomic_load(&g_debugManager.reportingEnabled);
|
||||||
|
if (!reportingEnabled && type != DBGEVENT_DEBUGGER_BREAK) {
|
||||||
restoreInterruptFlags(flags);
|
restoreInterruptFlags(flags);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -200,10 +201,12 @@ void debugManagerReportEvent(DebugEventType type, ...)
|
||||||
// Now, pause ourselves and try to signal we have a debug event
|
// Now, pause ourselves and try to signal we have a debug event
|
||||||
debugManagerDoPauseCores(BIT(coreId));
|
debugManagerDoPauseCores(BIT(coreId));
|
||||||
|
|
||||||
exceptionEnterInterruptibleHypervisorCode();
|
if (reportingEnabled) {
|
||||||
unmaskIrq();
|
exceptionEnterInterruptibleHypervisorCode();
|
||||||
|
unmaskIrq();
|
||||||
|
|
||||||
GDB_TrySignalDebugEvent(&g_gdbContext, info);
|
GDB_TrySignalDebugEvent(&g_gdbContext, info);
|
||||||
|
}
|
||||||
|
|
||||||
restoreInterruptFlags(flags);
|
restoreInterruptFlags(flags);
|
||||||
}
|
}
|
||||||
|
@ -214,7 +217,7 @@ void debugManagerBreakCores(u32 coreList)
|
||||||
if (coreList & ~BIT(coreId)) {
|
if (coreList & ~BIT(coreId)) {
|
||||||
generateSgiForList(ThermosphereSgi_ReportDebuggerBreak, coreList & ~BIT(coreId));
|
generateSgiForList(ThermosphereSgi_ReportDebuggerBreak, coreList & ~BIT(coreId));
|
||||||
}
|
}
|
||||||
if (coreList & BIT(coreId) && !debugManagerIsCorePaused(coreId)) {
|
if ((coreList & BIT(coreId)) && !debugManagerIsCorePaused(coreId)) {
|
||||||
debugManagerReportEvent(DBGEVENT_DEBUGGER_BREAK);
|
debugManagerReportEvent(DBGEVENT_DEBUGGER_BREAK);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -345,7 +345,7 @@ GDB_DECLARE_HANDLER(GetStopReason)
|
||||||
bool nonStop = (ctx->flags & GDB_FLAG_NONSTOP) != 0;
|
bool nonStop = (ctx->flags & GDB_FLAG_NONSTOP) != 0;
|
||||||
if (!nonStop) {
|
if (!nonStop) {
|
||||||
// Full-stop:
|
// Full-stop:
|
||||||
return GDB_SendStopReply(ctx, ctx->lastDebugEvent, true);
|
return GDB_SendStopReply(ctx, ctx->lastDebugEvent, false);
|
||||||
} else {
|
} else {
|
||||||
// Non-stop, start new vStopped sequence
|
// Non-stop, start new vStopped sequence
|
||||||
ctx->sentDebugEventCoreList = 0;
|
ctx->sentDebugEventCoreList = 0;
|
||||||
|
|
|
@ -137,6 +137,6 @@ void thermosphereMain(ExceptionStackFrame *frame, u64 pct)
|
||||||
if (!currentCoreCtx->isBootCore) {
|
if (!currentCoreCtx->isBootCore) {
|
||||||
debugManagerReportEvent(DBGEVENT_CORE_ON);
|
debugManagerReportEvent(DBGEVENT_CORE_ON);
|
||||||
} else {
|
} else {
|
||||||
debugManagerPauseCores(BIT(currentCoreCtx->coreId));
|
debugManagerReportEvent(DBGEVENT_DEBUGGER_BREAK);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue