mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2024-12-19 17:02:14 +00:00
Code Issues Releases Activity

thermosphere: add structural changes needed for range step

Browse source
This commit is contained in:
TuxSH 2020-01-28 01:13:21 +00:00
parent ff1aac0ab5
commit 71401b0731
4 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
thermosphere/src/core_ctx.h
View file

@ -35,6 +35,8 @@ typedef struct ALIGN(64) CoreCtx {
// Debug features // Debug features
bool wasPaused; // @0x1F bool wasPaused; // @0x1F
uintptr_t steppingRangeStartAddr; // @0x20
uintptr_t steppingRangeEndAddr; // @0x28
// Most likely written to: // Most likely written to:

14
thermosphere/src/debug_manager.c
View file

@ -29,6 +29,8 @@ GDBContext g_gdbContext = { 0 };
typedef struct DebugManager { typedef struct DebugManager {
DebugEventInfo debugEventInfos[MAX_CORE]; DebugEventInfo debugEventInfos[MAX_CORE];
uintptr_t steppingRangeStartAddrs[MAX_CORE];
uintptr_t steppingRangeEndAddrs[MAX_CORE];
ALIGN(64) atomic_uint pausedCoreList; ALIGN(64) atomic_uint pausedCoreList;
atomic_uint singleStepCoreList; atomic_uint singleStepCoreList;
@ -94,8 +96,12 @@ bool debugManagerHandlePause(void)
// Single-step: if inactive and requested, start single step; cancel if active and not requested // Single-step: if inactive and requested, start single step; cancel if active and not requested
u32 ssReqd = (atomic_load(&g_debugManager.singleStepCoreList) & BIT(currentCoreCtx->coreId)) != 0; u32 ssReqd = (atomic_load(&g_debugManager.singleStepCoreList) & BIT(currentCoreCtx->coreId)) != 0;
SingleStepState singleStepState = singleStepGetNextState(currentCoreCtx->guestFrame); SingleStepState singleStepState = singleStepGetNextState(currentCoreCtx->guestFrame);
if (ssReqd && singleStepState == SingleStepState_Inactive) { if (ssReqd) {
currentCoreCtx->steppingRangeStartAddr = g_debugManager.steppingRangeStartAddrs[coreId];
currentCoreCtx->steppingRangeEndAddr = g_debugManager.steppingRangeEndAddrs[coreId];
if(singleStepState == SingleStepState_Inactive) {
singleStepSetNextState(currentCoreCtx->guestFrame, SingleStepState_ActiveNotPending); singleStepSetNextState(currentCoreCtx->guestFrame, SingleStepState_ActiveNotPending);
}
} else if (!ssReqd && singleStepState != SingleStepState_Inactive) { } else if (!ssReqd && singleStepState != SingleStepState_Inactive) {
singleStepSetNextState(currentCoreCtx->guestFrame, SingleStepState_Inactive); singleStepSetNextState(currentCoreCtx->guestFrame, SingleStepState_Inactive);
} }
@ -128,6 +134,12 @@ void debugManagerUnpauseCores(u32 coreList, u32 singleStepList)
__sev(); __sev();
} }
void debugManagerSetSteppingRange(u32 coreId, uintptr_t startAddr, uintptr_t endAddr)
{
g_debugManager.steppingRangeStartAddrs[coreId] = startAddr;
g_debugManager.steppingRangeEndAddrs[coreId] = endAddr;
}
u32 debugManagerGetPausedCoreList(void) u32 debugManagerGetPausedCoreList(void)
{ {
return atomic_load(&g_debugManager.pausedCoreList); return atomic_load(&g_debugManager.pausedCoreList);

2
thermosphere/src/debug_manager.h
View file

@ -57,6 +57,8 @@ bool debugManagerHandlePause(void);
void debugManagerPauseCores(u32 coreList); void debugManagerPauseCores(u32 coreList);
void debugManagerUnpauseCores(u32 coreList, u32 singleStepList); void debugManagerUnpauseCores(u32 coreList, u32 singleStepList);
void debugManagerSetSteppingRange(u32 coreId, uintptr_t startAddr, uintptr_t endAddr);
u32 debugManagerGetPausedCoreList(void); u32 debugManagerGetPausedCoreList(void);
const DebugEventInfo *debugManagerMarkAndGetCoreDebugEvent(u32 coreId); const DebugEventInfo *debugManagerMarkAndGetCoreDebugEvent(u32 coreId);

13
thermosphere/src/single_step.c
View file

@ -62,8 +62,17 @@ void singleStepSetNextState(ExceptionStackFrame *frame, SingleStepState state)
void handleSingleStep(ExceptionStackFrame *frame, ExceptionSyndromeRegister esr) void handleSingleStep(ExceptionStackFrame *frame, ExceptionSyndromeRegister esr)
{ {
// Disable single-step ASAP uintptr_t addr = frame->elr_el2;
singleStepSetNextState(NULL, SingleStepState_Inactive);
// Stepping range support;
if (addr >= currentCoreCtx->steppingRangeStartAddr && addr < currentCoreCtx->steppingRangeEndAddr) {
// Reactivate single-step
singleStepSetNextState(frame, SingleStepState_ActiveNotPending);
} else {
// Disable single-step
singleStepSetNextState(frame, SingleStepState_Inactive);
// TODO report exception to gdb
}
DEBUG("Single-step exeception ELR = 0x%016llx, ISV = %u, EX = %u\n", frame->elr_el2, (esr.iss >> 24) & 1, (esr.iss >> 6) & 1); DEBUG("Single-step exeception ELR = 0x%016llx, ISV = %u, EX = %u\n", frame->elr_el2, (esr.iss >> 24) & 1, (esr.iss >> 6) & 1);
} }