X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=ginge.git;a=blobdiff_plain;f=loader%2Femu.c;h=837e77c5fdaded8d2f8c62e8a7886fe774738468;hp=dd507ff01c85251ac2dcfb83116e2cdeb6bc0b6f;hb=499bf01c2f0e075caeb23714e3376a641c04eb7c;hpb=7000b522095b21ba16784d02997835d74ecc3375

diff --git a/loader/emu.c b/loader/emu.c
index dd507ff..837e77c 100644
--- a/loader/emu.c
+++ b/loader/emu.c
@@ -1,8 +1,18 @@
-// 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.
+ */
+// a "gentle" reminder
+#ifdef __ARM_EABI__
+#error loader is meant to be OABI!
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <alloca.h>
+#include <ctype.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -438,7 +448,8 @@ static u32 xread32_io_cmn(u32 a, u32 *handled)
   //  ???? ???? YXBA DURiLe ???? VdVuMS LR?? ????
   // |     GPIOC[31:16]    |    GPIOB[31:16]     |
   case 0xa058: // GPIOBPAD
-    d =   pollux.btn_state & 0x0300;
+    d =  (pollux.btn_state >> 1) & 0x0100;
+    d |= (pollux.btn_state << 1) & 0x0200;
     d |= (pollux.btn_state >> 3) & 0x0080;
     d |= (pollux.btn_state >> 5) & 0x0040;
     d |= (pollux.btn_state >> 6) & 0x0c00;
@@ -925,6 +936,14 @@ void emu_init(void *map_bottom)
   void *pret;
   int ret;
 
+#ifdef PND
+  if (geteuid() == 0) {
+    fprintf(stderr, "don't try to run as root, device registers or memory "
+                    "might get trashed crashing the OS or even damaging the device.\n");
+    exit(1);
+  }
+#endif
+
   g_linkpage = (void *)(((u32)map_bottom - LINKPAGE_ALLOC) & ~0xfff);
   pret = mmap(g_linkpage, LINKPAGE_ALLOC, PROT_READ|PROT_WRITE,
               MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED, -1, 0);
@@ -948,13 +967,15 @@ void emu_init(void *map_bottom)
     exit(1);
   }
 
-#ifdef WIZ
-  // we are short on memmory on Wiz, need special handling
-  extern void *host_mmap_upper(void);
-  mmsp2.umem = host_mmap_upper();
-#else
+  // TODO: check if this really fails on Wiz..
   mmsp2.umem = mmap(NULL, 0x2000000, PROT_READ|PROT_WRITE|PROT_EXEC,
                     MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+#ifdef WIZ
+  if (mmsp2.umem == MAP_FAILED) {
+    // we are short on memmory on Wiz, need special handling
+    extern void *host_mmap_upper(void);
+    mmsp2.umem = host_mmap_upper();
+  }
 #endif
   if (mmsp2.umem == MAP_FAILED) {
     perror(PFX "mmap upper mem");
@@ -1195,24 +1216,27 @@ static const struct {
   const char *from;
   const char *to;
 } path_map[] = {
-  { "/mnt/tmp/", "/tmp/" },
+  { "/mnt/tmp", "./tmp" },
 };
 
 static const char *wrap_path(const char *path)
 {
-  char *buff;
+  char *buff, *p;
   size_t size;
   int i, len;
 
   // do only path mapping for now
   for (i = 0; i < ARRAY_SIZE(path_map); i++) {
-    len = strlen(path_map[i].from);
-    if (strncmp(path, path_map[i].from, len) == 0) {
+    p = strstr(path, path_map[i].from);
+    if (p != NULL) {
       size = strlen(path) + strlen(path_map[i].to) + 1;
       buff = malloc(size);
       if (buff == NULL)
         break;
-      snprintf(buff, size, "%s%s", path_map[i].to, path + len);
+      len = p - path;
+      strncpy(buff, path, len);
+      snprintf(buff + len, size - len, "%s%s", path_map[i].to,
+        path + len + strlen(path_map[i].from));
       dbg("mapped path \"%s\" -> \"%s\"\n", path, buff);
       return buff;
     }
@@ -1243,6 +1267,7 @@ void *emu_do_fopen(const char *path, const char *mode)
 int emu_do_system(const char *command)
 {
   static char tmp_path[512];
+  int need_ginge = 0;
   const char *p2;
   char *p;
   int ret;
@@ -1250,17 +1275,25 @@ int emu_do_system(const char *command)
   if (command == NULL)
     return -1;
 
-  // pass through stuff in PATH
-  p = strchr(command, ' ');
-  p2 = strchr(command, '/');
-  if (p2 == NULL || (p != NULL && p2 > p))
-    return system(command);
+  for (p2 = command; *p2 && isspace(*p2); p2++)
+    ;
 
-  make_local_path(tmp_path, sizeof(tmp_path), "ginge_prep");
-  p = tmp_path + strlen(tmp_path);
+  if (*p2 == '.') // relative path?
+    need_ginge = 1;
+  else if (*p2 == '/' && strncmp(p2, "/bin", 4) && strncmp(p2, "/lib", 4)
+           && strncmp(p2, "/sbin", 4) && strncmp(p2, "/usr", 4))
+    // absolute path, but not a system command
+    need_ginge = 1;
 
   p2 = wrap_path(command);
-  snprintf(p, sizeof(tmp_path) - (p - tmp_path), " --nomenu %s", p2);
+  if (need_ginge) {
+    make_local_path(tmp_path, sizeof(tmp_path), "ginge_prep");
+    p = tmp_path + strlen(tmp_path);
+
+    snprintf(p, sizeof(tmp_path) - (p - tmp_path), " --nomenu %s", p2);
+  }
+  else
+    snprintf(tmp_path, sizeof(tmp_path), "%s", p2);
   wrap_path_free(p2, command);
 
   dbg("system: \"%s\"\n", tmp_path);
@@ -1311,3 +1344,4 @@ int emu_do_execve(const char *filename, char *const argv[], char *const envp[])
   return ret;
 }
 
+// vim:shiftwidth=2:expandtab