mika/Atmosphere-libs
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere-libs.git synced 2025-06-27 13:32:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

kern: improve single-step around user-exception entry

Browse Source
This commit is contained in:
Michael Scire 2021-07-27 15:09:36 -07:00
parent 2b91674b42
commit 0a262ed268
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libmesosphere/source/arch/arm64/kern_exception_handlers.cpp
View File

@ -109,13 +109,9 @@ namespace ams::kern::arch::arm64 {
break; break;
} }
/* If we should, clear the thread's state as single-step. */ /* In the event that we return from this exception, we want SPSR.SS set so that we advance an instruction if single-stepping. */
#if defined(MESOSPHERE_ENABLE_HARDWARE_SINGLE_STEP) #if defined(MESOSPHERE_ENABLE_HARDWARE_SINGLE_STEP)
if (AMS_UNLIKELY(GetCurrentThread().IsSingleStep())) { context->psr |= (1ul << 21);
GetCurrentThread().ClearSingleStep();
cpu::MonitorDebugSystemControlRegisterAccessor().SetSoftwareStep(false).Store();
cpu::EnsureInstructionConsistency();
}
#endif #endif
/* If we should process the user exception (and it's not a breakpoint), try to enter. */ /* If we should process the user exception (and it's not a breakpoint), try to enter. */
@ -224,6 +220,15 @@ namespace ams::kern::arch::arm64 {
} }
} }
/* If we should, clear the thread's state as single-step. */
#if defined(MESOSPHERE_ENABLE_HARDWARE_SINGLE_STEP)
if (AMS_UNLIKELY(GetCurrentThread().IsSingleStep())) {
GetCurrentThread().ClearSingleStep();
cpu::MonitorDebugSystemControlRegisterAccessor().SetSoftwareStep(false).Store();
cpu::EnsureInstructionConsistency();
}
#endif
{ {
/* Collect additional information based on the ec. */ /* Collect additional information based on the ec. */
ams::svc::DebugException exception; ams::svc::DebugException exception;