From c2f5de1c554b075552a51c3218b1b578e998c8a6 Mon Sep 17 00:00:00 2001
From: kd-11 <karokidii@gmail.com>
Date: Mon, 19 Aug 2024 22:44:32 +0300
Subject: [PATCH] Fix compiler warnings about unused args for aarch64

---
 Utilities/Thread.cpp                   | 4 ++++
 rpcs3/Emu/Cell/PPUInterpreter.cpp      | 8 ++++----
 rpcs3/Emu/Cell/PPUThread.cpp           | 2 ++
 rpcs3/Emu/Cell/SPUCommonRecompiler.cpp | 3 +++
 rpcs3/Emu/Cell/SPUInterpreter.cpp      | 2 ++
 rpcs3/Emu/Cell/SPUThread.cpp           | 6 ++++++
 rpcs3/util/types.hpp                   | 2 ++
 7 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/Utilities/Thread.cpp b/Utilities/Thread.cpp
index 325e4ea00d..54b9bacef9 100644
--- a/Utilities/Thread.cpp
+++ b/Utilities/Thread.cpp
@@ -2310,6 +2310,10 @@ thread_base::native_entry thread_base::make_trampoline(u64(*entry)(thread_base*
 		c.bind(_ret);
 		c.add(x86::rsp, 0x28);
 		c.ret();
+#else
+	UNUSED(c);
+	UNUSED(args);
+	UNUSED(entry);
 #endif
 	});
 }
diff --git a/rpcs3/Emu/Cell/PPUInterpreter.cpp b/rpcs3/Emu/Cell/PPUInterpreter.cpp
index 7e8d2034b8..9b7ad2ecba 100644
--- a/rpcs3/Emu/Cell/PPUInterpreter.cpp
+++ b/rpcs3/Emu/Cell/PPUInterpreter.cpp
@@ -129,7 +129,9 @@ struct ppu_exec_select
 		}; \
 	}
 
+#ifdef ARCH_X64
 static constexpr ppu_opcode_t s_op{};
+#endif
 
 namespace asmjit
 {
@@ -293,7 +295,7 @@ struct ppu_abstract_t
 			}
 
 			template <typename T>
-			void operator=(T&& _val) const
+			void operator=([[maybe_unused]] T&& _val) const
 			{
 				FOR_X64(store_op, kIdMovaps, kIdVmovaps, static_cast<asmjit::ppu_builder*>(g_vc)->ppu_vr(bf_t<u32, I, N>{}, true), std::forward<T>(_val));
 			}
@@ -316,11 +318,9 @@ struct ppu_abstract_t
 		}
 
 		template <typename T>
-		void operator=(T&& _val) const
+		void operator=([[maybe_unused]] T&& _val) const
 		{
-		#if defined(ARCH_X64)
 			FOR_X64(store_op, kIdMovaps, kIdVmovaps, *this, std::forward<T>(_val));
-		#endif
 		}
 	} sat{};
 };
diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp
index 2a97028f2f..6e0f8865fd 100644
--- a/rpcs3/Emu/Cell/PPUThread.cpp
+++ b/rpcs3/Emu/Cell/PPUThread.cpp
@@ -3292,6 +3292,8 @@ const auto ppu_stcx_accurate_tx = build_function_asm<u64(*)(u32 raddr, u64 rtime
 	maybe_flush_lbr(c);
 	c.ret();
 #else
+	UNUSED(args);
+
 	// Unimplemented should fail.
 	c.brk(Imm(0x42));
 	c.ret(a64::x30);
diff --git a/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp b/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp
index 8b8c4ec0b2..d6ee8b9f3b 100644
--- a/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp
+++ b/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp
@@ -216,6 +216,9 @@ DECLARE(spu_runtime::tr_all) = []
 		{
 			using namespace asmjit;
 
+			// Args implicitly defined via registers
+			UNUSED(args);
+
 			// Inputs:
 			// x19 = m_thread a.k.a arg[0]
 			// x20 = ls_base
diff --git a/rpcs3/Emu/Cell/SPUInterpreter.cpp b/rpcs3/Emu/Cell/SPUInterpreter.cpp
index 871c65b152..3d69d5f9e1 100644
--- a/rpcs3/Emu/Cell/SPUInterpreter.cpp
+++ b/rpcs3/Emu/Cell/SPUInterpreter.cpp
@@ -69,7 +69,9 @@ struct spu_exec_select
 	}
 };
 
+#ifdef ARCH_X64
 static constexpr spu_opcode_t s_op{};
+#endif
 
 namespace asmjit
 {
diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp
index 5a2015f083..1583c59e18 100644
--- a/rpcs3/Emu/Cell/SPUThread.cpp
+++ b/rpcs3/Emu/Cell/SPUThread.cpp
@@ -848,6 +848,8 @@ const auto spu_putllc_tx = build_function_asm<u64(*)(u32 raddr, u64 rtime, void*
 	maybe_flush_lbr(c);
 	c.ret();
 #else
+	UNUSED(args);
+
 	c.brk(Imm(0x42));
 	c.ret(a64::x30);
 #endif
@@ -972,6 +974,8 @@ const auto spu_putlluc_tx = build_function_asm<u64(*)(u32 raddr, const void* rda
 	maybe_flush_lbr(c);
 	c.ret();
 #else
+	UNUSED(args);
+
 	c.brk(Imm(0x42));
 	c.ret(a64::x30);
 #endif
@@ -1105,6 +1109,8 @@ const auto spu_getllar_tx = build_function_asm<u64(*)(u32 raddr, void* rdata, cp
 	maybe_flush_lbr(c);
 	c.ret();
 #else
+	UNUSED(args);
+
 	c.brk(Imm(0x42));
 	c.ret(a64::x30);
 #endif
diff --git a/rpcs3/util/types.hpp b/rpcs3/util/types.hpp
index a102a12bea..da45b147c3 100644
--- a/rpcs3/util/types.hpp
+++ b/rpcs3/util/types.hpp
@@ -1377,3 +1377,5 @@ extern bool serialize(utils::serial& ar, T& obj);
 
 #define ENABLE_BITWISE_SERIALIZATION using enable_bitcopy = std::true_type;
 #define SAVESTATE_INIT_POS(...) static constexpr double savestate_init_pos = (__VA_ARGS__)
+
+#define UNUSED(expr) do { (void)(expr); } while (0)