kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #48 from sigmaris/map_jit_backwards_compat 

Avoid using MAP_JIT mmap flag on macOS < 10.14
CQTexperiment
Christopher Snowhill 2020-06-07 18:58:55 -07:00 committed by GitHub
parent c009a17ccd be44237199
commit 5f04d9250d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Frameworks/lazyusf2/lazyusf2/r4300/recomp.c
View File

@ -26,6 +26,10 @@
#include <unistd.h> #include <unistd.h>
#ifndef __MINGW32__ #ifndef __MINGW32__
#include <sys/mman.h> #include <sys/mman.h>
#if defined(__APPLE__)
#include <stdio.h>
#include <sys/sysctl.h>
#endif
#endif #endif
#endif #endif
@ -2518,6 +2522,19 @@ void recompile_opcode(usf_state_t * state)
state->delay_slot_compiled = 2; state->delay_slot_compiled = 2;
} }
#if defined(__APPLE__)
static inline int macos_release()
{
char buf[64];
size_t size = sizeof(buf);
int err = sysctlbyname("kern.osrelease", buf, &size, NULL, 0);
if (err != 0) return 0;
int major;
if (sscanf(buf, "%d", &major) != 1) return 0;
return major;
}
#endif
/********************************************************************** /**********************************************************************
************** allocate memory with executable bit set *************** ************** allocate memory with executable bit set ***************
**********************************************************************/ **********************************************************************/
@ -2537,7 +2554,16 @@ static void *malloc_exec(usf_state_t * state, size_t size)
#define MAP_JIT 0 #define MAP_JIT 0
#endif #endif
#if defined(__APPLE__)
static int flags;
/* Don't use MAP_JIT unless running on Mojave (release 18) or later */
if (!flags) flags = MAP_PRIVATE | MAP_ANONYMOUS | (macos_release() >= 18 ? MAP_JIT : 0);
void *block = mmap(NULL, size, PROT_READ | PROT_WRITE | PROT_EXEC, flags, -1, 0);
#else
void *block = mmap(NULL, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS | MAP_JIT, -1, 0); void *block = mmap(NULL, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS | MAP_JIT, -1, 0);
#endif
if (block == MAP_FAILED) if (block == MAP_FAILED)
{ DebugMessage(state, M64MSG_ERROR, "Memory error: couldn't allocate %zi byte block of aligned RWX memory.", size); return NULL; } { DebugMessage(state, M64MSG_ERROR, "Memory error: couldn't allocate %zi byte block of aligned RWX memory.", size); return NULL; }