Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant Apple ARM64 ifdef blocks

Browse Source 
The Apple ARM64 code paths are now identical to the generic case,
so the ifdef blocks are unnecessary.
This commit is contained in:
Daniel Risto
2026-03-22 13:18:24 +01:00
committed by Elad
parent 4cac76caad
commit e1734b51c3
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/util/vm_native.cpp
-14
View File
@@ -346,15 +346,7 @@ namespace utils
ensure(::VirtualFree(pointer, size, MEM_DECOMMIT)); ensure(::VirtualFree(pointer, size, MEM_DECOMMIT));
#else #else
const u64 ptr64 = reinterpret_cast<u64>(pointer); const u64 ptr64 = reinterpret_cast<u64>(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<void*>(uptr{umax})); ensure(::mmap(pointer, size, PROT_NONE, MAP_FIXED | MAP_ANON | MAP_PRIVATE | c_map_noreserve, -1, 0) != reinterpret_cast<void*>(uptr{umax}));
#else
ensure(::mmap(pointer, size, PROT_NONE, MAP_FIXED | MAP_ANON | MAP_PRIVATE | c_map_noreserve, -1, 0) != reinterpret_cast<void*>(uptr{umax}));
#endif
if constexpr (c_madv_no_dump != 0) if constexpr (c_madv_no_dump != 0)
{ {
@@ -379,13 +371,7 @@ namespace utils
memory_commit(pointer, size, prot); memory_commit(pointer, size, prot);
#else #else
const u64 ptr64 = reinterpret_cast<u64>(pointer); const u64 ptr64 = reinterpret_cast<u64>(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<void*>(uptr{umax})); ensure(::mmap(pointer, size, +prot, MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0) != reinterpret_cast<void*>(uptr{umax}));
#else
ensure(::mmap(pointer, size, +prot, MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0) != reinterpret_cast<void*>(uptr{umax}));
#endif
if constexpr (c_madv_hugepage != 0) if constexpr (c_madv_hugepage != 0)
{ {