thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Split out the Windows version of AllocateExecutableMemory

Browse source
This commit is contained in:
Henrik Rydgård 2023-04-24 11:36:44 +02:00
parent a040985af0
commit 7a75119ed0
1 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Common/MemoryUtil.cpp
View file

@ -118,10 +118,11 @@ static void *SearchForFreeMem(size_t size) {
} }
#endif #endif
#if PPSSPP_PLATFORM(WINDOWS)
// This is purposely not a full wrapper for virtualalloc/mmap, but it // This is purposely not a full wrapper for virtualalloc/mmap, but it
// provides exactly the primitive operations that PPSSPP needs. // provides exactly the primitive operations that PPSSPP needs.
void *AllocateExecutableMemory(size_t size) { void *AllocateExecutableMemory(size_t size) {
#if defined(_WIN32)
void *ptr = nullptr; void *ptr = nullptr;
DWORD prot = PAGE_EXECUTE_READWRITE; DWORD prot = PAGE_EXECUTE_READWRITE;
if (PlatformIsWXExclusive()) if (PlatformIsWXExclusive())
@ -157,11 +158,21 @@ void *AllocateExecutableMemory(size_t size) {
ptr = VirtualAlloc(0, size, MEM_RESERVE | MEM_COMMIT, prot); ptr = VirtualAlloc(0, size, MEM_RESERVE | MEM_COMMIT, prot);
#endif #endif
} }
#else if (!ptr) {
static char *map_hint = 0; ERROR_LOG(MEMMAP, "Failed to allocate executable memory (%d)", (int)size);
}
return ptr;
}
#else // Non-Windows platforms
void *AllocateExecutableMemory(size_t size) {
static char *map_hint = nullptr;
#if PPSSPP_ARCH(AMD64) #if PPSSPP_ARCH(AMD64)
// Try to request one that is close to our memory location if we're in high memory. // Try to request one that is close to our memory location if we're in high memory.
// We use a dummy global variable to give us a good location to start from. // We use a dummy global variable to give us a good location to start from.
// TODO: Should we also do this for ARM64?
if (!map_hint) { if (!map_hint) {
if ((uintptr_t) &hint_location > 0xFFFFFFFFULL) if ((uintptr_t) &hint_location > 0xFFFFFFFFULL)
map_hint = (char*)ppsspp_round_page(&hint_location) - 0x20000000; // 0.5gb lower than our approximate location map_hint = (char*)ppsspp_round_page(&hint_location) - 0x20000000; // 0.5gb lower than our approximate location
@ -177,20 +188,13 @@ void *AllocateExecutableMemory(size_t size) {
prot = PROT_READ | PROT_WRITE; // POST_EXEC is added later in this case. prot = PROT_READ | PROT_WRITE; // POST_EXEC is added later in this case.
void* ptr = mmap(map_hint, size, prot, MAP_ANON | MAP_PRIVATE, -1, 0); void* ptr = mmap(map_hint, size, prot, MAP_ANON | MAP_PRIVATE, -1, 0);
#endif /* defined(_WIN32) */
#if !defined(_WIN32) if (ptr == MAP_FAILED) {
static const void *failed_result = MAP_FAILED;
#else
static const void *failed_result = nullptr;
#endif
if (ptr == failed_result) {
ptr = nullptr; ptr = nullptr;
ERROR_LOG(MEMMAP, "Failed to allocate executable memory (%d) errno=%d", (int)size, errno); ERROR_LOG(MEMMAP, "Failed to allocate executable memory (%d) errno=%d", (int)size, errno);
} }
#if PPSSPP_ARCH(AMD64) && !defined(_WIN32) #if PPSSPP_ARCH(AMD64)
else if ((uintptr_t)map_hint <= 0xFFFFFFFF) { else if ((uintptr_t)map_hint <= 0xFFFFFFFF) {
// Round up if we're below 32-bit mark, probably allocating sequentially. // Round up if we're below 32-bit mark, probably allocating sequentially.
map_hint += ppsspp_round_page(size); map_hint += ppsspp_round_page(size);
@ -202,9 +206,12 @@ void *AllocateExecutableMemory(size_t size) {
} }
} }
#endif #endif
return ptr; return ptr;
} }
#endif // non-windows
void *AllocateMemoryPages(size_t size, uint32_t memProtFlags) { void *AllocateMemoryPages(size_t size, uint32_t memProtFlags) {
#ifdef _WIN32 #ifdef _WIN32
if (sys_info.dwPageSize == 0) if (sys_info.dwPageSize == 0)