X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPicoFrameHints.c;h=b224c9b76176c5f4ce83f80bd7aa0c47cd3d5f6e;hb=d95259bdaaf911218656d8a74b096ff7306034f6;hp=d1efa9ad12690997eb6903956d854852ac9cfa64;hpb=583ab72c0b42549235191fd4fad239074dd896af;p=picodrive.git diff --git a/Pico/PicoFrameHints.c b/Pico/PicoFrameHints.c index d1efa9a..b224c9b 100644 --- a/Pico/PicoFrameHints.c +++ b/Pico/PicoFrameHints.c @@ -4,8 +4,6 @@ #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 @@ -16,31 +14,12 @@ if(Pico.m.padDelay[1]++ > 25) Pico.m.padTHPhase[1]=0; \ } -#define Z80_RUN(z80_cycles) \ -{ \ - if ((PicoOpt&POPT_EN_Z80) && Pico.m.z80Run) \ - { \ - int cnt; \ - if (Pico.m.z80Run & 2) z80CycleAim += z80_cycles; \ - else { \ - cnt = SekCyclesDone() - z80startCycle; \ - cnt = (cnt>>1)-(cnt>>5); \ - if (cnt < 0 || cnt > (z80_cycles)) cnt = z80_cycles; \ - Pico.m.z80Run |= 2; \ - z80CycleAim+=cnt; \ - } \ - cnt=z80CycleAim-total_z80; \ - if (cnt > 0) total_z80+=z80_run(cnt); \ - } \ -} - // CPUS_RUN #ifndef PICO_CD -#define CPUS_RUN(m68k_cycles,z80_cycles,s68k_cycles) \ - SekRunM68k(m68k_cycles); \ - Z80_RUN(z80_cycles); +#define CPUS_RUN(m68k_cycles,s68k_cycles) \ + SekRunM68k(m68k_cycles); #else -#define CPUS_RUN(m68k_cycles,z80_cycles,s68k_cycles) \ +#define CPUS_RUN(m68k_cycles,s68k_cycles) \ { \ if ((PicoOpt&POPT_EN_MCD_PSYNC) && (Pico_mcd->m.busreq&3) == 1) { \ SekRunPS(m68k_cycles, s68k_cycles); /* "better/perfect sync" */ \ @@ -49,7 +28,6 @@ if ((Pico_mcd->m.busreq&3) == 1) /* no busreq/no reset */ \ SekRunS68k(s68k_cycles); \ } \ - Z80_RUN(z80_cycles); \ } #endif @@ -57,9 +35,11 @@ static int PicoFrameHints(void) { struct PicoVideo *pv=&Pico.video; - int lines, y, lines_vis = 224, total_z80 = 0, z80CycleAim = 0, line_sample, skip; + 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. @@ -72,20 +52,18 @@ static int PicoFrameHints(void) 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 @@ -93,9 +71,7 @@ static int PicoFrameHints(void) //dprintf("-hint: %i", hint); // This is to make active scan longer (needed for Double Dragon 2, mainly) - // also trying to adjust for z80 overclock here (due to int line cycle counts) - z80CycleAim = Pico.m.pal ? -40 : 7; - CPUS_RUN(CYCLES_M68K_ASD, 0, CYCLES_S68K_ASD); + CPUS_RUN(CYCLES_M68K_ASD, CYCLES_S68K_ASD); for (y=0;yreg[1]&8) && y < 224) || (pv->reg[1]&8)) ) -#else +#if !CAN_HANDLE_240_LINES if (y < 224) #endif PicoLine(y); } } - if (PicoOpt&POPT_EN_FM) - Psnd_timers_and_dac(y); - #ifndef PICO_CD // get samples from sound chips if (y == 32 && PsndOut) emustatus &= ~1; 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()); - CPUS_RUN(CYCLES_M68K_LINE, CYCLES_Z80_LINE, CYCLES_S68K_LINE); + CPUS_RUN(CYCLES_M68K_LINE, CYCLES_S68K_LINE); #ifdef PICO_CD update_chips(); @@ -205,29 +182,32 @@ static int PicoFrameHints(void) // 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) 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&POPT_EN_Z80)) { + PicoSyncZ80(SekCycleCnt); elprintf(EL_INTS, "zint"); z80_int(); } - if (PicoOpt&POPT_EN_FM) - Psnd_timers_and_dac(y); - // get samples from sound chips #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()); CPUS_RUN(CYCLES_M68K_LINE - CYCLES_M68K_VINT_LAG - CYCLES_M68K_ASD, - CYCLES_Z80_LINE - CYCLES_Z80_ASD, CYCLES_S68K_LINE - CYCLES_S68K_ASD); + CYCLES_S68K_LINE - CYCLES_S68K_ASD); #ifdef PICO_CD update_chips(); @@ -247,12 +227,9 @@ static int PicoFrameHints(void) check_cd_dma(); #endif - if (PicoOpt&POPT_EN_FM) - Psnd_timers_and_dac(y); - // Run scanline: if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA()); - CPUS_RUN(CYCLES_M68K_LINE, CYCLES_Z80_LINE, CYCLES_S68K_LINE); + CPUS_RUN(CYCLES_M68K_LINE, CYCLES_S68K_LINE); #ifdef PICO_CD update_chips(); @@ -261,10 +238,17 @@ static int PicoFrameHints(void) #endif } + // 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