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

Fixes suspend+stop threads not stopping

Browse source
This commit is contained in:
RipleyTom 2019-08-04 15:21:19 +02:00 • committed by Ivan
parent 6e89e4ebbf
commit 05813c7e90
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -228,6 +228,9 @@ bool cpu_thread::check_state() noexcept
} }
const auto [state0, escape] = state.fetch_op([&](bs_t<cpu_flag>& flags) const auto [state0, escape] = state.fetch_op([&](bs_t<cpu_flag>& flags)
{
// Atomically clean wait flag and escape
if (!(flags & (cpu_flag::exit + cpu_flag::jit_return + cpu_flag::dbg_global_stop + cpu_flag::ret + cpu_flag::stop)))
{ {
// Check pause flags which hold thread inside check_state // Check pause flags which hold thread inside check_state
if (flags & (cpu_flag::pause + cpu_flag::suspend + cpu_flag::dbg_global_pause + cpu_flag::dbg_pause)) if (flags & (cpu_flag::pause + cpu_flag::suspend + cpu_flag::dbg_global_pause + cpu_flag::dbg_pause))
@ -235,9 +238,6 @@ bool cpu_thread::check_state() noexcept
return false; return false;
} }
// Atomically clean wait flag and escape
if (!(flags & (cpu_flag::exit + cpu_flag::jit_return + cpu_flag::dbg_global_stop + cpu_flag::ret + cpu_flag::stop)))
{
flags -= cpu_flag::wait; flags -= cpu_flag::wait;
} }