SPU DMA: Fix PUTLLUC (TSX)

Prevent edge case of missing store.
RPCS3 · Apr 29, 2020 · 19acf26 · 19acf26
1 parent f4f0fb8
commit 19acf26
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/rpcs3/Emu/CPU/CPUThread.cpp b/rpcs3/Emu/CPU/CPUThread.cpp
@@ -645,7 +645,10 @@ cpu_thread::suspend_all::suspend_all(cpu_thread* _this) noexcept
 
 	for_all_cpu([](cpu_thread* cpu)
 	{
-		cpu->state += cpu_flag::pause;
+		if (!(cpu->state & cpu_flag::pause))
+		{
+			cpu->state += cpu_flag::pause;
+		}
 	});
 
 	busy_wait(500);

diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp
@@ -1600,6 +1600,23 @@ void spu_thread::do_putlluc(const spu_mfc_cmd& args)
 				vm::reservation_acquire(addr, 128) += 64;
 			}
 		}
+		else if (result == 0)
+		{
+			cpu_thread::suspend_all cpu_lock(this);
+
+			while (vm::reservation_acquire(addr, 128).bts(6))
+			{
+				busy_wait(100);
+			}
+
+			while (vm::reservation_acquire(addr, 128) & 63)
+			{
+				busy_wait(100);
+			}
+
+			mov_rdata(vm::_ref<decltype(rdata)>(addr), to_write);
+			vm::reservation_acquire(addr, 128) += 64;
+		}
 	}
 	else
 	{