Ticket #514: ext_darwin.2.patch

ext.c

@@ -233 +233 @@
 
 //#define MAP_PRIVATE
 //#define MAP_SHARED
-#undef MAP_ANON
 LPVOID FILE_dommap( int unix_handle, LPVOID start,
                     DWORD size_high, DWORD size_low,
                     DWORD offset_high, DWORD offset_low,
@@ -248 +247 @@
 
     if (unix_handle == -1)
     {
-#ifdef MAP_ANON
+#ifdef CONFIG_DARWIN
 //      printf("Anonymous\n");
         flags |= MAP_ANON;
+        fd = -1;
 #else
         static int fdzero = -1;
 
@@ -263 +263 @@
             }
         }
         fd = fdzero;
-#endif  /* MAP_ANON */
+#endif  /* CONFIG_DARWIN */
         /* Linux EINVAL's on us if we don't pass MAP_PRIVATE to an anon mmap */
 #ifdef MAP_SHARED
         flags &= ~MAP_SHARED;
@@ -276 +276 @@
 //    printf("fd %x, start %x, size %x, pos %x, prot %x\n",fd,start,size_low, offset_low, prot);
 //    if ((ret = mmap( start, size_low, prot,
 //                     flags, fd, offset_low )) != (LPVOID)-1)
+#ifndef CONFIG_DARWIN
     if ((ret = mmap( start, size_low, prot,
                      MAP_PRIVATE | MAP_FIXED, fd, offset_low )) != (LPVOID)-1)
+#else
+    if ((ret = mmap( start, size_low, prot, MAP_PRIVATE | MAP_FIXED | MAP_ANON, fd, offset_low )) != (LPVOID)-1)
+#endif /* CONFIG_DARWIN */
     {
 //          printf("address %08x\n", *(int*)ret);
 //      printf("%x\n", ret);
@@ -471 +475 @@
 
     if ((type&(MEM_RESERVE|MEM_COMMIT)) == 0) return NULL;
 
+#ifndef CONFIG_DARWIN
     fd=open("/dev/zero", O_RDWR);
     if(fd<0){
         perror( "Cannot open /dev/zero for READ+WRITE. Check permissions! error: " );
         return NULL;
     }
+#endif /* CONFIG_DARWIN */
 
     if (type&MEM_RESERVE && (unsigned)address&0xffff) {
         size += (unsigned)address&0xffff;
@@ -525 +531 @@
         }
     }
 
+#ifndef CONFIG_DARWIN
     answer=mmap(address, size, PROT_READ | PROT_WRITE | PROT_EXEC,
                 MAP_PRIVATE, fd, 0);
+#else
+    /* mmap feeding from fd from /dev/zero doesn't work on darwin ! */
+    answer=mmap(address, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANON, -1, 0);
+#endif /* CONFIG_DARWIN */
 //    answer=FILE_dommap(-1, address, 0, size, 0, 0,
 //      PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE);
     close(fd);