X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=ginge.git;a=blobdiff_plain;f=loader%2Femu.c;h=64c2c993b7f8982282bd631c8e1c943bfc4ba528;hp=11be5ba7f0d831d5559a121ba53e6d9b16e6f99a;hb=d0b9b0df7ed0dc36aabe30e2d584c27c8c32a3d9;hpb=5853ddbd8b9c254176434df8df2350f926f99c2d diff --git a/loader/emu.c b/loader/emu.c index 11be5ba..64c2c99 100644 --- a/loader/emu.c +++ b/loader/emu.c @@ -1,4 +1,9 @@ -// 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. + */ // a "gentle" reminder #ifdef __ARM_EABI__ #error loader is meant to be OABI! @@ -7,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -15,19 +21,22 @@ #include #include #include -#include #include #include +#include #include #include +#include #include #include +#include #include "header.h" #include "../common/host_fb.h" #include "../common/cmn.h" -#include "sys_cacheflush.h" +#include "syscalls.h" #include "realfuncs.h" +#include "llibc.h" #if (DBG & 2) && !(DBG & 4) #define LOG_IO_UNK @@ -50,7 +59,7 @@ #endif #ifdef LOG_SEGV -#define segvlog printf +#define segvlog g_printf #else #define segvlog(...) #endif @@ -64,8 +73,10 @@ typedef unsigned int u32; typedef unsigned short u16; typedef unsigned char u8; -static pthread_mutex_t fb_mutex = PTHREAD_MUTEX_INITIALIZER; -static pthread_cond_t fb_cond = PTHREAD_COND_INITIALIZER; +#define THREAD_STACK_SIZE 0x200000 + +static int fb_sync_thread_paused; +static int fb_sync_thread_futex; static struct { u32 dstctrl; @@ -141,7 +152,7 @@ static void log_io(const char *pfx, u32 a, u32 d, int size) if ((a & ~0xffff) == 0x7f000000) reg = regnames[a & 0xffff]; - printf(fmt, pfx, a, d, reg); + g_printf(fmt, pfx, a, d, reg); } #endif @@ -182,9 +193,9 @@ static void blt_tr(void *dst, void *src, u32 trc, int w) u32 *r = &blitter.dstctrl; \ int i; \ for (i = 0; i < 4*4; i++, r++) { \ - printf("%08x ", *r); \ + g_printf("%08x ", *r); \ if ((i & 3) == 3) \ - printf("\n"); \ + g_printf("\n"); \ } \ } @@ -275,8 +286,10 @@ static void blitter_do(void) } } - if (to_screen) - pthread_cond_signal(&fb_cond); + if (to_screen) { + fb_sync_thread_futex = 1; + g_futex_raw(&fb_sync_thread_futex, FUTEX_WAKE, 1, NULL); + } return; bad_blit: @@ -323,65 +336,55 @@ static void mlc_flip(void *src, int bpp, int stride) } } -#define ts_add_nsec(ts, ns) { \ - ts.tv_nsec += ns; \ - if (ts.tv_nsec >= 1000000000) { \ - ts.tv_sec++; \ - ts.tv_nsec -= 1000000000; \ - } \ -} - -static int fb_sync_thread_paused; - static void *fb_sync_thread(void *arg) { + unsigned long sigmask[2] = { ~0ul, ~0ul }; + struct timespec ts = { 0, 0 }; int invalid_fb_addr = 1; int manual_refresh = 0; int frame_counter = 0; - struct timespec ts; - int ret, wait_ret; + int wait_ret; + + // this thread can't run any signal handlers since the + // app's stack/tls stuff will never be set up here + sigmask[0] &= ~(1ul << (SIGSEGV - 1)); + g_rt_sigprocmask_raw(SIG_SETMASK, sigmask, NULL, sizeof(sigmask)); - //ret = pthread_setschedprio(pthread_self(), -1); - //log("pthread_setschedprio %d\n", ret); //ret = setpriority(PRIO_PROCESS, 0, -1); //log("setpriority %d\n", ret); - ret = clock_gettime(CLOCK_REALTIME, &ts); - if (ret != 0) { - perror(PFX "clock_gettime"); - exit(1); - } + // tell the main thread we're done init + fb_sync_thread_futex = 0; + g_futex_raw(&fb_sync_thread_futex, FUTEX_WAKE, 1, NULL); while (1) { u8 *gp2x_fb, *gp2x_fb_end; - ret = pthread_mutex_lock(&fb_mutex); - wait_ret = pthread_cond_timedwait(&fb_cond, &fb_mutex, &ts); - ret |= pthread_mutex_unlock(&fb_mutex); + wait_ret = g_futex_raw(&fb_sync_thread_futex, FUTEX_WAIT, 0, &ts); - if (ret != 0) { - err("fb_thread: mutex error: %d\n", ret); - sleep(1); - goto check_keys; - } - if (wait_ret != 0 && wait_ret != ETIMEDOUT) { - err("fb_thread: cond error: %d\n", wait_ret); - sleep(1); + // this is supposed to be done atomically, but to make life + // easier ignore it for now, race impact is low anyway + fb_sync_thread_futex = 0; + + if (wait_ret != 0 && wait_ret != -EWOULDBLOCK + && wait_ret != -ETIMEDOUT) + { + err("fb_thread: futex error: %d\n", wait_ret); + g_sleep(1); goto check_keys; } if (fb_sync_thread_paused) { - ts_add_nsec(ts, 100000000); + ts.tv_nsec = 100000000; goto check_keys; } - if (wait_ret != ETIMEDOUT) { - clock_gettime(CLOCK_REALTIME, &ts); - ts_add_nsec(ts, 50000000); + if (wait_ret == 0) { + ts.tv_nsec = 50000000; manual_refresh++; if (manual_refresh == 2) dbg("fb_thread: switch to manual refresh\n"); } else { - ts_add_nsec(ts, 16666667); + ts.tv_nsec = 16666667; if (manual_refresh > 1) dbg("fb_thread: switch to auto refresh\n"); manual_refresh = 0; @@ -568,7 +571,7 @@ static u32 xread32(u32 a) switch (a_) { case 0x0a00: // TCOUNT, 1/7372800s - clock_gettime(CLOCK_REALTIME, &ts); + g_clock_gettime_raw(CLOCK_REALTIME, &ts); t64 = (u64)ts.tv_sec * 1000000000 + ts.tv_nsec; // t * 7372800.0 / 1000000000 * 0x100000000 ~= t * 31665935 t64 *= 31665935; @@ -633,9 +636,11 @@ static void xwrite16(u32 a, u32 d) return; case 0x2914: mmsp2.mlc_stl_adrh = d; - if (mmsp2.mlc_stl_adr != mmsp2.old_mlc_stl_adr) + if (mmsp2.mlc_stl_adr != mmsp2.old_mlc_stl_adr) { // ask for refresh - pthread_cond_signal(&fb_cond); + fb_sync_thread_futex = 1; + g_futex_raw(&fb_sync_thread_futex, FUTEX_WAKE, 1, NULL); + } mmsp2.old_mlc_stl_adr = mmsp2.mlc_stl_adr; return; case 0x2958: @@ -676,9 +681,11 @@ static void xwrite32(u32 a, u32 d) case 0x4038: // MLCADDRESS0 case 0x406c: // MLCADDRESS1 pollux.mlc_stl_adr = d; - if (d != mmsp2.old_mlc_stl_adr) + if (d != mmsp2.old_mlc_stl_adr) { // ask for refresh - pthread_cond_signal(&fb_cond); + fb_sync_thread_futex = 1; + g_futex_raw(&fb_sync_thread_futex, FUTEX_WAKE, 1, NULL); + } mmsp2.old_mlc_stl_adr = d; return; case 0x403c: // MLCPALETTE0 @@ -725,18 +732,46 @@ static struct op_linkpage *g_linkpage; static u32 *g_code_ptr; static int g_linkpage_count; +enum opcond { + C_EQ, C_NE, C_CS, C_CC, C_MI, C_PL, C_VS, C_VC, + C_HI, C_LS, C_GE, C_LT, C_GT, C_LE, C_AL, +}; +enum cpsr_cond { + CPSR_N = (1u << 31), + CPSR_Z = (1u << 30), + CPSR_C = (1u << 29), + CPSR_V = (1u << 28), +}; + #define BIT_SET(v, b) (v & (1 << (b))) void emu_handle_op(struct op_context *op_ctx, struct op_stackframe *sframe) { u32 *regs = sframe->saved_regs; + u32 cpsr = sframe->cpsr; u32 op = op_ctx->op; u32 t, shift, ret, addr; - int rn, rd; + int i, rn, rd, cond; + cond = (op & 0xf0000000) >> 28; rd = (op & 0x0000f000) >> 12; rn = (op & 0x000f0000) >> 16; + if (cond != 0x0e) { + switch (cond) { + case C_EQ: if ( (cpsr & CPSR_Z)) break; return; + case C_NE: if (!(cpsr & CPSR_Z)) break; return; + case C_CS: if ( (cpsr & CPSR_C)) break; return; + case C_CC: if (!(cpsr & CPSR_C)) break; return; + case C_MI: if ( (cpsr & CPSR_N)) break; return; + case C_PL: if (!(cpsr & CPSR_N)) break; return; + case C_VS: if ( (cpsr & CPSR_V)) break; return; + case C_VC: if (!(cpsr & CPSR_V)) break; return; + default: + goto unhandled; + } + } + if ((op & 0x0f200090) == 0x01000090) { // AM3: LDRH, STRH if (!BIT_SET(op, 5)) // !H goto unhandled; @@ -763,10 +798,12 @@ void emu_handle_op(struct op_context *op_ctx, struct op_stackframe *sframe) else xwrite16(addr, regs[rd]); } - else if ((op & 0x0d200000) == 0x05000000) { // AM2: LDR[B], STR[B] + else if ((op & 0x0c000000) == 0x04000000) { // load/store word/byte + if (BIT_SET(op, 21)) + goto unhandled; // unprivileged if (BIT_SET(op, 25)) { // reg offs if (BIT_SET(op, 4)) - goto unhandled; + goto unhandled; // nah it's media t = regs[op & 0x000f]; shift = (op & 0x0f80) >> 7; @@ -782,7 +819,12 @@ void emu_handle_op(struct op_context *op_ctx, struct op_stackframe *sframe) if (!BIT_SET(op, 23)) t = -t; - addr = regs[rn] + t; + + addr = regs[rn]; + if (BIT_SET(op, 24)) // pre-indexed + addr += t; + if (!BIT_SET(op, 24) || BIT_SET(op, 21)) + regs[rn] += t; // writeback if (BIT_SET(op, 20)) { // Load if (BIT_SET(op, 22)) // Byte @@ -811,6 +853,10 @@ void emu_handle_op(struct op_context *op_ctx, struct op_stackframe *sframe) unhandled: err("unhandled IO op %08x @ %08x\n", op, op_ctx->pc); + for (i = 0; i < 8-1; i++) + err(" r%d=%08x r%-2d=%08x\n", i, regs[i], i+8, regs[i+8]); + err(" r%d=%08x cpsr=%08x\n", i, regs[i], cpsr); + abort(); } static u32 make_offset12(u32 *pc, u32 *target) @@ -875,7 +921,7 @@ static void segv_sigaction(int num, siginfo_t *info, void *ctx) // real crash - time to die err("segv %d %p @ %08x\n", info->si_code, info->si_addr, regs[15]); for (i = 0; i < 8; i++) - dbg(" r%d=%08x r%2d=%08x\n", i, regs[i], i+8, regs[i+8]); + dbg(" r%d=%08x r%-2d=%08x\n", i, regs[i], i+8, regs[i+8]); signal(num, SIG_DFL); raise(num); return; @@ -926,7 +972,6 @@ void emu_init(void *map_bottom) .sa_sigaction = segv_sigaction, .sa_flags = SA_SIGINFO, }; - pthread_t tid; void *pret; int ret; @@ -976,12 +1021,22 @@ void emu_init(void *map_bottom) exit(1); } - ret = pthread_create(&tid, NULL, fb_sync_thread, NULL); - if (ret != 0) { - err("failed to create fb_sync_thread: %d\n", ret); + pret = mmap(NULL, THREAD_STACK_SIZE, PROT_READ|PROT_WRITE|PROT_EXEC, + MAP_PRIVATE|MAP_ANONYMOUS|MAP_GROWSDOWN, -1, 0); + if (mmsp2.umem == MAP_FAILED) { + perror(PFX "mmap thread stack"); + exit(1); + } + fb_sync_thread_futex = 1; + ret = g_clone(CLONE_VM | CLONE_FS | CLONE_FILES + | CLONE_SIGHAND | CLONE_THREAD, + (char *)pret + THREAD_STACK_SIZE, 0, 0, 0, + fb_sync_thread); + if (ret == 0 || ret == -1) { + perror(PFX "start fb thread"); exit(1); } - pthread_detach(tid); + g_futex_raw(&fb_sync_thread_futex, FUTEX_WAIT, 1, NULL); // defaults mmsp2.mlc_stl_adr = 0x03101000; // fb2 is at 0x03381000 @@ -1036,7 +1091,7 @@ static void *emu_mmap_dev(unsigned int length, int prot, int flags, unsigned int err("warning: uppermem @ %08x overflows by %d bytes\n", offset, umem + length - umem_end); - dbg("upper mem @ %08x %d\n", offset, length); + dbg("upper mem @ %08x %x = %p\n", offset, length, umem); return umem; } @@ -1056,6 +1111,19 @@ void *emu_do_mmap(unsigned int length, int prot, int flags, int fd, unsigned int return MAP_FAILED; } +int emu_do_munmap(void *addr, unsigned int length) +{ + u8 *p = addr; + + // don't allow to unmap upper mem + if ((u8 *)mmsp2.umem <= p && p < (u8 *)mmsp2.umem + 0x2000000) { + dbg("ignoring munmap: %p %x\n", addr, length); + return 0; + } + + return -EAGAIN; +} + static void emu_sound_open(int fd) { #ifdef PND @@ -1210,24 +1278,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; } @@ -1258,6 +1329,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; @@ -1265,17 +1337,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); @@ -1326,3 +1406,4 @@ int emu_do_execve(const char *filename, char *const argv[], char *const envp[]) return ret; } +// vim:shiftwidth=2:expandtab