From 583ed6171280ee6af777458a9f56d470b5498652 Mon Sep 17 00:00:00 2001
From: Nekotekina <nekotekina@gmail.com>
Date: Thu, 15 Oct 2020 23:27:26 +0300
Subject: [PATCH] SPU: return some give-up behaviour for PUTLLC (TSX)

Despite using concept of "shared" lock, allow only first to proceed.
This is similar how conditional stores for PPU are implemented.
---
 rpcs3/Emu/Cell/PPUThread.cpp | 6 +++---
 rpcs3/Emu/Cell/SPUThread.cpp | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp
index 79ee6ad250..b8adf620b9 100644
--- a/rpcs3/Emu/Cell/PPUThread.cpp
+++ b/rpcs3/Emu/Cell/PPUThread.cpp
@@ -1318,9 +1318,8 @@ const auto ppu_stcx_accurate_tx = build_function_asm<u32(*)(u32 raddr, u64 rtime
 	Label tx0 = build_transaction_enter(c, fall, x86::r12, 4);
 	c.xbegin(tx0);
 	c.mov(x86::rax, x86::qword_ptr(x86::rbx));
-	c.test(x86::eax, vm::rsrv_unique_lock);
+	c.test(x86::eax, 127);
 	c.jnz(skip);
-	c.and_(x86::rax, -128);
 	c.cmp(x86::rax, x86::r13);
 	c.jne(fail);
 
@@ -1395,7 +1394,8 @@ const auto ppu_stcx_accurate_tx = build_function_asm<u32(*)(u32 raddr, u64 rtime
 	c.lock().xadd(x86::qword_ptr(x86::rbx), x86::rax);
 	c.test(x86::eax, vm::rsrv_unique_lock);
 	c.jnz(fail3);
-	c.and_(x86::rax, -128);
+
+	// Allow only first shared lock to proceed
 	c.cmp(x86::rax, x86::r13);
 	c.jne(fail2);
 
diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp
index 43fa01c5a8..1850530749 100644
--- a/rpcs3/Emu/Cell/SPUThread.cpp
+++ b/rpcs3/Emu/Cell/SPUThread.cpp
@@ -396,9 +396,8 @@ const auto spu_putllc_tx = build_function_asm<u32(*)(u32 raddr, u64 rtime, const
 	Label tx0 = build_transaction_enter(c, fall, x86::r12, 4);
 	c.xbegin(tx0);
 	c.mov(x86::rax, x86::qword_ptr(x86::rbx));
-	c.test(x86::eax, vm::rsrv_unique_lock);
+	c.test(x86::eax, 127);
 	c.jnz(skip);
-	c.and_(x86::rax, -128);
 	c.cmp(x86::rax, x86::r13);
 	c.jne(fail);
 
@@ -488,7 +487,8 @@ const auto spu_putllc_tx = build_function_asm<u32(*)(u32 raddr, u64 rtime, const
 	c.lock().xadd(x86::qword_ptr(x86::rbx), x86::rax);
 	c.test(x86::eax, vm::rsrv_unique_lock);
 	c.jnz(fail3);
-	c.and_(x86::rax, -128);
+
+	// Allow only first shared lock to proceed
 	c.cmp(x86::rax, x86::r13);
 	c.jne(fail2);