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

Fix race condion in sys_spu_thread_group_join

Browse source
This commit is contained in:
eladash 2019-02-10 04:05:53 +02:00 • committed by Ivan
parent 84d42ecb65
commit fa647bc121
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/Cell/lv2/sys_spu.cpp
View file

@ -648,7 +648,7 @@ error_code sys_spu_thread_group_join(ppu_thread& ppu, u32 id, vm::ptr<u32> cause
return CELL_EBUSY; return CELL_EBUSY;
} }
if (group->join_state) if (group->join_state && group->run_state == SPU_THREAD_GROUP_STATUS_INITIALIZED)
{ {
// Already signaled // Already signaled
ppu.gpr[4] = group->join_state; ppu.gpr[4] = group->join_state;
@ -664,7 +664,7 @@ error_code sys_spu_thread_group_join(ppu_thread& ppu, u32 id, vm::ptr<u32> cause
lv2_obj::sleep(ppu); lv2_obj::sleep(ppu);
while (!group->join_state) while (!group->join_state || group->run_state != SPU_THREAD_GROUP_STATUS_INITIALIZED)
{ {
if (ppu.is_stopped()) if (ppu.is_stopped())
{ {