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

Fix cpu_flag::temp, make sure it removes cpu_flag::wait

Browse source
This commit is contained in:
Nekotekina 2020-10-26 20:14:16 +03:00
parent 86785dffa4
commit d6daa0d05b
4 changed files with 19 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

18
rpcs3/Emu/Memory/vm.cpp
View file

@ -261,13 +261,15 @@ namespace vm
void passive_lock(cpu_thread& cpu)
{
bool ok = true;
if (!g_tls_locked || *g_tls_locked != &cpu) [[unlikely]]
{
_register_lock(&cpu);
if (cpu.state) [[likely]]
if (cpu.state & cpu_flag::memory) [[likely]]
{
cpu.state -= cpu_flag::wait + cpu_flag::memory;
cpu.state -= cpu_flag::memory;
}
if (g_mutex.is_lockable())
@ -275,22 +277,20 @@ namespace vm
return;
}
cpu.state += cpu_flag::wait;
ok = false;
}
if (cpu.state & cpu_flag::wait)
if (!ok || cpu.state & cpu_flag::memory)
{
while (true)
{
g_mutex.lock_unlock();
cpu.state -= cpu_flag::wait + cpu_flag::memory;
cpu.state -= cpu_flag::memory;
if (g_mutex.is_lockable()) [[likely]]
{
return;
}
cpu.state += cpu_flag::wait;
}
}
}
@ -345,7 +345,7 @@ namespace vm
if (cpu)
{
if (!g_tls_locked || *g_tls_locked != cpu)
if (!g_tls_locked || *g_tls_locked != cpu || cpu->state & cpu_flag::wait)
{
cpu = nullptr;
}
@ -392,7 +392,7 @@ namespace vm
if (cpu)
{
if (!g_tls_locked || *g_tls_locked != cpu)
if (!g_tls_locked || *g_tls_locked != cpu || cpu->state & cpu_flag::wait)
{
cpu = nullptr;
}