X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPicoFrameHints.c;h=b224c9b76176c5f4ce83f80bd7aa0c47cd3d5f6e;hb=45a1ef7153910f005c01cba63d12f312071efef0;hp=e27484d4fb2ac461b3f467a188432b4c4b3675eb;hpb=69996cb7c62468cd97842e35bdd2b74006a28dba;p=picodrive.git diff --git a/Pico/PicoFrameHints.c b/Pico/PicoFrameHints.c index e27484d..b224c9b 100644 --- a/Pico/PicoFrameHints.c +++ b/Pico/PicoFrameHints.c @@ -1,52 +1,69 @@ +// common code for Pico.c and cd/Pico.c +// (c) Copyright 2007,2008 Grazvydas "notaz" Ignotas + #define CYCLES_M68K_LINE 488 // suitable for both PAL/NTSC #define CYCLES_M68K_VINT_LAG 68 #define CYCLES_M68K_ASD 148 -#define CYCLES_Z80_LINE 228 -#define CYCLES_Z80_ASD 69 +#define CYCLES_S68K_LINE 795 +#define CYCLES_S68K_ASD 241 // pad delay (for 6 button pads) #define PAD_DELAY \ - if (PicoOpt&0x20) { \ + if (PicoOpt&POPT_6BTN_PAD) { \ if(Pico.m.padDelay[0]++ > 25) Pico.m.padTHPhase[0]=0; \ if(Pico.m.padDelay[1]++ > 25) Pico.m.padTHPhase[1]=0; \ } -#define Z80_RUN(z80_cycles) \ +// CPUS_RUN +#ifndef PICO_CD +#define CPUS_RUN(m68k_cycles,s68k_cycles) \ + SekRunM68k(m68k_cycles); +#else +#define CPUS_RUN(m68k_cycles,s68k_cycles) \ { \ - if ((PicoOpt&4) && Pico.m.z80Run) \ - { \ - if (Pico.m.z80Run & 2) z80CycleAim += z80_cycles; \ - else { \ - int cnt = SekCyclesDone() - z80startCycle; \ - cnt = (cnt>>1)-(cnt>>5); \ - if (cnt > (z80_cycles)) cnt = z80_cycles; \ - Pico.m.z80Run |= 2; \ - z80CycleAim+=cnt; \ + if ((PicoOpt&POPT_EN_MCD_PSYNC) && (Pico_mcd->m.busreq&3) == 1) { \ + SekRunPS(m68k_cycles, s68k_cycles); /* "better/perfect sync" */ \ + } else { \ + SekRunM68k(m68k_cycles); \ + if ((Pico_mcd->m.busreq&3) == 1) /* no busreq/no reset */ \ + SekRunS68k(s68k_cycles); \ } \ - total_z80+=z80_run(z80CycleAim-total_z80); \ - } \ } +#endif // Accurate but slower frame which does hints static int PicoFrameHints(void) { struct PicoVideo *pv=&Pico.video; - int total_z80=0,lines,y,lines_vis = 224,z80CycleAim = 0,line_sample; - int skip=PicoSkipFrame || (PicoOpt&0x10); + int lines, y, lines_vis = 224, line_sample, skip; int hint; // Hint counter + Pico.m.scanline=0; + + if ((PicoOpt&POPT_ALT_RENDERER) && !PicoSkipFrame && (pv->reg[1]&0x40)) { // fast rend., display enabled + // draw a frame just after vblank in alternative render mode + // yes, this will cause 1 frame lag, but this is inaccurate mode anyway. + PicoFrameFull(); +#ifdef DRAW_FINISH_FUNC + DRAW_FINISH_FUNC(); +#endif + skip = 1; + } + else skip=PicoSkipFrame; + if (Pico.m.pal) { - //cycles_68k = (int) ((double) OSC_PAL / 7 / 50 / 312 + 0.4); // should compile to a constant (488) - //cycles_z80 = (int) ((double) OSC_PAL / 15 / 50 / 312 + 0.4); // 228 line_sample = 68; if(pv->reg[1]&8) lines_vis = 240; } else { - //cycles_68k = (int) ((double) OSC_NTSC / 7 / 60 / 262 + 0.4); // 488 - //cycles_z80 = (int) ((double) OSC_NTSC / 15 / 60 / 262 + 0.4); // 228 line_sample = 93; } SekCyclesReset(); + z80_resetCycles(); +#ifdef PICO_CD + SekCyclesResetS68k(); +#endif + PsndDacLine = 0; pv->status&=~0x88; // clear V-Int, come out of vblank @@ -54,8 +71,7 @@ static int PicoFrameHints(void) //dprintf("-hint: %i", hint); // This is to make active scan longer (needed for Double Dragon 2, mainly) - SekRun(CYCLES_M68K_ASD); - Z80_RUN(CYCLES_Z80_ASD); + CPUS_RUN(CYCLES_M68K_ASD, CYCLES_S68K_ASD); for (y=0;yreg[1]&8) && y<224) || (pv->reg[1]&8)) ) -#else - if(!skip && y<224) + if (!skip) + { + if (PicoOpt&POPT_ALT_RENDERER) { + // find the right moment for fast renderer, when display is no longer blanked + if ((pv->reg[1]&0x40) || y > 100) { + PicoFrameFull(); +#ifdef DRAW_FINISH_FUNC + DRAW_FINISH_FUNC(); #endif - PicoLine(y); - - if(PicoOpt&1) - sound_timers_and_dac(y); + skip = 1; + } + } + else + { +#if !CAN_HANDLE_240_LINES + if (y < 224) +#endif + PicoLine(y); + } + } +#ifndef PICO_CD // get samples from sound chips - if(y == 32 && PsndOut) + if (y == 32 && PsndOut) emustatus &= ~1; - else if((y == 224 || y == line_sample) && PsndOut) + else if ((y == 224 || y == line_sample) && PsndOut) + { + if (Pico.m.z80Run && (PicoOpt&POPT_EN_Z80)) + PicoSyncZ80(SekCycleCnt); + if (ym2612.dacen && PsndDacLine <= y) + PsndDoDAC(y); getSamples(y); + } +#endif // Run scanline: if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA()); - SekRun(CYCLES_M68K_LINE); - Z80_RUN(CYCLES_Z80_LINE); + CPUS_RUN(CYCLES_M68K_LINE, CYCLES_S68K_LINE); + +#ifdef PICO_CD + update_chips(); +#else + if (PicoLineHook) PicoLineHook(1); +#endif } +#ifdef DRAW_FINISH_FUNC + if (!skip) + DRAW_FINISH_FUNC(); +#endif + // V-int line (224 or 240) Pico.m.scanline=(short)y; @@ -112,6 +160,9 @@ static int PicoFrameHints(void) Pico.video.status|=0x200; PAD_DELAY +#ifdef PICO_CD + check_cd_dma(); +#endif // Last H-Int: if (--hint < 0) @@ -130,25 +181,39 @@ static int PicoFrameHints(void) // there must be a delay after vblank bit is set and irq is asserted (Mazin Saga) // also delay between F bit (bit 7) is set in SR and IRQ happens (Ex-Mutants) // also delay between last H-int and V-int (Golden Axe 3) - SekRun(CYCLES_M68K_VINT_LAG); + SekRunM68k(CYCLES_M68K_VINT_LAG); + if (pv->reg[1]&0x20) { elprintf(EL_INTS, "vint: @ %06x [%i]", SekPc, SekCycleCnt); SekInterrupt(6); } - if (Pico.m.z80Run && (PicoOpt&4)) + if (Pico.m.z80Run && (PicoOpt&POPT_EN_Z80)) { + PicoSyncZ80(SekCycleCnt); + elprintf(EL_INTS, "zint"); z80_int(); - - if (PicoOpt&1) - sound_timers_and_dac(y); + } // get samples from sound chips - if ((y == 224) && PsndOut) - getSamples(y); +#ifndef PICO_CD + if (y == 224) +#endif + if (PsndOut) + { + if (ym2612.dacen && PsndDacLine <= y) + PsndDoDAC(y); + getSamples(y); + } // Run scanline: if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA()); - SekRun(CYCLES_M68K_LINE - CYCLES_M68K_VINT_LAG - CYCLES_M68K_ASD); - Z80_RUN(CYCLES_Z80_LINE - CYCLES_Z80_ASD); + CPUS_RUN(CYCLES_M68K_LINE - CYCLES_M68K_VINT_LAG - CYCLES_M68K_ASD, + CYCLES_S68K_LINE - CYCLES_S68K_ASD); + +#ifdef PICO_CD + update_chips(); +#else + if (PicoLineHook) PicoLineHook(1); +#endif // PAL line count might actually be 313 according to Steve Snake, but that would complicate things. lines = Pico.m.pal ? 312 : 262; @@ -158,23 +223,32 @@ static int PicoFrameHints(void) Pico.m.scanline=(short)y; PAD_DELAY - - if(PicoOpt&1) - sound_timers_and_dac(y); +#ifdef PICO_CD + check_cd_dma(); +#endif // Run scanline: if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA()); - SekRun(CYCLES_M68K_LINE); - Z80_RUN(CYCLES_Z80_LINE); + CPUS_RUN(CYCLES_M68K_LINE, CYCLES_S68K_LINE); + +#ifdef PICO_CD + update_chips(); +#else + if (PicoLineHook) PicoLineHook(1); +#endif } - // draw a frame just after vblank in alternative render mode - if (!PicoSkipFrame && (PicoOpt&0x10)) - PicoFrameFull(); + // sync z80 + if (Pico.m.z80Run && (PicoOpt&POPT_EN_Z80)) + PicoSyncZ80(Pico.m.pal ? 151809 : 127671); // cycles adjusted for converter + if (PsndOut && ym2612.dacen && PsndDacLine <= lines-1) + PsndDoDAC(lines-1); + + timers_cycle(); return 0; } #undef PAD_DELAY -#undef Z80_RUN +#undef CPUS_RUN