archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-15 19:28:43 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #72 from Bigpet/master

Browse source 
Fix "Go to Adress" and Stepping
This commit is contained in:
Alexandro Sánchez Bach 2014-02-14 00:17:25 +01:00
commit 209155d71d
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rpcs3/Emu/CPU/CPUThread.cpp
View file

@ -96,21 +96,21 @@ bool CPUThread::Sync()
int CPUThread::ThreadStatus() int CPUThread::ThreadStatus()
{ {
if(Emu.IsStopped() || IsStopped() || IsPaused()) if(Emu.IsStopped() || IsStopped() )
{ {
return CPUThread_Stopped; return CPUThread_Stopped;
} }
if(TestDestroy()) if (m_is_step)
{
return CPUThread_Break;
}
if(m_is_step)
{ {
return CPUThread_Step; return CPUThread_Step;
} }
if (TestDestroy())
{
return CPUThread_Break;
}
if(Emu.IsPaused() || Sync()) if(Emu.IsPaused() || Sync())
{ {
return CPUThread_Sleeping; return CPUThread_Sleeping;

4
rpcs3/Gui/InterpreterDisAsm.cpp
View file

@ -450,12 +450,12 @@ void InterpreterDisAsmFrame::Show_Val(wxCommandEvent& WXUNUSED(event))
diag->SetSizerAndFit( s_panel ); 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) if(diag->ShowModal() == wxID_OK)
{ {
u64 pc = CPU ? CPU->PC : 0x0; 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)); remove_markedPC.AddCpy(Emu.GetMarkedPoints().AddCpy(pc));
ShowAddr(CentrePc(pc)); ShowAddr(CentrePc(pc));
} }