From 5cb8759e5ddf7cb9cd506d4bc6f75df8ce610f52 Mon Sep 17 00:00:00 2001 From: Daniel Risto Date: Sun, 22 Mar 2026 13:18:24 +0100 Subject: [PATCH] Remove redundant Apple ARM64 ifdef blocks The Apple ARM64 code paths are now identical to the generic case, so the ifdef blocks are unnecessary. --- rpcs3/util/vm_native.cpp | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/rpcs3/util/vm_native.cpp b/rpcs3/util/vm_native.cpp index d30e6c6318..f1083b927c 100644 --- a/rpcs3/util/vm_native.cpp +++ b/rpcs3/util/vm_native.cpp @@ -342,15 +342,7 @@ namespace utils ensure(::VirtualFree(pointer, size, MEM_DECOMMIT)); #else const u64 ptr64 = reinterpret_cast(pointer); -#if defined(__APPLE__) && defined(ARCH_ARM64) - // Use MAP_FIXED without MAP_JIT to atomically replace the mapping. - // Apple rejects MAP_FIXED | MAP_JIT, but MAP_FIXED alone works and - // avoids the race condition of the previous munmap+mmap approach - // where another thread could claim the address range between the two calls. ensure(::mmap(pointer, size, PROT_NONE, MAP_FIXED | MAP_ANON | MAP_PRIVATE | c_map_noreserve, -1, 0) != reinterpret_cast(uptr{umax})); -#else - ensure(::mmap(pointer, size, PROT_NONE, MAP_FIXED | MAP_ANON | MAP_PRIVATE | c_map_noreserve, -1, 0) != reinterpret_cast(uptr{umax})); -#endif if constexpr (c_madv_no_dump != 0) { @@ -375,13 +367,7 @@ namespace utils memory_commit(pointer, size, prot); #else const u64 ptr64 = reinterpret_cast(pointer); -#if defined(__APPLE__) && defined(ARCH_ARM64) - // Use MAP_FIXED without MAP_JIT to atomically replace the mapping. - // See memory_decommit for details on why the munmap+mmap approach is unsafe. ensure(::mmap(pointer, size, +prot, MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0) != reinterpret_cast(uptr{umax})); -#else - ensure(::mmap(pointer, size, +prot, MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0) != reinterpret_cast(uptr{umax})); -#endif if constexpr (c_madv_hugepage != 0) {