Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-20 06:00:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #9857 from jbeich/freebsd

Browse Source 
Fix crash on FreeBSD x86_64 when starting a game
This commit is contained in:
Henrik Rydgård 2017-08-01 10:45:32 +02:00 committed by GitHub
commit fd5bf0e0a3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Common/MemoryUtil.cpp
View File

@ -157,7 +157,7 @@ void *AllocateExecutableMemory(size_t size) {
}
#else
static char *map_hint = 0;
#if defined(_M_X64)
#if defined(_M_X64) && !defined(MAP_32BIT)
// 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.
if (!map_hint) {
@ -179,7 +179,7 @@ void *AllocateExecutableMemory(size_t size) {
void* ptr = mmap(map_hint, size, prot,
MAP_ANON | MAP_PRIVATE
#if defined(_M_X64) && defined(MAP_32BIT)
| ((uintptr_t) map_hint == 0 ? MAP_32BIT : 0)
| MAP_32BIT
#endif
, -1, 0);
@ -196,7 +196,7 @@ void *AllocateExecutableMemory(size_t size) {
ERROR_LOG(MEMMAP, "Failed to allocate executable memory (%d)", (int)size);
PanicAlert("Failed to allocate executable memory\n%s", GetLastErrorMsg());
}
#if defined(_M_X64) && !defined(_WIN32)
#if defined(_M_X64) && !defined(_WIN32) && !defined(MAP_32BIT)
else if ((uintptr_t)map_hint <= 0xFFFFFFFF) {
// Round up if we're below 32-bit mark, probably allocating sequentially.
map_hint += round_page(size);