Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Same with Step Out

Browse source
This commit is contained in:
Henrik Rydgård 2024-11-02 22:30:28 +01:00
parent 251fc8d905
commit 69177f7fa6
2 changed files with 31 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Core/Core.cpp
View file

@ -282,6 +282,34 @@ u32 Core_PerformStep(DebugInterface *cpu, CPUStepType stepType, int stepSize) {
Core_Resume();
return breakpointAddress;
}
case CPUStepType::Out:
{
u32 entry = cpu->GetPC();
u32 stackTop = 0;
auto threads = GetThreadsInfo();
for (size_t i = 0; i < threads.size(); i++) {
if (threads[i].isCurrent) {
entry = threads[i].entrypoint;
stackTop = threads[i].initialStack;
break;
}
}
auto frames = MIPSStackWalk::Walk(cpu->GetPC(), cpu->GetRegValue(0, 31), cpu->GetRegValue(0, 29), entry, stackTop);
if (frames.size() < 2) {
// Failure. PC not moving.
return cpu->GetPC();
}
u32 breakpointAddress = frames[1].pc;
// If the current PC is on a breakpoint, the user doesn't want to do nothing.
CBreakPoints::SetSkipFirst(currentMIPS->pc);
CBreakPoints::AddBreakPoint(breakpointAddress, true);
Core_Resume();
return breakpointAddress;
}
default:
// Not yet implemented
return cpu->GetPC();

30
Windows/Debugger/Debugger_Disasm.cpp
View file

@ -246,36 +246,12 @@ void CDisasm::stepOut() {
if (!PSP_IsInited())
return;
u32 entry = cpu->GetPC();
u32 stackTop = 0;
auto threads = GetThreadsInfo();
for (size_t i = 0; i < threads.size(); i++) {
if (threads[i].isCurrent) {
entry = threads[i].entrypoint;
stackTop = threads[i].initialStack;
break;
}
}
auto frames = MIPSStackWalk::Walk(cpu->GetPC(), cpu->GetRegValue(0,31), cpu->GetRegValue(0,29), entry, stackTop);
if (frames.size() < 2) {
// Failure
return;
}
u32 breakpointAddress = frames[1].pc;
lastTicks_ = CoreTiming::GetTicks();
// If the current PC is on a breakpoint, the user doesn't want to do nothing.
CBreakPoints::SetSkipFirst(currentMIPS->pc);
CtrlDisAsmView *ptr = DisAsmView();
ptr->setDontRedraw(true);
lastTicks_ = CoreTiming::GetTicks();
u32 breakpointAddress = Core_PerformStep(cpu, CPUStepType::Out, 0);
CBreakPoints::AddBreakPoint(breakpointAddress,true);
Core_Resume();
Sleep(1);
ptr->gotoAddr(breakpointAddress);
UpdateDialog();