From 71ca41306788fe44c19b24e4e7ac2c3b8430a4f4 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Sat, 14 Nov 2020 09:03:33 +0300 Subject: [PATCH] Don't add lonely cpu_flag::memory on TSX path (bug) --- rpcs3/Emu/Cell/PPUThread.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp index c847824eb3..986545512f 100644 --- a/rpcs3/Emu/Cell/PPUThread.cpp +++ b/rpcs3/Emu/Cell/PPUThread.cpp @@ -516,7 +516,7 @@ std::string ppu_thread::dump_regs() const for (uint i = 0; i < 32; ++i, ret += '\n') { fmt::append(ret, "v%d%s: ", i, i <= 9 ? " " : ""); - + const auto r = vr[i]; const u32 i3 = r.u32r[0]; @@ -800,7 +800,7 @@ void ppu_thread::cpu_sleep() raddr = 0; // Setup wait flag and memory flags to relock itself - state += cpu_flag::wait + cpu_flag::memory; + state += g_use_rtm ? cpu_flag::wait : cpu_flag::wait + cpu_flag::memory; if (auto ptr = vm::g_tls_locked) {