X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=ginge.git;a=blobdiff_plain;f=loader%2Fpatches.c;h=5418c1c80f5ae3ca80be6154de5caf238ac5e07b;hp=dc9edf8a3bc93a4e8d994bafc5416a5151a5eb73;hb=3ef07128a8ad8a12688beee244c5e0a2629581de;hpb=3d295a9fe6e27f6103701e8d8ae23257b43ff2dd diff --git a/loader/patches.c b/loader/patches.c index dc9edf8..5418c1c 100644 --- a/loader/patches.c +++ b/loader/patches.c @@ -1,84 +1,151 @@ -// vim:shiftwidth=2:expandtab +/* + * GINGE - GINGE Is Not Gp2x Emulator + * (C) notaz, 2010-2011,2016 + * + * This work is licensed under the MAME license, see COPYING file for details. + */ #include -#include -#include -#include -#include -#include -#include #include "header.h" #include "sys_cacheflush.h" +#include "override.c" + +// note: first mask int must be always full for the 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 + 0xe59cc000, // ldr ip, [ip] + 0xe33c0000, // teq ip, #0 + 0x1a000003, // bne 0x1c + 0xef900005, // svc 0x900005 }; +#define sig_mask_open sig_mask_all static const unsigned int sig_mmap[] = { - 0xe92d000f, 0xe1a0000d, 0xef90005a, 0xe28dd010 + 0xe92d000f, // push {r0, r1, r2, r3} + 0xe1a0000d, // mov r0, sp + 0xef90005a, // svc 0x90005a + 0xe28dd010, // add sp, sp, #16 }; +#define sig_mask_mmap sig_mask_all -static const unsigned int sig_mmap_[] = { - 0xe52d5004, 0xe59d5008, 0xe52d4004, 0xe59d4008, - 0xe1b0ca05, 0x1a000006, 0xe1a05625, 0xef9000c0 +static const unsigned int sig_munmap[] = { + 0xef90005b, // svc 0x90005b + 0xe3700a01, // cmn r0, #0x1000 + 0x312fff1e, // bxcc lr +}; +#define sig_mask_munmap sig_mask_all + +static const unsigned int sig_mmap2[] = { + 0xe52d5004, // push {r5} + 0xe59d5008, // ldr r5, [sp, #8] + 0xe52d4004, // push {r4} + 0xe59d4008, // ldr r4, [sp, #8] + 0xe1b0ca05, // lsls ip, r5, #20 + 0x1a000006, // bne 0x34 + 0xe1a05625, // lsr r5, r5, #12 + 0xef9000c0, // svc 0x009000c0 }; +#define sig_mask_mmap2 sig_mask_all static const unsigned int sig_read[] = { - 0xe59fc080, 0xe59cc000, 0xe33c0000, 0x1a000003, 0xef900003 + 0xe59fc080, // ldr ip, [pc, #128] + 0xe59cc000, // ldr ip, [ip] + 0xe33c0000, // teq ip, #0 + 0x1a000003, // bne 0x20 + 0xef900003, // svc 0x900003 }; +#define sig_mask_read sig_mask_all -#define FAKE_DEVMEM_DEVICE 10001 -#define FAKE_DEVGPIO_DEVICE 10002 +static const unsigned int sig_ioctl[] = { + 0xef900036, // svc 0x900036 + 0xe3700a01, // cmn r0, #0x1000 + 0x312fff1e, // bxcc lr +}; +#define sig_mask_ioctl sig_mask_all -static int w_open(const char *pathname, int flags, mode_t mode) -{ - int ret; - if (strcmp(pathname, "/dev/mem") == 0) - ret = FAKE_DEVMEM_DEVICE; - else if (strcmp(pathname, "/dev/GPIO") == 0) - ret = FAKE_DEVGPIO_DEVICE; - else - ret = open(pathname, flags, mode); - - printf("open(%s) = %d\n", pathname, ret); - return ret; -} +static const unsigned int sig_hw_ioctl[] = { + 0xef900036, // svc 0x900036 + 0xe3700a01, // cmn r0, #0x1000 + 0xe1a04000, // mov r4, r0 +}; +#define sig_mask_hw_ioctl sig_mask_all + +static const unsigned int sig_sigaction[] = { + 0xe59f300c, // ldr r3, [pc, #12] + 0xe3530000, // cmp r3, #0 + 0x0a000000, // beq 0f + 0xea000000, // b * + 0xea000000, // 0: b * +}; +static const unsigned int sig_mask_sigaction[] = { + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, 0xff000000 +}; -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_execve[] = { + 0xef90000b, // svc 0x90000b + 0xe1a04000, // mov r4, r0 + 0xe3700a01, // cmn r0, #4096 +}; +#define sig_mask_execve sig_mask_all -ssize_t w_read(int fd, void *buf, size_t count) -{ - ssize_t ret; - if (fd != FAKE_DEVGPIO_DEVICE) - return read(fd, buf, count); +static const unsigned int sig_execve2[] = { + 0xef90000b, // svc 0x90000b + 0xe3700a01, // cmn r0, #4096 + 0xe1a04000, // mov r4, r0 +}; +#define sig_mask_execve2 sig_mask_all - ret = emu_read_gpiodev(buf, count); - //printf("read(%d, %p, %d) = %d\n", fd, buf, count, ret); - return ret; -} +static const unsigned int sig_chdir[] = { + 0xef90000c, // svc 0x90000c + 0xe3700a01, // cmn r0, #4096 + 0x312fff1e, // bxcc lr + 0xea0004bb, // b * +}; +static const unsigned int sig_mask_chdir[] = { + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000 +}; -#define PATCH(f) { sig_##f, ARRAY_SIZE(sig_##f), w_##f } +/* additional wrapper for harder case of syscalls within the code stream */ +extern int hw_ioctl(int fd, int request, void *argp); +asm( +"hw_ioctl:\n" +" stmfd sp!, {r1-r3,r12,lr}\n" +#ifdef PND // fix PC, not needed on ARM9 +" ldr r1, [sp, #5*4]\n" +" add r1, r1, #4\n" +" str r1, [sp, #5*4]\n" +#endif +" bl w_ioctl\n" +" cmn r0, #0x1000\n" +" mov r4, r0\n" +" ldmfd sp!, {r1-r3,r12,lr,pc}\n" +); + +#define PATCH_(f, p, t) { sig_##p, sig_mask_##p, ARRAY_SIZE(sig_##p), t, f } +#define PATCH(f) PATCH_(w_##f, f, 0) static const struct { const unsigned int *sig; + const unsigned int *sig_mask; size_t sig_cnt; + unsigned int type; void *func; } patches[] = { PATCH(open), PATCH(mmap), - PATCH(mmap_), // mmap using mmap2 syscall + PATCH(mmap2), // mmap2 syscall + PATCH(munmap), PATCH(read), + PATCH(ioctl), + PATCH_(hw_ioctl, hw_ioctl, 1), + PATCH(sigaction), +// PATCH_(execve, execve2), // hangs + PATCH(chdir), }; void do_patches(void *ptr, unsigned int size) @@ -87,6 +154,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]; @@ -96,21 +164,32 @@ 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) - goto found; + if (s == patches[i].sig_cnt) { + dbg(" patch #%i @ %08x type %d\n", i, (int)seg, patches[i].type); + switch (patches[i].type) { + case 0: + seg[0] = 0xe59ff000; // ldr pc, [pc] + seg[1] = 0; + seg[2] = (unsigned int)patches[i].func; + break; + case 1: + seg[0] = 0xe92d8000; // stmfd sp!, {pc} + seg[1] = 0xe51ff004; // pc, [pc, #-4] + seg[2] = (unsigned int)patches[i].func; + break; + default: + err("bad patch type: %u\n", patches[i].type); + abort(); + } + seg += patches[i].sig_cnt - 1; + } } - continue; - -found: - printf(" patch #%i @ %08x\n", i, (int)seg); - seg[0] = 0xe59ff000; // ldr pc, [pc] - seg[1] = 0; - seg[2] = (unsigned int)patches[i].func; } sys_cacheflush(ptr, (char *)ptr + size); } +// vim:shiftwidth=2:expandtab