Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Harmonize the various step functions in the disasm window

Browse Source
This commit is contained in:
Henrik Rydgård 2024-11-02 22:44:08 +01:00
parent 69177f7fa6
commit 73aba606e7
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Core/Core.cpp
View File

@ -426,6 +426,7 @@ void Core_Resume() {
coreState = CORE_RUNNING;
coreStatePending = false;
m_StepCond.notify_all();
System_Notify(SystemNotification::DEBUG_MODE_CHANGE);
}
bool Core_NextFrame() {

28
Windows/Debugger/Debugger_Disasm.cpp
View File

@ -205,17 +205,16 @@ void CDisasm::stepInto()
}
CtrlDisAsmView *ptr = DisAsmView();
ptr->setDontRedraw(true);
lastTicks_ = CoreTiming::GetTicks();
u32 stepSize = ptr->getInstructionSizeAt(cpu->GetPC());
u32 newAddress = Core_PerformStep(cpu, CPUStepType::Into, stepSize);
ptr->scrollStepping(newAddress);
Sleep(1);
ptr->gotoPC();
ptr->scrollStepping(newAddress);
ptr->gotoAddr(newAddress);
UpdateDialog();
threadList->reloadThreads();
stackTraceView->loadStackTrace();
}
void CDisasm::stepOver()
@ -225,24 +224,19 @@ void CDisasm::stepOver()
}
CtrlDisAsmView *ptr = DisAsmView();
ptr->setDontRedraw(true);
lastTicks_ = CoreTiming::GetTicks();
// Not really sure why this is needed here.
ptr->setDontRedraw(true);
// If the current PC is on a breakpoint, the user doesn't want to do nothing.
u32 currentPc = cpu->GetPC();
u32 stepSize = ptr->getInstructionSizeAt(currentPc);
u32 breakpointAddress = Core_PerformStep(cpu, CPUStepType::Over, stepSize);
u32 stepSize = ptr->getInstructionSizeAt(cpu->GetPC());
u32 newAddress = Core_PerformStep(cpu, CPUStepType::Over, stepSize);
Sleep(1);
ptr->scrollStepping(breakpointAddress);
ptr->gotoAddr(breakpointAddress);
ptr->scrollStepping(newAddress);
ptr->gotoAddr(newAddress);
UpdateDialog();
}
void CDisasm::stepOut() {
auto memLock = Memory::Lock();
if (!PSP_IsInited())
return;
@ -250,10 +244,12 @@ void CDisasm::stepOut() {
ptr->setDontRedraw(true);
lastTicks_ = CoreTiming::GetTicks();
u32 breakpointAddress = Core_PerformStep(cpu, CPUStepType::Out, 0);
u32 stepSize = ptr->getInstructionSizeAt(cpu->GetPC());
u32 newAddress = Core_PerformStep(cpu, CPUStepType::Out, stepSize);
Sleep(1);
ptr->gotoAddr(breakpointAddress);
ptr->scrollStepping(newAddress);
ptr->gotoAddr(newAddress);
UpdateDialog();
}