From 37f423aec3fd0d32ffe014a05774ce983a08951d Mon Sep 17 00:00:00 2001
From: DH <dh.rpcs3@gmail.com>
Date: Sun, 5 Oct 2025 20:07:19 +0300
Subject: [PATCH] add missed file changes

---
 ps3fw/cellGcmSys.cpp              | 4 ++--
 ps3fw/cellSpurs.cpp               | 2 +-
 ps3fw/cellSpursSpu.cpp            | 4 ++--
 rpcs3/Emu/RSX/Host/RSXDMAWriter.h | 2 +-
 rx/include/rx/SharedAtomic.hpp    | 2 +-
 rx/include/rx/asm.hpp             | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ps3fw/cellGcmSys.cpp b/ps3fw/cellGcmSys.cpp
index d91e03223..64a31e365 100644
--- a/ps3fw/cellGcmSys.cpp
+++ b/ps3fw/cellGcmSys.cpp
@@ -10,7 +10,7 @@
 #include "cellGcmSys.h"
 #include "sysPrxForUser.h"
 
-#include "util/asm.hpp"
+#include "rx/asm.hpp"
 
 LOG_CHANNEL(cellGcmSys);
 
@@ -1491,7 +1491,7 @@ s32 cellGcmCallback(ppu_thread& ppu, vm::ptr<CellGcmContextData> context, u32 co
 			return 0;
 		}
 
-		busy_wait();
+		rx::busy_wait();
 	}
 
 	return CELL_OK;
diff --git a/ps3fw/cellSpurs.cpp b/ps3fw/cellSpurs.cpp
index 691b9f56e..4899b1d2d 100644
--- a/ps3fw/cellSpurs.cpp
+++ b/ps3fw/cellSpurs.cpp
@@ -4145,7 +4145,7 @@ s32 _spurs::create_task(vm::ptr<CellSpursTaskset> taskset, vm::ptr<u32> task_id,
 		{
 			v128 ls_pattern_128 = v128::from64r(ls_pattern->_u64[0], ls_pattern->_u64[1]);
 
-			const u32 ls_blocks = utils::popcnt128(ls_pattern_128._u);
+			const u32 ls_blocks = rx::popcnt128(ls_pattern_128._u);
 
 			if (ls_blocks > alloc_ls_blocks)
 			{
diff --git a/ps3fw/cellSpursSpu.cpp b/ps3fw/cellSpursSpu.cpp
index 3b1dc37fb..6e3f649c9 100644
--- a/ps3fw/cellSpursSpu.cpp
+++ b/ps3fw/cellSpursSpu.cpp
@@ -1446,7 +1446,7 @@ s32 spursTasksetProcessRequest(spu_thread& spu, s32 request, u32* taskId, u32* i
 		{
 			v128 newlyReadyTasks = gv_andn(ready, signalled | pready);
 
-			numNewlyReadyTasks = utils::popcnt128(newlyReadyTasks._u);
+			numNewlyReadyTasks = rx::popcnt128(newlyReadyTasks._u);
 		}
 
 		v128 readyButNotRunning;
@@ -1701,7 +1701,7 @@ s32 spursTasketSaveTaskContext(spu_thread& spu)
 	u32 allocLsBlocks = static_cast<u32>(taskInfo->context_save_storage_and_alloc_ls_blocks & 0x7F);
 	v128 ls_pattern = v128::from64r(taskInfo->ls_pattern._u64[0], taskInfo->ls_pattern._u64[1]);
 
-	const u32 lsBlocks = utils::popcnt128(ls_pattern._u);
+	const u32 lsBlocks = rx::popcnt128(ls_pattern._u);
 
 	if (lsBlocks > allocLsBlocks)
 	{
diff --git a/rpcs3/Emu/RSX/Host/RSXDMAWriter.h b/rpcs3/Emu/RSX/Host/RSXDMAWriter.h
index 72655d274..8fdc5b9df 100644
--- a/rpcs3/Emu/RSX/Host/RSXDMAWriter.h
+++ b/rpcs3/Emu/RSX/Host/RSXDMAWriter.h
@@ -86,7 +86,7 @@ namespace rsx
 	{
 	public:
 		RSXDMAWriter(void* mem)
-			: m_host_context_ptr(new (mem) host_gpu_context_t)
+			: m_host_context_ptr(new(mem) host_gpu_context_t)
 		{
 		}
 
diff --git a/rx/include/rx/SharedAtomic.hpp b/rx/include/rx/SharedAtomic.hpp
index f45dae627..96e19bb04 100644
--- a/rx/include/rx/SharedAtomic.hpp
+++ b/rx/include/rx/SharedAtomic.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "asm.hpp"
 #include <atomic>
 #include <chrono>
 #include <cstdint>
@@ -7,7 +8,6 @@
 #include <limits>
 #include <system_error>
 #include <type_traits>
-#include "asm.hpp"
 
 namespace rx {
 static constexpr auto kRelaxSpinCount = 12;
diff --git a/rx/include/rx/asm.hpp b/rx/include/rx/asm.hpp
index 0bea59587..a5ef0173e 100644
--- a/rx/include/rx/asm.hpp
+++ b/rx/include/rx/asm.hpp
@@ -2,8 +2,8 @@
 
 #include "rx/tsc.hpp"
 #include "types.hpp"
-#include <thread>
 #include <atomic>
+#include <thread>
 
 extern bool g_use_rtm;
 extern u64 g_rtm_tx_limit1;