Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-22 22:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

JitCodeBuffer: Use MAP_FIXED on MacOS/MAP_FIXED_NOREPLACE on Linux

Browse source
This commit is contained in:
Stenzek 2023-12-19 21:46:39 +10:00
parent 6a7dea6908
commit 05b42f34eb
No known key found for this signature in database
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/util/jit_code_buffer.cpp
View file

@ -111,9 +111,22 @@ bool JitCodeBuffer::TryAllocateAt(const void* addr)
return true; return true;
#elif defined(__linux__) || defined(__ANDROID__) || defined(__APPLE__) || defined(__HAIKU__) || defined(__FreeBSD__) #elif defined(__linux__) || defined(__ANDROID__) || defined(__APPLE__) || defined(__HAIKU__) || defined(__FreeBSD__)
int flags = MAP_PRIVATE | MAP_ANONYMOUS; int flags = MAP_PRIVATE | MAP_ANONYMOUS;
#if defined(__APPLE__) && defined(__aarch64__) #if defined(__linux__)
// Linux does the right thing, allows us to not disturb an existing mapping.
if (addr)
flags |= MAP_FIXED_NOREPLACE;
#elif defined(__FreeBSD__)
// FreeBSD achieves the same with MAP_FIXED and MAP_EXCL.
if (addr)
flags |= MAP_FIXED | MAP_EXCL;
#elif defined(__APPLE__) && defined(__aarch64__)
// MAP_JIT and toggleable write protection is required on Apple Silicon. // MAP_JIT and toggleable write protection is required on Apple Silicon.
flags |= MAP_JIT; flags |= MAP_JIT;
#elif defined(__APPLE__)
// MAP_FIXED is needed on x86 apparently.. hopefully there's nothing mapped at this address, otherwise we'll end up
// clobbering it..
if (addr)
flags |= MAP_FIXED;
#endif #endif
m_code_ptr = m_code_ptr =
@ -125,6 +138,13 @@ bool JitCodeBuffer::TryAllocateAt(const void* addr)
return false; return false;
} }
else if (addr && m_code_ptr != addr)
{
if (munmap(m_code_ptr, m_total_size) != 0)
Log_ErrorPrintf("Failed to munmap() incorrectly hinted allocation: %d", errno);
m_code_ptr = nullptr;
return false;
}
return true; return true;
#else #else