diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/box64stack.c | 9 | ||||
| -rw-r--r-- | src/tools/rcfile.c | 1 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/box64stack.c b/src/tools/box64stack.c index d1c55d07..7be31b4d 100644 --- a/src/tools/box64stack.c +++ b/src/tools/box64stack.c @@ -11,9 +11,7 @@ #include "emu/x64emu_private.h" #include "emu/x64run_private.h" #include "auxval.h" - -// from src/wrapped/wrappedlibc.c -void* my_mmap(x64emu_t* emu, void* addr, unsigned long length, int prot, int flags, int fd, int64_t offset); +#include "custommem.h" EXPORTDYN int CalcStackSize(box64context_t *context) @@ -24,11 +22,12 @@ int CalcStackSize(box64context_t *context) CalcStack(context->elfs[i], &context->stacksz, &context->stackalign); //if (posix_memalign((void**)&context->stack, context->stackalign, context->stacksz)) { - context->stack = my_mmap(NULL, NULL, context->stacksz, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_GROWSDOWN, -1, 0); + context->stack = internal_mmap(NULL, context->stacksz, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_GROWSDOWN, -1, 0); if (context->stack==(void*)-1) { printf_log(LOG_NONE, "Cannot allocate aligned memory (0x%lx/0x%zx) for stack\n", context->stacksz, context->stackalign); return 1; - } + } else + setProtection((uintptr_t)context->stack, context->stacksz, PROT_READ|PROT_WRITE); //memset(context->stack, 0, context->stacksz); printf_log(LOG_DEBUG, "Stack is @%p size=0x%lx align=0x%zx\n", context->stack, context->stacksz, context->stackalign); diff --git a/src/tools/rcfile.c b/src/tools/rcfile.c index cea7d5cf..15cb6955 100644 --- a/src/tools/rcfile.c +++ b/src/tools/rcfile.c @@ -86,6 +86,7 @@ CENTRYBOOL(BOX64_NOSIGSEGV, no_sigsegv) \ CENTRYBOOL(BOX64_NOSIGILL, no_sigill) \ ENTRYBOOL(BOX64_SHOWSEGV, box64_showsegv) \ ENTRYBOOL(BOX64_SHOWBT, box64_showbt) \ +ENTRYBOOL(BOX64_MMAP32, box64_mmap32) \ ENTRYBOOL(BOX64_X11THREADS, box64_x11threads) \ ENTRYBOOL(BOX64_X11GLX, box64_x11glx) \ ENTRYDSTRING(BOX64_LIBGL, box64_libGL) \ |