X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=ginge.git;a=blobdiff_plain;f=loader%2Femu.c;h=6ddbb4ada0f9d9c47e0362afe40ea6fbe9ff3495;hp=5c2412078fcd269c9cf77df88ed7f6023091daf3;hb=8cbb027881eadc228c7a0613b7afb6c566bf86fe;hpb=db9191ed7ea2e1c190b4445bf3c576b206c88b36 diff --git a/loader/emu.c b/loader/emu.c index 5c24120..6ddbb4a 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,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! +#endif #include #include #include #include +#include #include #include #include @@ -11,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 @@ -46,7 +59,7 @@ #endif #ifdef LOG_SEGV -#define segvlog printf +#define segvlog g_printf #else #define segvlog(...) #endif @@ -60,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; @@ -87,9 +102,10 @@ static struct { #define CTRL_TRANSPARENCYENB (1 << 11) static struct { + // mmsp2 u16 mlc_stl_cntl; union { - u32 mlc_stl_adr; + u32 mlc_stl_adr; // mlcaddress for pollux struct { u16 mlc_stl_adrl; u16 mlc_stl_adrh; @@ -101,12 +117,26 @@ static struct { u32 mlc_stl_pallt_d32[256]; }; + // pollux + u32 mlccontrol; + u16 mlcpalette[256]; + // state void *umem; u32 old_mlc_stl_adr; - u32 btn_state; // as seen through /dev/GPIO - u32 dirty_pal:1; + u32 btn_state; // as seen through /dev/GPIO: 0PVdVu YXBA RLSeSt 0Ri0Dn 0Le0Up + struct { + u32 width, height; + u32 stride; + u32 bpp; + u32 dirty_pal:2; + } v; } mmsp2; +#define pollux mmsp2 // so that code doesn't look that weird +enum { + DIRTY_PAL_MMSP2 = 1, + DIRTY_PAL_POLLUX = 2, +}; #if defined(LOG_IO) || defined(LOG_IO_UNK) @@ -122,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 @@ -163,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"); \ } \ } @@ -256,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: @@ -267,14 +299,17 @@ bad_blit: } // FIXME: pass real dimensions to blitters -static void mlc_flip(void *src, int bpp) +static void mlc_flip(void *src, int bpp, int stride) { static int old_bpp; // only pass pal to host if it's dirty - if (bpp <= 8 && mmsp2.dirty_pal) { - host_video_update_pal(mmsp2.mlc_stl_pallt_d32); - mmsp2.dirty_pal = 0; + if (bpp <= 8 && mmsp2.v.dirty_pal) { + if (mmsp2.v.dirty_pal == DIRTY_PAL_MMSP2) + host_video_update_pal32(mmsp2.mlc_stl_pallt_d32); + else + host_video_update_pal16(mmsp2.mlcpalette); + mmsp2.v.dirty_pal = 0; } if (bpp != old_bpp) { @@ -284,15 +319,15 @@ static void mlc_flip(void *src, int bpp) switch (bpp) { case 4: - host_video_blit4(src, 320, 240); + host_video_blit4(src, 320, 240, stride); break; case 8: - host_video_blit8(src, 320, 240); + host_video_blit8(src, 320, 240, stride); break; case 16: - host_video_blit16(src, 320, 240); + host_video_blit16(src, 320, 240, stride); break; case 24: @@ -301,75 +336,62 @@ static void mlc_flip(void *src, int bpp) } } -#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; - struct timespec ts; - int ret, wait_ret; + int frame_counter = 0; + 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; - int mode, bpp; - 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); - continue; - } - 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); - continue; + goto check_keys; } if (fb_sync_thread_paused) { - ts_add_nsec(ts, 100000000); - continue; + 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; } - mode = (mmsp2.mlc_stl_cntl >> 9) & 3; - bpp = mode ? mode * 8 : 4; - gp2x_fb = uppermem_lookup(mmsp2.mlc_stl_adr, &gp2x_fb_end); - if (gp2x_fb == NULL || gp2x_fb + 320*240 * bpp / 8 > gp2x_fb_end) { + if (gp2x_fb == NULL || gp2x_fb + 320*240 * mmsp2.v.bpp / 8 > gp2x_fb_end) { if (!invalid_fb_addr) { err("fb_thread: %08x is out of range\n", mmsp2.mlc_stl_adr); invalid_fb_addr = 1; @@ -377,7 +399,17 @@ static void *fb_sync_thread(void *arg) continue; } - mlc_flip(gp2x_fb, bpp); + invalid_fb_addr = 0; + mlc_flip(gp2x_fb, mmsp2.v.bpp, mmsp2.v.stride); + + frame_counter++; + if (frame_counter & 0x0f) + continue; + +check_keys: + // this is to check for kill key, in case main thread hung + // or something else went wrong. + pollux.btn_state = host_read_btns(); } } @@ -394,6 +426,51 @@ static void fb_thread_resume(void) fb_sync_thread_paused = 0; } +static u32 xread32_io_cmn(u32 a, u32 *handled) +{ + u32 d = 0; + + *handled = 1; + switch (a) { + // Wiz stuff + case 0x402c: // MLCVSTRIDE0 + case 0x4060: // MLCVSTRIDE1 + d = pollux.v.stride; + break; + case 0x4038: // MLCADDRESS0 + case 0x406c: // MLCADDRESS1 + d = pollux.mlc_stl_adr; + break; + // wiz_lib reads: + // ???? ???? YXBA DURiLe ???? VdVuMS LR?? ???? + // | GPIOC[31:16] | GPIOB[31:16] | + case 0xa058: // GPIOBPAD + 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; + d <<= 16; + d = ~d; + break; + case 0xa098: // GPIOCPAD + pollux.btn_state = host_read_btns(); + d = (pollux.btn_state >> 8) & 0x00f0; + d |= (pollux.btn_state >> 1) & 0x0008; + d |= (pollux.btn_state << 2) & 0x0004; + d |= (pollux.btn_state >> 5) & 0x0002; + d |= (pollux.btn_state >> 2) & 0x0001; + d <<= 16; + d = ~d; + break; + default: + *handled = 0; + break; + } + + return d; +} + static u32 xread8(u32 a) { iolog("r8 ", a, 0, 8); @@ -414,8 +491,8 @@ static u32 xread16(u32 a) d = 0x9407; break; // minilib reads as: - // 0000 P000 VuVd00 0000 YXBA RLSeSt 0R0D 0L0U - // | GPIOD |GPIOC[8:15]|GPIOM[0:7]| + // 0000 P000 VuVd00 0000 YXBA RLSeSt 0Ri0D 0Le0U + // | GPIOD |GPIOC[8:15]|GPIOM[0:7] | // /dev/GPIO: // ... 0PVdVu ... case 0x1184: // GPIOC @@ -457,13 +534,19 @@ static u32 xread16(u32 a) case 0x2958: d = mmsp2.mlc_stl_pallt_a; break; + default: - goto unh; + d = xread32_io_cmn(a_, &t); + if (!t) + goto unk; + if (!(a_ & 2)) + d >>= 16; + break; } goto out; } -unh: +unk: if (a == old_a) { d = fudge; fudge = ~fudge; @@ -484,16 +567,24 @@ static u32 xread32(u32 a) u32 a_ = a & 0xffff; struct timespec ts; u64 t64; + u32 t; 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; d = t64 >> 32; break; + + default: + d = xread32_io_cmn(a_, &t); + if (!t) + goto unh; + break; } + goto out; } if ((a & 0xfff00000) == 0x7f100000) { u32 *bl = &blitter.dstctrl; @@ -505,6 +596,8 @@ static u32 xread32(u32 a) goto out; } } + +unh: iolog_unh("r32", a, d, 32); out: @@ -524,31 +617,40 @@ static void xwrite16(u32 a, u32 d) if ((a & 0xfff00000) == 0x7f000000) { u32 a_ = a & 0xffff; switch (a_) { - case 0x28da: - mmsp2.mlc_stl_cntl = d | 0xaa; - break; - case 0x290e: - case 0x2910: - // odd addresses don't affect LCD. What about TV? - return; - case 0x2912: - mmsp2.mlc_stl_adrl = d; - return; - case 0x2914: - mmsp2.mlc_stl_adrh = d; - if (mmsp2.mlc_stl_adr != mmsp2.old_mlc_stl_adr) - // ask for refresh - pthread_cond_signal(&fb_cond); - mmsp2.old_mlc_stl_adr = mmsp2.mlc_stl_adr; - return; - case 0x2958: - mmsp2.mlc_stl_pallt_a = d & 0x1ff; - return; - case 0x295a: - mmsp2.mlc_stl_pallt_d[mmsp2.mlc_stl_pallt_a++] = d; - mmsp2.mlc_stl_pallt_a &= 0x1ff; - mmsp2.dirty_pal = 1; - return; + case 0x28da: { + int mode; + mmsp2.mlc_stl_cntl = d | 0xaa; + mode = (d >> 9) & 3; + mmsp2.v.bpp = mode ? mode * 8 : 4; + break; + } + case 0x290c: + mmsp2.v.stride = d; + return; + case 0x290e: + case 0x2910: + // odd addresses don't affect LCD. What about TV? + return; + case 0x2912: + mmsp2.mlc_stl_adrl = d; + return; + case 0x2914: + mmsp2.mlc_stl_adrh = d; + if (mmsp2.mlc_stl_adr != mmsp2.old_mlc_stl_adr) { + // ask for refresh + 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: // MLC_STL_PALLT_A + mmsp2.mlc_stl_pallt_a = d & 0x1ff; + return; + 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; + return; } } iolog_unh("w16", a, d, 16); @@ -558,6 +660,49 @@ static void xwrite32(u32 a, u32 d) { iolog("w32", a, d, 32); + 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 + pollux.mlccontrol = d; + if (!(d & 0x20)) + return; // layer not enabled + if ((d >> 16) == 0x443A) + pollux.v.bpp = 8; + else + pollux.v.bpp = 16; + return; + case 0x402c: // MLCVSTRIDE0 + case 0x4060: // MLCVSTRIDE1 + pollux.v.stride = d; + return; + case 0x4038: // MLCADDRESS0 + case 0x406c: // MLCADDRESS1 + pollux.mlc_stl_adr = d; + if (d != mmsp2.old_mlc_stl_adr) { + // ask for refresh + 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 + case 0x4070: // MLCPALETTE1 + pollux.mlcpalette[d >> 24] = d; + pollux.v.dirty_pal = DIRTY_PAL_POLLUX; + return; + } + } if ((a & 0xfff00000) == 0x7f100000) { u32 *bl = &blitter.dstctrl; u32 a_ = a & 0xfff; @@ -595,18 +740,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; @@ -633,10 +806,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; @@ -652,7 +827,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 @@ -681,6 +861,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) @@ -745,7 +929,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; @@ -796,10 +980,17 @@ 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) { + 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 + 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); @@ -823,72 +1014,69 @@ 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"); 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); - // mmsp2 defaults + // defaults mmsp2.mlc_stl_adr = 0x03101000; // fb2 is at 0x03381000 mmsp2.mlc_stl_cntl = 0x4ab; // 16bpp, region 1 active + mmsp2.v.width = 320; + mmsp2.v.height = 240; + mmsp2.v.stride = 320*2; + mmsp2.v.bpp = 16; + mmsp2.v.dirty_pal = 1; sigemptyset(&segv_action.sa_mask); 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; -} - -struct dev_fd_t emu_interesting_fds[] = { - [IFD_SOUND] = { "/dev/dsp", -1 }, - { NULL, 0 }, -}; - -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 & ~0xffff) == 0xc0000000) { - return mmap((void *)0x7f000000, length, PROT_NONE, + if ((offset & ~0x1ffff) == 0xc0000000) { + return g_mmap2_raw((void *)0x7f000000, length, PROT_NONE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED|MAP_NORESERVE, -1, 0); } - // blitter + // 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); @@ -896,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); @@ -912,11 +1101,36 @@ 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) +{ +#ifdef PND + int ret, frag; + + // set default buffer size to 16 * 1K + frag = (16<<16) | 10; // 16K + 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; @@ -930,29 +1144,53 @@ static int emu_sound_ioctl(int fd, int request, void *argp) /* People set strange frag settings on GP2X, which even manage * to break audio on pandora (causes writes to fail). * Catch this and set to something that works. */ - if (request == SNDCTL_DSP_SPEED) { - int ret, bsize, frag; - - // ~4ms. gpSP wants small buffers or else it stutters - // because of it's audio thread sync stuff - bsize = *arg / 250 * 4; - for (frag = 0; bsize; bsize >>= 1, frag++) - ; - - frag |= 16 << 16; // fragment count - ret = ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &frag); - if (ret != 0) { - err("snd ioctl SETFRAGMENT %08x: ", frag); - perror(NULL); + switch(request) { + case SNDCTL_DSP_SETFRAGMENT: { + int bsize, frag, frag_cnt; + long ret; + + if (arg == NULL) + break; + + frag = *arg & 0xffff; + frag_cnt = *arg >> 16; + bsize = frag_cnt << frag; + if (frag < 10 || bsize < 4096*4 || bsize > 4096*4*2) { + /* + * ~4ms. gpSP wants small buffers or else it stutters + * because of it's audio thread sync stuff + * XXX: hardcoding, as low samplerates will result in small fragment size, + * which itself causes ALSA stall and hangs the program. + * Also some apps change samplerate without reopening /dev/dsp, + * which causes ALSA to reject SNDCTL_DSP_SETFRAGMENT. + */ + bsize = 44100 / 250 * 4; + + for (frag = 0; bsize; bsize >>= 1, frag++) + ; + + frag_cnt = 16; + } + + frag |= frag_cnt << 16; + 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; } + case SNDCTL_DSP_SYNC: + // Franxis tends to use sync/write loops, bad idea under ALSA + return 0; + default: + break; } - else if (request == SNDCTL_DSP_SETFRAGMENT) - return 0; - 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); @@ -1018,33 +1256,98 @@ 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[] = { + [IFD_SOUND] = { "/dev/dsp", -1, emu_sound_open }, + { NULL, 0, NULL }, +}; + static const struct { const char *from; const char *to; } path_map[] = { - { "/mnt/tmp/", "/tmp/" }, + { "/mnt/tmp", "./tmp" }, + { "/mnt/sd", "./mntsd" }, }; -static const char *wrap_path(const char *path) +const char *emu_wrap_path(const char *path) { - char *buff; + 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++) { - 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); + + 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; } } @@ -1052,13 +1355,35 @@ static const char *wrap_path(const char *path) return path; } +void emu_wrap_path_free(const char *w_path, const char *old_path) +{ + if (w_path != old_path) + free((void *)w_path); +} + void *emu_do_fopen(const char *path, const char *mode) { - const char *w_path = wrap_path(path); + const char *w_path; FILE *ret; - ret = fopen(w_path, mode); - if (w_path != path) - free((void *)w_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; } @@ -1066,6 +1391,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; @@ -1073,19 +1399,26 @@ 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++) + ; + + 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; - make_local_path(tmp_path, sizeof(tmp_path), "ginge_prep"); - p = tmp_path + strlen(tmp_path); + p2 = emu_wrap_path(command); + if (need_ginge) { + make_local_path(tmp_path, sizeof(tmp_path), "ginge_prep"); + p = tmp_path + strlen(tmp_path); - p2 = wrap_path(command); - snprintf(p, sizeof(tmp_path) - (p - tmp_path), " %s", p2); - if (p2 != command) - free((void *)p2); + snprintf(p, sizeof(tmp_path) - (p - tmp_path), " --nomenu %s", p2); + } + else + snprintf(tmp_path, sizeof(tmp_path), "%s", p2); + emu_wrap_path_free(p2, command); dbg("system: \"%s\"\n", tmp_path); @@ -1096,3 +1429,45 @@ int emu_do_system(const char *command) return ret; } +long emu_do_execve(const char *filename, char * const argv[], + char * const envp[]) +{ + const char **new_argv; + char *prep_path; + int i, argc; + long ret; + + if (filename == NULL) + return -1; + + if (strstr(filename, "gp2xmenu") != NULL) + host_forced_exit(0); + + for (i = 0; argv[i] != NULL; i++) + ; + argc = i + 1; + + new_argv = calloc(argc + 2, sizeof(new_argv[0])); + if (new_argv == NULL) + return -1; + + prep_path = malloc(512); + if (prep_path == NULL) + return -1; + + make_local_path(prep_path, 512, "ginge_prep"); + new_argv[0] = prep_path; + new_argv[1] = "--nomenu"; + new_argv[2] = emu_wrap_path(filename); + + if (argv[0] != NULL) + for (i = 1; argv[i] != NULL; i++) + new_argv[i + 2] = argv[i]; + + dbg("execve \"%s\" %s \"%s\"\n", new_argv[0], new_argv[1], new_argv[2]); + ret = execve(new_argv[0], (char **)new_argv, envp); + err("execve(%s): %ld\n", new_argv[0], ret); + return ret; +} + +// vim:shiftwidth=2:expandtab