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

thermosphere: rewrite debug pause & fix single step state machine

Browse Source
This commit is contained in:
TuxSH
2020-01-16 01:18:34 +00:00
parent 2753b6cf8f
commit 1c707d9ded
13 changed files with 92 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
thermosphere/src/single_step.c
View File

@@ -28,7 +28,7 @@ SingleStepState singleStepGetNextState(ExceptionStackFrame *frame)
if (!mdscrSS) {
return SingleStepState_Inactive;
} else {
return pstateSS ? SingleStepState_ActivePending : SingleStepState_ActiveNotPending;
return pstateSS ? SingleStepState_ActiveNotPending : SingleStepState_ActivePending;
}
}
@@ -41,15 +41,16 @@ void singleStepSetNextState(ExceptionStackFrame *frame, SingleStepState state)
// Unset mdscr_el1.ss
mdscr &= ~MDSCR_SS;
break;
case SingleStepState_ActivePending:
case SingleStepState_ActiveNotPending:
// Set mdscr_el1.ss and pstate.ss
mdscr |= MDSCR_SS;
frame->spsr_el2 |= PSTATE_SS;
break;
case SingleStepState_ActiveNotPending:
case SingleStepState_ActivePending:
// We never use this because pstate.ss is 0 by default...
// Set mdscr_el1.ss and unset pstate.ss
mdscr |= MDSCR_SS;
frame->spsr_el2 |= PSTATE_SS;
frame->spsr_el2 &= ~PSTATE_SS;
break;
default:
break;
@@ -65,7 +66,4 @@ void handleSingleStep(ExceptionStackFrame *frame, ExceptionSyndromeRegister esr)
singleStepSetNextState(NULL, SingleStepState_Inactive);
DEBUG("Single-step exeception ELR = 0x%016llx, ISV = %u, EX = %u\n", frame->elr_el2, (esr.iss >> 24) & 1, (esr.iss >> 6) & 1);
// Hehe boi
//singleStepSetNextState(frame, SingleStepState_ActivePending);
}