RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-04 14:08:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

RawSPU: fix race condition in RunCntl stop request

Browse source
This commit is contained in:
Eladash 2020-02-19 22:25:53 +02:00 • committed by Ivan
parent ef6854ca46
commit c11074a128
3 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
rpcs3/Emu/Cell/RawSPUThread.cpp
View file

@ -8,6 +8,8 @@
inline void try_start(spu_thread& spu)
{
std::shared_lock lock(spu.run_ctrl_mtx);
if (spu.status_npc.fetch_op([](typename spu_thread::status_npc_sync_var& value)
{
if (value.status & SPU_STATUS_RUNNING)
@ -246,8 +248,24 @@ bool spu_thread::write_reg(const u32 addr, const u32 value)
}
else if (value == SPU_RUNCNTL_STOP_REQUEST)
{
// TODO: Wait for the SPU to stop?
state += cpu_flag::stop;
if (get_current_cpu_thread() == this)
{
// TODO
state += cpu_flag::stop;
return true;
}
std::scoped_lock lock(run_ctrl_mtx);
if (status_npc.load().status & SPU_STATUS_RUNNING)
{
state += cpu_flag::stop;
for (status_npc_sync_var old; (old = status_npc).status & SPU_STATUS_RUNNING;)
{
status_npc.wait(old);
}
}
}
else
{