hush
/
hush3
9
0
Fork 11
Code Issues 143 Pull Requests 2 Projects Releases 16 Wiki Activity
Browse Source

Merge branch 'dev' of https://git.hush.is/hush/hush3 into dev

dev-old-randomx
Duke 6 months ago
parent
36364bad87 bde07c25fe
commit
b0027d8c64
2 changed files with 11 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      depends/packages/libcurl.mk
  2. 20
      src/RandomX/src/virtual_memory.c

2
depends/packages/libcurl.mk
View File

@ -14,7 +14,7 @@ $(package)_dependencies=wolfssl
$(package)_download_path=https://curl.haxx.se/download $(package)_download_path=https://curl.haxx.se/download
$(package)_config_opts_linux=--disable-shared --enable-static --without-ssl --prefix=$(host_prefix) --host=$(host) $(package)_config_opts_linux=--disable-shared --enable-static --without-ssl --prefix=$(host_prefix) --host=$(host)
$(package)_config_opts_mingw32=--enable-mingw --disable-shared --enable-static --with-wolfssl --without-ssl --prefix=$(host_prefix) --host=x86_64-w64-mingw32 $(package)_config_opts_mingw32=--enable-mingw --disable-shared --enable-static --with-wolfssl --without-ssl --prefix=$(host_prefix) --host=x86_64-w64-mingw32
$(package)_config_opts_darwin=--disable-shared --enable-static --with-wolfssl --without-ssl --prefix=$(host_prefix) $(package)_config_opts_darwin=--disable-shared --enable-static --without-ssl --prefix=$(host_prefix)
$(package)_cflags_darwin=-mmacosx-version-min=10.9 $(package)_cflags_darwin=-mmacosx-version-min=10.9
$(package)_conf_tool=./configure $(package)_conf_tool=./configure

20
src/RandomX/src/virtual_memory.c
View File

@ -148,9 +148,9 @@ void* allocMemoryPages(size_t bytes) {
mem = NULL; mem = NULL;
#if defined(USE_PTHREAD_JIT_WP) && defined(MAC_OS_VERSION_11_0) \ #if defined(USE_PTHREAD_JIT_WP) && defined(MAC_OS_VERSION_11_0) \
&& MAC_OS_X_VERSION_MAX_ALLOWED >= 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); pthread_jit_write_protect_np(0);
} //}
#endif #endif
#endif #endif
return mem; return mem;
@ -173,11 +173,11 @@ void setPagesRW(void* ptr, size_t bytes) {
char *errfunc; char *errfunc;
#if defined(USE_PTHREAD_JIT_WP) && defined(MAC_OS_VERSION_11_0) \ #if defined(USE_PTHREAD_JIT_WP) && defined(MAC_OS_VERSION_11_0) \
&& MAC_OS_X_VERSION_MAX_ALLOWED >= 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); pthread_jit_write_protect_np(0);
} else { //} else {
pageProtect(ptr, bytes, PAGE_READWRITE, &errfunc); // pageProtect(ptr, bytes, PAGE_READWRITE, &errfunc);
} //}
#else #else
pageProtect(ptr, bytes, PAGE_READWRITE, &errfunc); pageProtect(ptr, bytes, PAGE_READWRITE, &errfunc);
#endif #endif
@ -187,12 +187,12 @@ void setPagesRX(void* ptr, size_t bytes) {
char *errfunc; char *errfunc;
#if defined(USE_PTHREAD_JIT_WP) && defined(MAC_OS_VERSION_11_0) \ #if defined(USE_PTHREAD_JIT_WP) && defined(MAC_OS_VERSION_11_0) \
&& MAC_OS_X_VERSION_MAX_ALLOWED >= 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); pthread_jit_write_protect_np(1);
__builtin___clear_cache((char*)ptr, ((char*)ptr) + bytes); __builtin___clear_cache((char*)ptr, ((char*)ptr) + bytes);
} else { //} else {
pageProtect(ptr, bytes, PAGE_EXECUTE_READ, &errfunc); // pageProtect(ptr, bytes, PAGE_EXECUTE_READ, &errfunc);
} //}
#else #else
pageProtect(ptr, bytes, PAGE_EXECUTE_READ, &errfunc); pageProtect(ptr, bytes, PAGE_EXECUTE_READ, &errfunc);
#endif #endif

Write Preview
Loading…
Cancel
Save