X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=ginge.git;a=blobdiff_plain;f=loader%2Fpatches.c;h=0504909c77018918378fe6d9255660f05b910c08;hp=9354d2fdcbc1ab35b981e58b9be87ef2fddbcead;hb=db9191ed7ea2e1c190b4445bf3c576b206c88b36;hpb=11913091045ebc44f003138d9e69cdc91fe4982e

diff --git a/loader/patches.c b/loader/patches.c
index 9354d2f..0504909 100644
--- a/loader/patches.c
+++ b/loader/patches.c
@@ -1,64 +1,84 @@
 // vim:shiftwidth=2:expandtab
 #include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/mman.h>
 
 #include "header.h"
 #include "sys_cacheflush.h"
 
+#include "override.c"
+
+// note: first mask must be always full for search algo
+static const unsigned int sig_mask_all[] = {
+  0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+  0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff
+};
+
 static const unsigned int sig_open[] = {
   0xe59cc000, 0xe33c0000, 0x1a000003, 0xef900005
 };
+#define sig_mask_open sig_mask_all
 
 static const unsigned int sig_mmap[] = {
   0xe92d000f, 0xe1a0000d, 0xef90005a, 0xe28dd010
 };
+#define sig_mask_mmap sig_mask_all
 
-static const unsigned int sig_mmap_[] = {
+static const unsigned int sig_mmap2[] = {
   0xe52d5004, 0xe59d5008, 0xe52d4004, 0xe59d4008,
   0xe1b0ca05, 0x1a000006, 0xe1a05625, 0xef9000c0
 };
+#define sig_mask_mmap2 sig_mask_all
 
-#define FAKE_DEVMEM_DEVICE 10001
+static const unsigned int sig_read[] = {
+  0xe59fc080, 0xe59cc000, 0xe33c0000, 0x1a000003, 0xef900003
+};
+#define sig_mask_read sig_mask_all
 
-static int w_open(const char *pathname, int flags, mode_t mode)
-{
-  int ret;
-  if (strcmp(pathname, "/dev/mem") != 0)
-    ret = open(pathname, flags, mode);
-  else
-    ret = FAKE_DEVMEM_DEVICE;
-
-  printf("open(%s) = %d\n", pathname, ret);
-  return ret;
-}
+static const unsigned int sig_ioctl[] = {
+  0xef900036, 0xe3700a01, 0x312fff1e
+};
+#define sig_mask_ioctl sig_mask_all
 
-static void *w_mmap(void *addr, size_t length, int prot, int flags, int fd, off_t offset)
-{
-  void *ret;
-  if (fd != FAKE_DEVMEM_DEVICE)
-    ret = mmap(addr, length, prot, flags, fd, offset);
-  else
-    ret = emu_mmap_dev(length, prot, flags, offset);
-
-  printf("mmap(%p, %x, %x, %x, %d, %lx) = %p\n", addr, length, prot, flags, fd, (long)offset, ret);
-  return ret;
-}
-#define w_mmap_ w_mmap
+static const unsigned int sig_sigaction[] = {
+  0xe59f300c, 0xe3530000, 0x0a000000, 0xea000000, 0xea000000
+};
+static const unsigned int sig_mask_sigaction[] = {
+  0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, 0xff000000
+};
+
+static const unsigned int sig_execve[] = {
+  0xef90000b, 0xe1a04000, 0xe3700a01
+};
+#define sig_mask_execve sig_mask_all
+
+static const unsigned int sig_execve2[] = {
+  0xef90000b, 0xe3700a01, 0xe1a04000
+};
+#define sig_mask_execve2 sig_mask_all
+
+static const unsigned int sig_chdir[] = {
+  0xef90000c, 0xe3700a01, 0x312fff1e, 0xea0004bb
+};
+static const unsigned int sig_mask_chdir[] = {
+  0xffffffff, 0xffffffff, 0xffffffff, 0xff000000
+};
 
-#define PATCH(f) { sig_##f, ARRAY_SIZE(sig_##f), w_##f }
+#define PATCH_(f,p) { sig_##p, sig_mask_##p, ARRAY_SIZE(sig_##p), w_##f }
+#define PATCH(f) PATCH_(f,f)
 
 static const struct {
   const unsigned int *sig;
+  const unsigned int *sig_mask;
   size_t sig_cnt;
   void *func;
 } patches[] = {
   PATCH(open),
   PATCH(mmap),
-  PATCH(mmap_), // mmap using mmap2 syscall
+  PATCH(mmap2), // mmap2 syscall
+  PATCH(read),
+  PATCH(ioctl),
+  PATCH(sigaction),
+//  PATCH_(execve, execve2), // hangs
+  PATCH(chdir),
 };
 
 void do_patches(void *ptr, unsigned int size)
@@ -67,6 +87,7 @@ void do_patches(void *ptr, unsigned int size)
 
   for (i = 0; i < ARRAY_SIZE(patches); i++) {
     const unsigned int *sig = patches[i].sig;
+    const unsigned int *sig_mask = patches[i].sig_mask;
     unsigned int *seg = (void *)(((long)ptr + 3) & ~3);
     unsigned int *seg_end = seg + size / 4;
     unsigned int sig0 = sig[0];
@@ -76,7 +97,7 @@ void do_patches(void *ptr, unsigned int size)
         continue;
 
       for (s = 1; s < patches[i].sig_cnt; s++)
-        if (seg[s] != sig[s])
+        if ((seg[s] ^ sig[s]) & sig_mask[s])
           break;
 
       if (s == patches[i].sig_cnt)
@@ -85,7 +106,7 @@ void do_patches(void *ptr, unsigned int size)
     continue;
 
 found:
-    printf("  patch #%i @ %08x\n", i, (int)seg);
+    dbg("  patch #%i @ %08x\n", i, (int)seg);
     seg[0] = 0xe59ff000; // ldr pc, [pc]
     seg[1] = 0;
     seg[2] = (unsigned int)patches[i].func;