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

SPU: some instructions updated

Browse source
This commit is contained in:
Nekotekina 2015-03-21 02:36:05 +03:00
parent c8bb83b824
commit ef563f038d
7 changed files with 296 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

13
rpcs3/Emu/Cell/PPUThread.cpp
View file

@ -667,14 +667,14 @@ void PPUThread::FastCall2(u32 addr, u32 rtoc)
auto old_rtoc = GPR[2];
auto old_LR = LR;
auto old_thread = GetCurrentNamedThread();
auto old_task = custom_task;
auto old_task = decltype(custom_task)();
m_status = Running;
PC = addr;
GPR[2] = rtoc;
LR = Emu.GetCPUThreadStop();
SetCurrentNamedThread(this);
custom_task = nullptr;
custom_task.swap(old_task);
Task();
@ -684,7 +684,7 @@ void PPUThread::FastCall2(u32 addr, u32 rtoc)
GPR[2] = old_rtoc;
LR = old_LR;
SetCurrentNamedThread(old_thread);
custom_task = old_task;
custom_task.swap(old_task);
}
void PPUThread::FastStop()
@ -715,7 +715,12 @@ void PPUThread::Task()
if (m_events)
{
// process events
if (m_events & CPU_EVENT_STOP && (Emu.IsStopped() || IsStopped() || IsPaused()))
if (Emu.IsStopped())
{
return;
}
if (m_events & CPU_EVENT_STOP && (IsStopped() || IsPaused()))
{
m_events &= ~CPU_EVENT_STOP;
return;