Improve memory handling for wine, again

3 files changed, 26 insertions, 4 deletions

diff --git a/src/custommem.c b/src/custommem.c
index 3055a1ef..b745eb74 100644
--- a/src/custommem.c
+++ b/src/custommem.c
@@ -590,14 +590,14 @@ uintptr_t AllocDynarecMap(size_t size)
             #ifndef USE_MMAP
             void *p = NULL;
             if(!(p=box_memalign(box64_pagesize, allocsize))) {
-                dynarec_log(LOG_INFO, "Cannot create dynamic map of %zu bytes\n", allocsize);
+                dynarec_log(LOG_INFO, "Cannot create dynamic map of %zu bytes\n", allocsize), allocsize, strerror(errno);
                 return 0;
             }
             mprotect(p, allocsize, PROT_READ | PROT_WRITE | PROT_EXEC);
             #else
             void* p = internal_mmap(NULL, allocsize, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
             if(p==(void*)-1) {
-                dynarec_log(LOG_INFO, "Cannot create dynamic map of %zu bytes\n", allocsize);
+                dynarec_log(LOG_INFO, "Cannot create dynamic map of %zu bytes (%s)\n", allocsize, strerror(errno));
                 return 0;
             }
             #endif
@@ -1648,12 +1648,32 @@ int isLockAddress(uintptr_t addr)
 
 void* internal_mmap(void *addr, unsigned long length, int prot, int flags, int fd, ssize_t offset)
 {
+    #if 1//def STATICBUILD
     void* ret = (void*)syscall(__NR_mmap, addr, length, prot, flags, fd, offset);
+    #else
+    static int grab = 1;
+    typedef void*(*pFpLiiiL_t)(void*, unsigned long, int, int, int, size_t);
+    static pFpLiiiL_t libc_mmap64 = NULL;
+    if(grab) {
+        libc_mmap64 = dlsym(RTLD_NEXT, "mmap64");
+    }
+    void* ret = libc_mmap64(addr, length, prot, flags, fd, offset);
+    #endif
     return ret;
 }
 int internal_munmap(void* addr, unsigned long length)
 {
+    #if 1//def STATICBUILD
     int ret = syscall(__NR_munmap, addr, length);
+    #else
+    static int grab = 1;
+    typedef int(*iFpL_t)(void*, unsigned long);
+    static iFpL_t libc_munmap = NULL;
+    if(grab) {
+        libc_munmap = dlsym(RTLD_NEXT, "munmap");
+    }
+    int ret = libc_munmap(addr, length);
+    #endif
     return ret;
 }
 
diff --git a/src/elfs/elfloader.c b/src/elfs/elfloader.c
index 441595e0..29a247c6 100644
--- a/src/elfs/elfloader.c
+++ b/src/elfs/elfloader.c
@@ -385,8 +385,10 @@ void FreeElfMemory(elfheader_t* head)
         box_free(head->multiblocks);
     }
     // we only need to free the overall mmap, no need to free individual part as they are inside the big one
-    if(head->raw && head->raw_size)
+    if(head->raw && head->raw_size) {
+        dynarec_log(LOG_INFO, "Unmap elf memory %p-%p for %s\n", head->raw, head->raw+head->raw_size, head->path);
         munmap(head->raw, head->raw_size);
+    }
     freeProtection((uintptr_t)head->raw, head->raw_size);
 }
 
diff --git a/src/wrapped/wrappedlibc.c b/src/wrapped/wrappedlibc.c
index cb143880..0d2a5d56 100644
--- a/src/wrapped/wrappedlibc.c
+++ b/src/wrapped/wrappedlibc.c
@@ -2694,7 +2694,7 @@ EXPORT void* my_mmap64(x64emu_t* emu, void *addr, unsigned long length, int prot
         if(emu && (box64_log>=LOG_DEBUG || box64_dynarec_log>=LOG_DEBUG)) printf_log(LOG_NONE, " tried again with %p, got %p\n", addr, ret);
         if(old_addr && ret!=old_addr && ret!=MAP_FAILED)
             errno = olderr;
-    } else if((ret!=MAP_FAILED) && !(flags&MAP_FIXED) && ((box64_wine)) && (old_addr) && (addr!=ret) &&
+    } else if((ret!=MAP_FAILED) && !(flags&MAP_FIXED) && ((box64_wine)) && (addr && (addr!=ret)) &&
              (((uintptr_t)ret>0x7fffffffffffLL) || ((uintptr_t)ret&~0xffff))) {
         int olderr = errno;
         if(emu && (box64_log>=LOG_DEBUG || box64_dynarec_log>=LOG_DEBUG)) printf_log(LOG_NONE, "Warning, mmap on 47bits didn't worked, ask %p, got %p ", addr, ret);