X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=ginge.git;a=blobdiff_plain;f=loader%2Femu.c;h=6ddbb4ada0f9d9c47e0362afe40ea6fbe9ff3495;hp=8dc6d51bae91d97f56963b8bc0ef6f8216128807;hb=8cbb027881eadc228c7a0613b7afb6c566bf86fe;hpb=10c900a1c09d1a3f62dc866df11dcda22c6ec8b7 diff --git a/loader/emu.c b/loader/emu.c index 8dc6d51..6ddbb4a 100644 --- a/loader/emu.c +++ b/loader/emu.c @@ -21,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 @@ -56,7 +59,7 @@ #endif #ifdef LOG_SEGV -#define segvlog printf +#define segvlog g_printf #else #define segvlog(...) #endif @@ -70,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; @@ -147,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 @@ -188,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"); \ } \ } @@ -281,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: @@ -329,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); + // 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); 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; @@ -574,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; @@ -639,15 +636,17 @@ 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: + case 0x2958: // MLC_STL_PALLT_A mmsp2.mlc_stl_pallt_a = d & 0x1ff; return; - case 0x295a: + case 0x295a: // MLC_STL_PALLT_D mmsp2.mlc_stl_pallt_d[mmsp2.mlc_stl_pallt_a++] = d; mmsp2.mlc_stl_pallt_a &= 0x1ff; mmsp2.v.dirty_pal = DIRTY_PAL_MMSP2; @@ -664,6 +663,14 @@ static void xwrite32(u32 a, u32 d) if ((a & 0xfff00000) == 0x7f000000) { u32 a_ = a & 0xffff; switch (a_) { + // GP2X + case 0x295a: // MLC_STL_PALLT_D + // special unaligned 32bit write, allegro seems to rely on it + mmsp2.mlc_stl_pallt_d[mmsp2.mlc_stl_pallt_a++ & 0x1ff] = d; + mmsp2.mlc_stl_pallt_d[mmsp2.mlc_stl_pallt_a++ & 0x1ff] = d >> 16; + mmsp2.mlc_stl_pallt_a &= 0x1ff; + mmsp2.v.dirty_pal = DIRTY_PAL_MMSP2; + return; // Wiz case 0x4024: // MLCCONTROL0 case 0x4058: // MLCCONTROL1 @@ -682,9 +689,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 @@ -971,14 +980,13 @@ void emu_init(void *map_bottom) .sa_sigaction = segv_sigaction, .sa_flags = SA_SIGINFO, }; - pthread_t tid; 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"); + err("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 @@ -1021,12 +1029,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 @@ -1041,39 +1059,24 @@ void emu_init(void *map_bottom) sigaction(SIGSEGV, &segv_action, NULL); } -int emu_read_gpiodev(void *buf, int count) -{ - if (count <= 0) { - err("gpiodev read %d?\n", count); - return -1; - } - if (count > 4) - count = 4; - - mmsp2.btn_state = host_read_btns(); - memcpy(buf, &mmsp2.btn_state, count); - return count; -} - -static void *emu_mmap_dev(unsigned int length, int prot, int flags, unsigned int offset) +static long emu_mmap_dev(unsigned int length, int prot, int flags, unsigned int offset) { u8 *umem, *umem_end; // SoC regs if ((offset & ~0x1ffff) == 0xc0000000) { - return mmap((void *)0x7f000000, length, PROT_NONE, + return g_mmap2_raw((void *)0x7f000000, length, PROT_NONE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED|MAP_NORESERVE, -1, 0); } // MMSP2 blitter if ((offset & ~0xffff) == 0xe0020000) { - return mmap((void *)0x7f100000, length, PROT_NONE, + return g_mmap2_raw((void *)0x7f100000, length, PROT_NONE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED|MAP_NORESERVE, -1, 0); } // upper mem if ((offset & 0xfe000000) != 0x02000000) { err("unexpected devmem mmap @ %08x\n", offset); - errno = EINVAL; - return MAP_FAILED; + return -EINVAL; } umem = uppermem_lookup(offset, &umem_end); @@ -1081,11 +1084,12 @@ 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); - return umem; + dbg("upper mem @ %08x %x = %p\n", offset, length, umem); + return (long)umem; } -void *emu_do_mmap(unsigned int length, int prot, int flags, int fd, unsigned int offset) +long emu_do_mmap(unsigned int length, int prot, int flags, int fd, + unsigned int offset) { if (fd == FAKEDEV_MEM) return emu_mmap_dev(length, prot, flags, offset); @@ -1097,8 +1101,20 @@ void *emu_do_mmap(unsigned int length, int prot, int flags, int fd, unsigned int return emu_mmap_dev(length, prot, flags, offset + 0x03381000); err("bad/ni mmap(?, %d, %x, %x, %d, %08x)\n", length, prot, flags, fd, offset); - errno = EINVAL; - return MAP_FAILED; + return -EINVAL; +} + +long 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) @@ -1108,15 +1124,13 @@ static void emu_sound_open(int fd) // set default buffer size to 16 * 1K frag = (16<<16) | 10; // 16K - ret = ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &frag); - if (ret != 0) { - err("snd ioctl SETFRAGMENT %08x: ", frag); - perror(NULL); - } + ret = g_ioctl_raw(fd, SNDCTL_DSP_SETFRAGMENT, &frag); + if (ret != 0) + err("snd ioctl SETFRAGMENT %08x: %d\n", frag, ret); #endif } -static int emu_sound_ioctl(int fd, int request, void *argp) +static long emu_sound_ioctl(int fd, int request, void *argp) { int *arg = argp; @@ -1132,7 +1146,9 @@ static int emu_sound_ioctl(int fd, int request, void *argp) * Catch this and set to something that works. */ switch(request) { case SNDCTL_DSP_SETFRAGMENT: { - int ret, bsize, frag, frag_cnt; + int bsize, frag, frag_cnt; + long ret; + if (arg == NULL) break; @@ -1157,11 +1173,9 @@ static int emu_sound_ioctl(int fd, int request, void *argp) } frag |= frag_cnt << 16; - ret = ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &frag); - if (ret != 0) { - err("snd ioctl SETFRAGMENT %08x: ", frag); - perror(NULL); - } + ret = g_ioctl_raw(fd, SNDCTL_DSP_SETFRAGMENT, &frag); + if (ret != 0) + err("snd ioctl SETFRAGMENT %08x: %ld\n", frag, ret); // indicate success even if we fail (because of ALSA mostly), // things like MikMod will bail out otherwise. return 0; @@ -1173,10 +1187,10 @@ static int emu_sound_ioctl(int fd, int request, void *argp) break; } - return ioctl(fd, request, argp); + return g_ioctl_raw(fd, request, argp); } -int emu_do_ioctl(int fd, int request, void *argp) +long emu_do_ioctl(int fd, int request, void *argp) { if (fd == emu_interesting_fds[IFD_SOUND].fd) return emu_sound_ioctl(fd, request, argp); @@ -1242,8 +1256,58 @@ int emu_do_ioctl(int fd, int request, void *argp) fail: err("bad/ni ioctl(%d, %08x, %p)\n", fd, request, argp); - errno = EINVAL; - return -1; + return -EINVAL; +} + +static const char wm97xx_p[] = + "5507 0 -831476 0 -4218 16450692 65536"; // from 4.0 fw + +long emu_do_read(int fd, void *buf, int count) +{ + int ret, pressed = 0, x, y; + struct { + u16 pressure, x, y; + } wm97xx; + + if (count < 0) { + err("read(%d, %d)\n", fd, count); + return -EINVAL; + } + + switch (fd) { + case FAKEDEV_GPIO: + mmsp2.btn_state = host_read_btns(); + + if (count > 4) + count = 4; + memcpy(buf, &mmsp2.btn_state, count); + break; + case FAKEDEV_WM97XX: + ret = host_read_ts(&pressed, &x, &y); + if (ret == 0 && pressed) { + wm97xx.pressure = 0x8001; // TODO: check the real thing + wm97xx.x = x * 3750 / 1024 + 200; + wm97xx.y = 3750 - y * 3750 / 1024 + 200; + } + else { + wm97xx.pressure = 0; + wm97xx.x = wm97xx.y = 200; + } + + if (count > sizeof(wm97xx)) + count = sizeof(wm97xx); + memcpy(buf, &wm97xx, count); + break; + case FAKEDEV_WM97XX_P: + if (count < sizeof(wm97xx_p)) + err("incomplete pointercal read\n"); + strncpy(buf, wm97xx_p, count); + break; + default: + dbg("read(%d, %d)\n", fd, count); + return -EINVAL; + } + return count; } struct dev_fd_t emu_interesting_fds[] = { @@ -1256,13 +1320,15 @@ static const struct { const char *to; } path_map[] = { { "/mnt/tmp", "./tmp" }, + { "/mnt/sd", "./mntsd" }, }; -static const char *wrap_path(const char *path) +const char *emu_wrap_path(const char *path) { char *buff, *p; size_t size; int i, len; + long ret; // do only path mapping for now for (i = 0; i < ARRAY_SIZE(path_map); i++) { @@ -1277,6 +1343,11 @@ static const char *wrap_path(const char *path) 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); + + ret = g_mkdir_raw(path_map[i].to, 0666); + if (ret != 0 && ret != -EEXIST) + err("mkdir(%s): %ld\n", path_map[i].to, ret); + return buff; } } @@ -1284,7 +1355,7 @@ static const char *wrap_path(const char *path) return path; } -static void wrap_path_free(const char *w_path, const char *old_path) +void emu_wrap_path_free(const char *w_path, const char *old_path) { if (w_path != old_path) free((void *)w_path); @@ -1295,9 +1366,23 @@ void *emu_do_fopen(const char *path, const char *mode) const char *w_path; FILE *ret; - w_path = wrap_path(path); - ret = fopen(w_path, mode); - wrap_path_free(w_path, path); + if (strcmp(path, "/etc/pointercal") == 0) { + // use local pontercal, not host's + ret = fopen("pointercal", mode); + if (ret == NULL) { + ret = fopen("pointercal", "w"); + if (ret != NULL) { + fwrite(wm97xx_p, 1, sizeof(wm97xx_p), ret); + fclose(ret); + } + ret = fopen("pointercal", mode); + } + } + else { + w_path = emu_wrap_path(path); + ret = fopen(w_path, mode); + emu_wrap_path_free(w_path, path); + } return ret; } @@ -1324,7 +1409,7 @@ int emu_do_system(const char *command) // absolute path, but not a system command need_ginge = 1; - p2 = wrap_path(command); + p2 = emu_wrap_path(command); if (need_ginge) { make_local_path(tmp_path, sizeof(tmp_path), "ginge_prep"); p = tmp_path + strlen(tmp_path); @@ -1333,7 +1418,7 @@ int emu_do_system(const char *command) } else snprintf(tmp_path, sizeof(tmp_path), "%s", p2); - wrap_path_free(p2, command); + emu_wrap_path_free(p2, command); dbg("system: \"%s\"\n", tmp_path); @@ -1344,17 +1429,19 @@ int emu_do_system(const char *command) return ret; } -int emu_do_execve(const char *filename, char *const argv[], char *const envp[]) +long emu_do_execve(const char *filename, char * const argv[], + char * const envp[]) { const char **new_argv; char *prep_path; - int i, ret, argc; + int i, argc; + long ret; if (filename == NULL) return -1; - if (strstr(filename, "/gp2xmenu") != NULL) - exit(0); + if (strstr(filename, "gp2xmenu") != NULL) + host_forced_exit(0); for (i = 0; argv[i] != NULL; i++) ; @@ -1371,7 +1458,7 @@ int emu_do_execve(const char *filename, char *const argv[], char *const envp[]) make_local_path(prep_path, 512, "ginge_prep"); new_argv[0] = prep_path; new_argv[1] = "--nomenu"; - new_argv[2] = wrap_path(filename); + new_argv[2] = emu_wrap_path(filename); if (argv[0] != NULL) for (i = 1; argv[i] != NULL; i++) @@ -1379,7 +1466,7 @@ int emu_do_execve(const char *filename, char *const argv[], char *const envp[]) dbg("execve \"%s\" %s \"%s\"\n", new_argv[0], new_argv[1], new_argv[2]); ret = execve(new_argv[0], (char **)new_argv, envp); - perror("execve"); + err("execve(%s): %ld\n", new_argv[0], ret); return ret; }