X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=psp%2Femu.c;h=09b5d46eba090c0ee6f1cb02e94f863a8b16cdee;hb=84e21f25e41b90d9729088dba5991a84330964ea;hp=b7d6baea2bee92922365338917df61adc152902e;hpb=60a10527f24efc63bdca6815914a240d706236db;p=libpicofe.git diff --git a/psp/emu.c b/psp/emu.c index b7d6bae..09b5d46 100644 --- a/psp/emu.c +++ b/psp/emu.c @@ -1,3 +1,8 @@ +// (c) Copyright 2007 notaz, All rights reserved. +// Free for non-commercial use. + +// For commercial use, separate licencing terms must be obtained. + #include #include #include // PATH_MAX @@ -11,11 +16,14 @@ #include "psp.h" #include "menu.h" #include "emu.h" +#include "mp3.h" +#include "asm_utils.h" #include "../common/emu.h" +#include "../common/config.h" #include "../common/lprintf.h" #include "../../Pico/PicoInt.h" -#define OSD_FPS_X 424 +#define OSD_FPS_X 432 // additional pspaudio imports, credits to crazyc int sceAudio_38553111(unsigned short samples, unsigned short freq, char unknown); // play with conversion? @@ -26,9 +34,8 @@ int sceAudioOutput2GetRestSample(); char romFileName[PATH_MAX]; unsigned char *PicoDraw2FB = (unsigned char *)VRAM_CACHED_STUFF + 8; // +8 to be able to skip border with 1 quadword.. -int engineState; +int engineState = PGS_Menu; -static int combo_keys = 0, combo_acts = 0; // keys and actions which need button combos static unsigned int noticeMsgTime = 0; int reset_timing = 0; // do we need this? @@ -57,7 +64,7 @@ static void osd_text(int x, const char *text, int is_active, int clear_all) for (h = 0; h < 8; h++) { p = (int *) (screen+x+512*(264+h)); p = (int *) ((int)p & ~3); // align - memset32(p, 0, len); + memset32_uncached(p, 0, len); } if (is_active) { tmp = psp_screen; psp_screen = screen; } // nasty pointer tricks emu_textOut16(x, 264, text); @@ -104,60 +111,60 @@ void emu_Deinit(void) SRam.changed = 0; } - if (!(currentConfig.EmuOpt & 0x20)) { - FILE *f = fopen(PicoConfigFile, "r+b"); - if (!f) emu_WriteConfig(0); - else { - // if we already have config, reload it, except last ROM - fseek(f, sizeof(currentConfig.lastRomFile), SEEK_SET); - fread(¤tConfig.EmuOpt, 1, sizeof(currentConfig) - sizeof(currentConfig.lastRomFile), f); - fseek(f, 0, SEEK_SET); - fwrite(¤tConfig, 1, sizeof(currentConfig), f); - fflush(f); - fclose(f); - } - } + if (!(currentConfig.EmuOpt & 0x20)) + config_writelrom(PicoConfigFile); PicoExit(); sound_deinit(); } +void emu_prepareDefaultConfig(void) +{ + memset(&defaultConfig, 0, sizeof(defaultConfig)); + defaultConfig.EmuOpt = 0x1d | 0x680; // | <- confirm_save, cd_leds, acc rend + defaultConfig.s_PicoOpt = 0x0f | POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_MCD_GFX; + defaultConfig.s_PsndRate = 22050; + defaultConfig.s_PicoRegion = 0; // auto + defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP + defaultConfig.s_PicoCDBuffers = 64; + defaultConfig.Frameskip = -1; // auto + defaultConfig.CPUclock = 333; + defaultConfig.KeyBinds[ 4] = 1<<0; // SACB RLDU + defaultConfig.KeyBinds[ 6] = 1<<1; + defaultConfig.KeyBinds[ 7] = 1<<2; + defaultConfig.KeyBinds[ 5] = 1<<3; + defaultConfig.KeyBinds[14] = 1<<4; + defaultConfig.KeyBinds[13] = 1<<5; + defaultConfig.KeyBinds[15] = 1<<6; + defaultConfig.KeyBinds[ 3] = 1<<7; + defaultConfig.KeyBinds[12] = 1<<26; // switch rnd + defaultConfig.KeyBinds[ 8] = 1<<27; // save state + defaultConfig.KeyBinds[ 9] = 1<<28; // load state + defaultConfig.KeyBinds[28] = 1<<0; // num "buttons" + defaultConfig.KeyBinds[30] = 1<<1; + defaultConfig.KeyBinds[31] = 1<<2; + defaultConfig.KeyBinds[29] = 1<<3; + defaultConfig.scaling = 1; // bilinear filtering for psp + defaultConfig.scale = 1.20; // fullscreen + defaultConfig.hscale40 = 1.25; + defaultConfig.hscale32 = 1.56; +} + void emu_setDefaultConfig(void) { - memset(¤tConfig, 0, sizeof(currentConfig)); - currentConfig.lastRomFile[0] = 0; - currentConfig.EmuOpt = 0x1f | 0x680; // | confirm_save, cd_leds, 16bit rend - currentConfig.PicoOpt = 0x0f | 0xc00; // | cd_pcm, cd_cdda - currentConfig.PsndRate = 22050; - currentConfig.PicoRegion = 0; // auto - currentConfig.PicoAutoRgnOrder = 0x184; // US, EU, JP - currentConfig.Frameskip = -1; // auto - currentConfig.volume = 50; - currentConfig.CPUclock = 333; - currentConfig.KeyBinds[ 4] = 1<<0; // SACB RLDU - currentConfig.KeyBinds[ 6] = 1<<1; - currentConfig.KeyBinds[ 7] = 1<<2; - currentConfig.KeyBinds[ 5] = 1<<3; - currentConfig.KeyBinds[14] = 1<<4; - currentConfig.KeyBinds[13] = 1<<5; - currentConfig.KeyBinds[15] = 1<<6; - currentConfig.KeyBinds[ 3] = 1<<7; - currentConfig.KeyBinds[12] = 1<<26; // switch rnd - currentConfig.KeyBinds[ 8] = 1<<27; // save state - currentConfig.KeyBinds[ 9] = 1<<28; // load state - currentConfig.KeyBinds[28] = 1<<0; // num "buttons" - currentConfig.KeyBinds[30] = 1<<1; - currentConfig.KeyBinds[31] = 1<<2; - currentConfig.KeyBinds[29] = 1<<3; - currentConfig.PicoCDBuffers = 64; - currentConfig.scaling = 1; // bilinear filtering for psp - currentConfig.scale = 1.20; // fullscreen - currentConfig.hscale40 = 1.25; - currentConfig.hscale32 = 1.56; + memcpy(¤tConfig, &defaultConfig, sizeof(currentConfig)); + PicoOpt = currentConfig.s_PicoOpt; + PsndRate = currentConfig.s_PsndRate; + PicoRegionOverride = currentConfig.s_PicoRegion; + PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder; + PicoCDBuffers = currentConfig.s_PicoCDBuffers; } extern void amips_clut(unsigned short *dst, unsigned char *src, unsigned short *pal, int count); +extern void amips_clut_6bit(unsigned short *dst, unsigned char *src, unsigned short *pal, int count); + +extern void (*amips_clut_f)(unsigned short *dst, unsigned char *src, unsigned short *pal, int count) = NULL; struct Vertex { @@ -172,7 +179,7 @@ static int fbimg_offs = 0; static void set_scaling_params(void) { - int src_width, fbimg_width, fbimg_height, fbimg_xoffs, fbimg_yoffs; + int src_width, fbimg_width, fbimg_height, fbimg_xoffs, fbimg_yoffs, border_hack = 0; g_vertices[0].x = g_vertices[0].y = g_vertices[0].z = g_vertices[1].z = 0; @@ -185,9 +192,12 @@ static void set_scaling_params(void) src_width = 256; } + if (fbimg_width & 1) fbimg_width++; // make even + if (fbimg_height & 1) fbimg_height++; + if (fbimg_width >= 480) { g_vertices[0].u = (fbimg_width-480)/2; - g_vertices[1].u = src_width - (fbimg_width-480)/2; + g_vertices[1].u = src_width - (fbimg_width-480)/2 - 1; fbimg_width = 480; fbimg_xoffs = 0; } else { @@ -195,6 +205,7 @@ static void set_scaling_params(void) g_vertices[1].u = src_width; fbimg_xoffs = 240 - fbimg_width/2; } + if (fbimg_width > 320 && fbimg_width <= 480) border_hack = 1; if (fbimg_height >= 272) { g_vertices[0].v = (fbimg_height-272)/2; @@ -211,6 +222,12 @@ static void set_scaling_params(void) g_vertices[1].y = fbimg_height; if (fbimg_xoffs < 0) fbimg_xoffs = 0; if (fbimg_yoffs < 0) fbimg_yoffs = 0; + if (border_hack) { + g_vertices[0].u++; + g_vertices[0].x++; + g_vertices[1].u--; + g_vertices[1].x--; + } fbimg_offs = (fbimg_yoffs*512 + fbimg_xoffs) * 2; // dst is always 16bit /* @@ -221,33 +238,40 @@ static void set_scaling_params(void) */ } -static void do_pal_update(int allow_sh) +static void do_pal_update(int allow_sh, int allow_as) { - unsigned int *spal=(void *)Pico.cram; unsigned int *dpal=(void *)localPal; int i; - for (i = 0x3f/2; i >= 0; i--) - dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4); + //for (i = 0x3f/2; i >= 0; i--) + // dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4); + do_pal_convert(localPal, Pico.cram, currentConfig.gamma, currentConfig.gamma2); + + Pico.m.dirtyPal = 0; + need_pal_upload = 1; if (allow_sh && (Pico.video.reg[0xC]&8)) // shadow/hilight? { // shadowed pixels for (i = 0x3f/2; i >= 0; i--) - dpal[0x20|i] = dpal[0x60|i] = (dpal[i]>>1)&0x738e738e; + dpal[0x20|i] = dpal[0x60|i] = (dpal[i]>>1)&0x7bcf7bcf; // hilighted pixels for (i = 0x3f; i >= 0; i--) { - int t=localPal[i]&0xe71c;t+=0x4208; - if (t&0x20) t|=0x1c; - if (t&0x800) t|=0x700; - if (t&0x10000) t|=0xe000; - t&=0xe71c; + int t=localPal[i]&0xf79e;t+=0x4208; + if (t&0x20) t|=0x1e; + if (t&0x800) t|=0x780; + if (t&0x10000) t|=0xf000; + t&=0xf79e; localPal[0x80|i]=(unsigned short)t; } localPal[0xe0] = 0; } - Pico.m.dirtyPal = 0; - need_pal_upload = 1; + else if (allow_as && (rendstatus & PDRAW_ACC_SPRITES)) + { + memcpy32(localPal+0x40, localPal, 0x40); + memcpy32(localPal+0x80, localPal, 0x40); + memcpy32(localPal+0xc0, localPal, 0x40); + } } static void do_slowmode_lines(int line_to) @@ -258,7 +282,7 @@ static void do_slowmode_lines(int line_to) if (!(Pico.video.reg[1]&8)) { line = 8; dst += 512*8; src += 512*8; } for (; line < line_to; line++, dst+=512, src+=512) - amips_clut(dst, src, localPal, line_len); + amips_clut_f(dst, src, localPal, line_len); } static void EmuScanPrepare(void) @@ -268,10 +292,23 @@ static void EmuScanPrepare(void) dynamic_palette = 0; if (Pico.m.dirtyPal) - do_pal_update(1); + do_pal_update(1, 1); + if ((rendstatus & PDRAW_ACC_SPRITES) && !(Pico.video.reg[0xC]&8)) + amips_clut_f = amips_clut_6bit; + else amips_clut_f = amips_clut; } -static int EmuScanSlow(unsigned int num, void *sdata) +static int EmuScanSlowBegin(unsigned int num) +{ + if (!(Pico.video.reg[1]&8)) num += 8; + + if (!dynamic_palette) + HighCol = (unsigned char *)VRAM_CACHED_STUFF + num * 512 + 8; + + return 0; +} + +static int EmuScanSlowEnd(unsigned int num) { if (!(Pico.video.reg[1]&8)) num += 8; @@ -280,15 +317,14 @@ static int EmuScanSlow(unsigned int num, void *sdata) do_slowmode_lines(num); dynamic_palette = 1; } - do_pal_update(1); + do_pal_update(1, 0); } if (dynamic_palette) { int line_len = (Pico.video.reg[12]&1) ? 320 : 256; void *dst = (char *)VRAM_STUFF + 512*240 + 512*2*num; - amips_clut(dst, HighCol + 8, localPal, line_len); - } else - HighCol = (unsigned char *)VRAM_CACHED_STUFF + (num+1)*512 + 8; + amips_clut_f(dst, HighCol + 8, localPal, line_len); + } return 0; } @@ -321,7 +357,7 @@ static void blitscreen_clut(void) } if ((PicoOpt&0x10) && Pico.m.dirtyPal) - do_pal_update(0); + do_pal_update(0, 0); sceKernelDcacheWritebackAll(); @@ -371,7 +407,7 @@ static void cd_leds(void) *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; } - +#if 0 static void dbg_text(void) { int *p, h, len; @@ -382,11 +418,11 @@ static void dbg_text(void) for (h = 0; h < 8; h++) { p = (int *) ((unsigned short *) psp_screen+2+512*(256+h)); p = (int *) ((int)p & ~3); // align - memset32(p, 0, len); + memset32_uncached(p, 0, len); } emu_textOut16(2, 256, text); } - +#endif /* called after rendering is done, but frame emulation is not finished */ void blit1(void) @@ -415,9 +451,9 @@ static void blit2(const char *fps, const char *notice, int lagging_behind) if (emu_opt & 2) osd_text(OSD_FPS_X, fps, 0, 0); } - dbg_text(); + //dbg_text(); - if ((emu_opt & 0x400) && (PicoMCD & 1)) + if ((emu_opt & 0x400) && (PicoAHW & PAHW_MCD)) cd_leds(); if (currentConfig.EmuOpt & 0x2000) { // want vsync @@ -431,15 +467,15 @@ static void blit2(const char *fps, const char *notice, int lagging_behind) static void clearArea(int full) { if (full) { - memset32(psp_screen, 0, 512*272*2/4); + memset32_uncached(psp_screen, 0, 512*272*2/4); psp_video_flip(0); - memset32(psp_screen, 0, 512*272*2/4); + memset32_uncached(psp_screen, 0, 512*272*2/4); memset32(VRAM_CACHED_STUFF, 0xe0e0e0e0, 512*240/4); memset32((int *)VRAM_CACHED_STUFF+512*240/4, 0, 512*240*2/4); } else { void *fb = psp_video_get_active_fb(); - memset32((int *)((char *)psp_screen + 512*264*2), 0, 512*8*2/4); - memset32((int *)((char *)fb + 512*264*2), 0, 512*8*2/4); + memset32_uncached((int *)((char *)psp_screen + 512*264*2), 0, 512*8*2/4); + memset32_uncached((int *)((char *)fb + 512*264*2), 0, 512*8*2/4); } } @@ -462,7 +498,8 @@ static void vidResetMode(void) // slow rend. PicoDrawSetColorFormat(-1); - PicoScan = EmuScanSlow; + PicoScanBegin = EmuScanSlowBegin; + PicoScanEnd = EmuScanSlowEnd; localPal[0xe0] = 0; Pico.m.dirtyPal = 1; @@ -497,7 +534,7 @@ static int sound_thread(SceSize args, void *argp) { if (samples_made - samples_done < samples_block) { // wait for data (use at least 2 blocks) - lprintf("sthr: wait... (%i)\n", samples_made - samples_done); + //lprintf("sthr: wait... (%i)\n", samples_made - samples_done); while (samples_made - samples_done <= samples_block*2 && !sound_thread_exit) ret = sceKernelWaitSema(sound_sem, 1, 0); if (ret < 0) lprintf("sthr: sceKernelWaitSema: %i\n", ret); @@ -512,12 +549,13 @@ static int sound_thread(SceSize args, void *argp) snd_playptr += samples_block; if (snd_playptr >= sndBuffer_endptr) snd_playptr = sndBuffer; - if (ret) - lprintf("sthr: outf: %i; pos %i/%i\n", ret, samples_done, samples_made); + // 1.5 kernel returns 0, newer ones return # of samples queued + if (ret < 0) + lprintf("sthr: sceAudio_E0727056: %08x; pos %i/%i\n", ret, samples_done, samples_made); // shouln't happen, but just in case if (samples_made - samples_done >= samples_block*3) { - lprintf("sthr: block skip (%i)\n", samples_made - samples_done); + //lprintf("sthr: block skip (%i)\n", samples_made - samples_done); samples_done += samples_block; // skip snd_playptr += samples_block; } @@ -532,6 +570,7 @@ static int sound_thread(SceSize args, void *argp) static void sound_init(void) { SceUID thid; + int ret; sound_sem = sceKernelCreateSema("sndsem", 0, 0, 1, NULL); if (sound_sem < 0) lprintf("sceKernelCreateSema() failed: %i\n", sound_sem); @@ -542,7 +581,8 @@ static void sound_init(void) thid = sceKernelCreateThread("sndthread", sound_thread, 0x12, 0x10000, 0, NULL); if (thid >= 0) { - sceKernelStartThread(thid, 0, 0); + ret = sceKernelStartThread(thid, 0, 0); + if (ret < 0) lprintf("sound_init: sceKernelStartThread returned %08x\n", ret); } else lprintf("sceKernelCreateThread failed: %i\n", thid); @@ -647,22 +687,23 @@ static void SkipFrame(void) PicoSkipFrame=0; } -void emu_forcedFrame(void) +void emu_forcedFrame(int opts) { int po_old = PicoOpt; int eo_old = currentConfig.EmuOpt; - PicoOpt &= ~0x0010; - PicoOpt |= 0x4080; // soft_scale | acc_sprites + PicoOpt &= ~0x10; + PicoOpt |= opts|POPT_ACC_SPRITES currentConfig.EmuOpt |= 0x80; vidResetMode(); memset32(VRAM_CACHED_STUFF, 0xe0e0e0e0, 512*8/4); // borders memset32((int *)VRAM_CACHED_STUFF + 512*232/4, 0xe0e0e0e0, 512*8/4); - memset32((int *)psp_screen + 512*264*2/4, 0, 512*8*2/4); + memset32_uncached((int *)psp_screen + 512*264*2/4, 0, 512*8*2/4); PicoDrawSetColorFormat(-1); - PicoScan = EmuScanSlow; + PicoScanBegin = EmuScanSlowBegin; + PicoScanEnd = EmuScanSlowEnd; EmuScanPrepare(); PicoFrameDrawOnly(); blit1(); @@ -755,20 +796,21 @@ static void updateKeys(void) int pl, acts = currentConfig.KeyBinds[i]; if (!acts) continue; pl = (acts >> 16) & 1; - if (combo_keys & (1 << i)) + if (kb_combo_keys & (1 << i)) { - int u = i+1, acts_c = acts & combo_acts; + int u = i+1, acts_c = acts & kb_combo_acts; // let's try to find the other one - if (acts_c) + if (acts_c) { for (; u < 32; u++) - if ( (currentConfig.KeyBinds[u] & acts_c) && (keys & (1 << u)) ) { - allActions[pl] |= acts_c; + if ( (keys & (1 << u)) && (currentConfig.KeyBinds[u] & acts_c) ) { + allActions[pl] |= acts_c & currentConfig.KeyBinds[u]; keys &= ~((1 << i) | (1 << u)); break; } + } // add non-combo actions if combo ones were not found if (!acts_c || u == 32) - allActions[pl] |= acts & ~combo_acts; + allActions[pl] |= acts & ~kb_combo_acts; } else { allActions[pl] |= acts; } @@ -780,21 +822,6 @@ static void updateKeys(void) events = (allActions[0] | allActions[1]) >> 16; - // volume is treated in special way and triggered every frame - if ((events & 0x6000) && PsndOut != NULL) - { - int vol = currentConfig.volume; - if (events & 0x2000) { - if (vol < 100) vol++; - } else { - if (vol > 0) vol--; - } - // FrameworkAudio_SetVolume(vol, vol); // TODO - sprintf(noticeMsg, "VOL: %02i ", vol); - noticeMsgTime = sceKernelGetSystemTimeLow(); - currentConfig.volume = vol; - } - events &= ~prevEvents; if (events) RunEvents(events); if (movie_data) emu_updateMovie(); @@ -802,44 +829,6 @@ static void updateKeys(void) prevEvents = (allActions[0] | allActions[1]) >> 16; } -static void find_combos(void) -{ - int act, u; - - // find out which keys and actions are combos - combo_keys = combo_acts = 0; - for (act = 0; act < 32; act++) - { - int keyc = 0, keyc2 = 0; - if (act == 16 || act == 17) continue; // player2 flag - if (act > 17) - { - for (u = 0; u < 28; u++) // 28 because nub can't produce combos - if (currentConfig.KeyBinds[u] & (1 << act)) keyc++; - } - else - { - for (u = 0; u < 28; u++) - if ((currentConfig.KeyBinds[u] & 0x30000) == 0 && // pl. 1 - (currentConfig.KeyBinds[u] & (1 << act))) keyc++; - for (u = 0; u < 28; u++) - if ((currentConfig.KeyBinds[u] & 0x30000) == 1 && // pl. 2 - (currentConfig.KeyBinds[u] & (1 << act))) keyc2++; - } - if (keyc > 1 || keyc2 > 1) - { - // loop again and mark those keys and actions as combo - for (u = 0; u < 28; u++) - { - if (currentConfig.KeyBinds[u] & (1 << act)) { - combo_keys |= 1 << u; - combo_acts |= 1 << act; - } - } - } - } -} - static void simpleWait(unsigned int until) { @@ -854,10 +843,12 @@ static void simpleWait(unsigned int until) void emu_Loop(void) { + static int mp3_init_done = 0; char fpsbuff[24]; // fps count c string - unsigned int tval, tval_prev = 0, tval_thissec = 0; // timing - int frames_done = 0, frames_shown = 0, oldmodes = 0; - int target_fps, target_frametime, lim_time, tval_diff, i; + unsigned int tval, tval_thissec = 0; // timing + int target_fps, target_frametime, lim_time, tval_diff, i, oldmodes = 0; + int pframes_done, pframes_shown; // "period" frames, used for sync + int frames_done, frames_shown, tval_fpsc = 0; // actual frames char *notice = NULL; lprintf("entered emu_Loop()\n"); @@ -876,15 +867,23 @@ void emu_Loop(void) clearArea(1); Pico.m.dirtyPal = 1; oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc; - find_combos(); + emu_findKeyBindCombos(); // pal/ntsc might have changed, reset related stuff target_fps = Pico.m.pal ? 50 : 60; target_frametime = Pico.m.pal ? (1000000<<8)/50 : (1000000<<8)/60+1; reset_timing = 1; - // prepare CD buffer - if (PicoMCD & 1) PicoCDBufferInit(); + if (PicoAHW & PAHW_MCD) { + // prepare CD buffer + PicoCDBufferInit(); + // mp3... + if (!mp3_init_done) { + i = mp3_init(); + mp3_init_done = 1; + if (i) { engineState = PGS_Menu; return; } + } + } // prepare sound stuff PsndOut = NULL; @@ -894,6 +893,10 @@ void emu_Loop(void) } sceDisplayWaitVblankStart(); + pframes_shown = pframes_done = + frames_shown = frames_done = 0; + + tval_fpsc = sceKernelGetSystemTimeLow(); // loop? while (engineState == PGS_Running) @@ -901,11 +904,11 @@ void emu_Loop(void) int modes; tval = sceKernelGetSystemTimeLow(); - if (reset_timing || tval < tval_prev) { + if (reset_timing || tval < tval_fpsc) { //stdbg("timing reset"); reset_timing = 0; tval_thissec = tval; - frames_shown = frames_done = 0; + pframes_shown = pframes_done = 0; } // show notice message? @@ -931,38 +934,42 @@ void emu_Loop(void) } // second passed? + if (tval - tval_fpsc >= 1000000) + { + if (currentConfig.EmuOpt & 2) + sprintf(fpsbuff, "%02i/%02i ", frames_shown, frames_done); + frames_done = frames_shown = 0; + tval_fpsc += 1000000; + } + if (tval - tval_thissec >= 1000000) { // missing 1 frame? - if (currentConfig.Frameskip < 0 && frames_done < target_fps) { - SkipFrame(); frames_done++; + if (currentConfig.Frameskip < 0 && pframes_done < target_fps) { + SkipFrame(); pframes_done++; frames_done++; } - if (currentConfig.EmuOpt & 2) - sprintf(fpsbuff, "%02i/%02i ", frames_shown, frames_done); - tval_thissec += 1000000; if (currentConfig.Frameskip < 0) { - frames_done -= target_fps; if (frames_done < 0) frames_done = 0; - frames_shown -= target_fps; if (frames_shown < 0) frames_shown = 0; - if (frames_shown > frames_done) frames_shown = frames_done; + pframes_done -= target_fps; if (pframes_done < 0) pframes_done = 0; + pframes_shown -= target_fps; if (pframes_shown < 0) pframes_shown = 0; + if (pframes_shown > pframes_done) pframes_shown = pframes_done; } else { - frames_done = frames_shown = 0; + pframes_done = pframes_shown = 0; } } #ifdef PFRAMES sprintf(fpsbuff, "%i", Pico.m.frame_count); #endif - tval_prev = tval; - lim_time = (frames_done+1) * target_frametime; + lim_time = (pframes_done+1) * target_frametime; if (currentConfig.Frameskip >= 0) // frameskip enabled { for (i = 0; i < currentConfig.Frameskip; i++) { updateKeys(); - SkipFrame(); frames_done++; - if (PsndOut) { // do framelimitting if sound is enabled + SkipFrame(); pframes_done++; frames_done++; + if (!(currentConfig.EmuOpt&0x40000)) { // do framelimitting if needed int tval_diff; tval = sceKernelGetSystemTimeLow(); tval_diff = (int)(tval - tval_thissec) << 8; @@ -977,7 +984,7 @@ void emu_Loop(void) int tval_diff; tval = sceKernelGetSystemTimeLow(); tval_diff = (int)(tval - tval_thissec) << 8; - if (tval_diff > lim_time && (frames_done/16 < frames_shown)) + if (tval_diff > lim_time && (pframes_done/16 < pframes_shown)) { // no time left for this frame - skip if (tval_diff - lim_time >= (300000<<8)) { @@ -985,7 +992,7 @@ void emu_Loop(void) continue; } updateKeys(); - SkipFrame(); frames_done++; + SkipFrame(); pframes_done++; frames_done++; continue; } } @@ -1005,9 +1012,10 @@ void emu_Loop(void) blit2(fpsbuff, notice, tval_diff > lim_time); - if (currentConfig.Frameskip < 0 && tval_diff - lim_time >= (300000<<8)) // slowdown detection + if (currentConfig.Frameskip < 0 && tval_diff - lim_time >= (300000<<8)) { // slowdown detection reset_timing = 1; - else if (PsndOut != NULL || currentConfig.Frameskip < 0) + } + else if (!(currentConfig.EmuOpt&0x40000) || currentConfig.Frameskip < 0) { // sleep if we are still too fast if (tval_diff < lim_time) @@ -1017,11 +1025,12 @@ void emu_Loop(void) } } - frames_done++; frames_shown++; + pframes_done++; pframes_shown++; + frames_done++; frames_shown++; } - if (PicoMCD & 1) PicoCDBufferFree(); + if (PicoAHW & PAHW_MCD) PicoCDBufferFree(); if (PsndOut != NULL) { PsndOut = NULL; @@ -1036,13 +1045,29 @@ void emu_Loop(void) } // clear fps counters and stuff - memset32((int *)psp_video_get_active_fb() + 512*264*2/4, 0, 512*8*2/4); + memset32_uncached((int *)psp_video_get_active_fb() + 512*264*2/4, 0, 512*8*2/4); } void emu_ResetGame(void) { - PicoReset(0); + PicoReset(); reset_timing = 1; } +void emu_HandleResume(void) +{ + if (!(PicoAHW & PAHW_MCD)) return; + + // reopen files.. + if (Pico_mcd->TOC.Tracks[0].F != NULL) + { + lprintf("emu_HandleResume: reopen %s\n", romFileName); + pm_close(Pico_mcd->TOC.Tracks[0].F); + Pico_mcd->TOC.Tracks[0].F = pm_open(romFileName); + lprintf("reopen %s\n", Pico_mcd->TOC.Tracks[0].F != NULL ? "ok" : "failed"); + } + + mp3_reopen_file(); +} +