mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-29 00:33:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

RawSPU: fix race between spu start and stop

Browse Source 
This race could lead to spu status bits indicate RUNNING status, but cpu state being stopped.
Fix it by making sure cpu state is set before spu status.
This commit is contained in:
Eladash 2020-01-09 08:52:31 +02:00 committed by Ivan
parent 98a8eeaac2
commit 9993df9b8b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpcs3/Emu/Cell/SPUThread.cpp
View File

@ -2773,7 +2773,7 @@ bool spu_thread::stop_and_signal(u32 code)
if (offset >= RAW_SPU_BASE_ADDR)
{
state += cpu_flag::wait;
state += cpu_flag::stop + cpu_flag::wait;
status.atomic_op([code](u32& status)
{
status = (status & 0xffff) | (code << 16);
@ -2782,7 +2782,6 @@ bool spu_thread::stop_and_signal(u32 code)
});
int_ctrl[2].set(SPU_INT2_STAT_SPU_STOP_AND_SIGNAL_INT);
state += cpu_flag::stop;
check_state();
return true;
}
@ -3126,6 +3125,8 @@ void spu_thread::halt()
if (offset >= RAW_SPU_BASE_ADDR)
{
state += cpu_flag::stop + cpu_flag::wait;
status.atomic_op([](u32& status)
{
status |= SPU_STATUS_STOPPED_BY_HALT;
@ -3134,7 +3135,6 @@ void spu_thread::halt()
int_ctrl[2].set(SPU_INT2_STAT_SPU_HALT_OR_STEP_INT);
state += cpu_flag::stop;
spu_runtime::g_escape(this);
}