diff --git a/src/virtual_memory.cpp b/src/virtual_memory.cpp index e3cc3c8..caf0292 100644 --- a/src/virtual_memory.cpp +++ b/src/virtual_memory.cpp @@ -36,9 +36,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifdef __APPLE__ #include #include -# ifdef TARGET_OS_OSX -# define USE_PTHREAD_JIT_WP 1 -# include +#include +# if TARGET_OS_OSX +# define USE_PTHREAD_JIT_WP 1 +# include # endif #endif #include @@ -114,8 +115,11 @@ void* allocMemoryPages(std::size_t bytes) { mem = mmap(nullptr, bytes, PAGE_READWRITE | RESERVED_FLAGS | PEXTRA, MAP_ANONYMOUS | MAP_PRIVATE | MEXTRA, -1, 0); if (mem == MAP_FAILED) throw std::runtime_error("allocMemoryPages - mmap failed"); -#ifdef USE_PTHREAD_JIT_WP - pthread_jit_write_protect_np(false); +#if defined(USE_PTHREAD_JIT_WP) && defined(MAC_OS_VERSION_11_0) \ + && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_VERSION_11_0 + if (__builtin_available(macOS 11.0, *)) { + pthread_jit_write_protect_np(false); + } #endif #endif return mem; @@ -134,16 +138,26 @@ static inline void pageProtect(void* ptr, std::size_t bytes, int rules) { } void setPagesRW(void* ptr, std::size_t bytes) { -#ifdef USE_PTHREAD_JIT_WP - pthread_jit_write_protect_np(false); +#if defined(USE_PTHREAD_JIT_WP) && defined(MAC_OS_VERSION_11_0) \ + && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_VERSION_11_0 + if (__builtin_available(macOS 11.0, *)) { + pthread_jit_write_protect_np(false); + } else { + pageProtect(ptr, bytes, PAGE_READWRITE); + } #else pageProtect(ptr, bytes, PAGE_READWRITE); #endif } void setPagesRX(void* ptr, std::size_t bytes) { -#ifdef USE_PTHREAD_JIT_WP - pthread_jit_write_protect_np(true); +#if defined(USE_PTHREAD_JIT_WP) && defined(MAC_OS_VERSION_11_0) \ + && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_VERSION_11_0 + if (__builtin_available(macOS 11.0, *)) { + pthread_jit_write_protect_np(true); + } else { + pageProtect(ptr, bytes, PAGE_EXECUTE_READ); + } #else pageProtect(ptr, bytes, PAGE_EXECUTE_READ); #endif