From 11ba83738fd34d3b51de0867ee86fb5888a73a93 Mon Sep 17 00:00:00 2001 From: Peter Tissen Date: Fri, 14 Feb 2014 00:08:32 +0100 Subject: [PATCH] make stepping work again, it's impossible to use it without these changes --- rpcs3/Emu/CPU/CPUThread.cpp | 14 +++++++------- rpcs3/Gui/InterpreterDisAsm.cpp | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/rpcs3/Emu/CPU/CPUThread.cpp b/rpcs3/Emu/CPU/CPUThread.cpp index 8942295a46..1e881bcd91 100644 --- a/rpcs3/Emu/CPU/CPUThread.cpp +++ b/rpcs3/Emu/CPU/CPUThread.cpp @@ -96,21 +96,21 @@ bool CPUThread::Sync() int CPUThread::ThreadStatus() { - if(Emu.IsStopped() || IsStopped() || IsPaused()) + if(Emu.IsStopped() || IsStopped() ) { return CPUThread_Stopped; } - if(TestDestroy()) - { - return CPUThread_Break; - } - - if(m_is_step) + if (m_is_step) { return CPUThread_Step; } + if (TestDestroy()) + { + return CPUThread_Break; + } + if(Emu.IsPaused() || Sync()) { return CPUThread_Sleeping; diff --git a/rpcs3/Gui/InterpreterDisAsm.cpp b/rpcs3/Gui/InterpreterDisAsm.cpp index 1797a2c7e7..98388f10d5 100644 --- a/rpcs3/Gui/InterpreterDisAsm.cpp +++ b/rpcs3/Gui/InterpreterDisAsm.cpp @@ -451,12 +451,12 @@ void InterpreterDisAsmFrame::Show_Val(wxCommandEvent& WXUNUSED(event)) diag->SetSizerAndFit( s_panel ); - if(CPU) p_pc->SetLabel(wxString::Format("%llx", CPU->PC)); + if(CPU) p_pc->SetValue(wxString::Format("%llx", CPU->PC)); if(diag->ShowModal() == wxID_OK) { u64 pc = CPU ? CPU->PC : 0x0; - sscanf(p_pc->GetLabel(), "%llx", &pc); + sscanf(p_pc->GetValue(), "%llx", &pc); remove_markedPC.AddCpy(Emu.GetMarkedPoints().AddCpy(pc)); ShowAddr(CentrePc(pc)); }