From 19e18cf37a57f7d89330deb4d8ef36fe520ffc89 Mon Sep 17 00:00:00 2001 From: fekt Date: Thu, 30 Nov 2023 05:01:53 +0000 Subject: [PATCH] Temp Mac workaround --- src/RandomX/src/virtual_memory.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/RandomX/src/virtual_memory.c b/src/RandomX/src/virtual_memory.c index d2cdcda0f..9b06ad050 100644 --- a/src/RandomX/src/virtual_memory.c +++ b/src/RandomX/src/virtual_memory.c @@ -148,9 +148,9 @@ void* allocMemoryPages(size_t bytes) { mem = NULL; #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, *)) { + //if (__builtin_available(macOS 11.0, *)) { pthread_jit_write_protect_np(0); - } + //} #endif #endif return mem; @@ -173,11 +173,11 @@ void setPagesRW(void* ptr, size_t bytes) { char *errfunc; #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, *)) { + //if (__builtin_available(macOS 11.0, *)) { pthread_jit_write_protect_np(0); - } else { - pageProtect(ptr, bytes, PAGE_READWRITE, &errfunc); - } + //} else { + // pageProtect(ptr, bytes, PAGE_READWRITE, &errfunc); + //} #else pageProtect(ptr, bytes, PAGE_READWRITE, &errfunc); #endif @@ -187,12 +187,12 @@ void setPagesRX(void* ptr, size_t bytes) { char *errfunc; #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, *)) { + //if (__builtin_available(macOS 11.0, *)) { pthread_jit_write_protect_np(1); __builtin___clear_cache((char*)ptr, ((char*)ptr) + bytes); - } else { - pageProtect(ptr, bytes, PAGE_EXECUTE_READ, &errfunc); - } + //} else { + // pageProtect(ptr, bytes, PAGE_EXECUTE_READ, &errfunc); + //} #else pageProtect(ptr, bytes, PAGE_EXECUTE_READ, &errfunc); #endif