X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=ginge.git;a=blobdiff_plain;f=loader%2Fdl.c;h=6b0df2f338dede300c0b1df12882e026da923ecb;hp=468a2e0d0c2e9c6d90da33af6789a8db43213ddf;hb=HEAD;hpb=4d0451847a77d420284c7fb0f50b1f167c1118ee

diff --git a/loader/dl.c b/loader/dl.c
index 468a2e0..6b0df2f 100644
--- a/loader/dl.c
+++ b/loader/dl.c
@@ -1,4 +1,9 @@
-// vim:shiftwidth=2:expandtab
+/*
+ * GINGE - GINGE Is Not Gp2x Emulator
+ * (C) notaz, 2010-2011
+ *
+ * This work is licensed under the MAME license, see COPYING file for details.
+ */
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
@@ -20,7 +25,7 @@ static void next_line(FILE *f)
 __attribute__((constructor))
 static void ginge_init(void)
 {
-  unsigned int lowest_segment = (unsigned int)-1;
+  void *lowest_segments[2] = { NULL, NULL };
   unsigned int start, end;
   int i, ret;
   FILE *f;
@@ -45,13 +50,7 @@ static void ginge_init(void)
     perror("parse maps");
     exit(1);
   }
-  lowest_segment = start;
-
-  // assume first entry lists program's text section.
-  // unprotect it in case we need some patching.
-  ret = mprotect((void *)start, end - start, PROT_READ|PROT_WRITE|PROT_EXEC);
-  if (ret != 0)
-    perror("warning: mprotect");
+  lowest_segments[0] = (void *)start;
 
   while (1) {
     next_line(f);
@@ -60,8 +59,15 @@ static void ginge_init(void)
     if (ret <= 0)
       break;
 
-    if (start < lowest_segment)
-      lowest_segment = start;
+    if (lowest_segments[0] == NULL || (void *)start < lowest_segments[0])
+      lowest_segments[0] = (void *)start;
+    else if (lowest_segments[1] == NULL
+             && (char *)start - (char *)lowest_segments[0] > 0x800000)
+    {
+      // an offset is needed because ld-linux also
+      // tends to put stuff here
+      lowest_segments[1] = (void *)(start - 0x20000);
+    }
   }
 
 #if 0
@@ -75,7 +81,9 @@ static void ginge_init(void)
   // remove self from preload, further commands (from system() and such)
   // will be handled by ginge_prep.
   unsetenv("LD_PRELOAD");
+  unsetenv("LD_LIBRARY_PATH");
 
-  emu_init((void *)lowest_segment);
+  emu_init(lowest_segments, 1);
 }
 
+// vim:shiftwidth=2:expandtab