X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FPico.c;h=1ffd44bd0c4d3e07c4067292c995da3fa40b673c;hb=03e4f2a349247334666c87abe3a908df72d23051;hp=5dcb39ca39cf564561e3e75037f25b0d166e104b;hpb=eff55556cff77fd64cff4be32e449e0a58aed6fe;p=picodrive.git diff --git a/Pico/cd/Pico.c b/Pico/cd/Pico.c index 5dcb39c..1ffd44b 100644 --- a/Pico/cd/Pico.c +++ b/Pico/cd/Pico.c @@ -69,8 +69,8 @@ PICO_INTERNAL int PicoResetMCD(int hard) Reset_CD(); LC89510_Reset(); gfx_cd_reset(); -#ifdef _ASM_CD_MEMORY_C PicoMemResetCD(1); +#ifdef _ASM_CD_MEMORY_C //PicoMemResetCDdecode(1); // don't have to call this in 2M mode #endif @@ -89,12 +89,15 @@ static __inline void SekRunM68k(int cyc) SekCycleAim+=cyc; if((cyc_do=SekCycleAim-SekCycleCnt) < 0) return; #if defined(EMU_C68K) - PicoCpu.cycles=cyc_do; - CycloneRun(&PicoCpu); - SekCycleCnt+=cyc_do-PicoCpu.cycles; + PicoCpuCM68k.cycles=cyc_do; + CycloneRun(&PicoCpuCM68k); + SekCycleCnt+=cyc_do-PicoCpuCM68k.cycles; #elif defined(EMU_M68K) - m68k_set_context(&PicoM68kCPU); + m68k_set_context(&PicoCpuMM68k); SekCycleCnt+=m68k_execute(cyc_do); +#elif defined(EMU_F68K) + g_m68kcontext=&PicoCpuFM68k; + SekCycleCnt+=fm68k_emulate(cyc_do); #endif } @@ -104,12 +107,15 @@ static __inline void SekRunS68k(int cyc) SekCycleAimS68k+=cyc; if((cyc_do=SekCycleAimS68k-SekCycleCntS68k) < 0) return; #if defined(EMU_C68K) - PicoCpuS68k.cycles=cyc_do; - CycloneRun(&PicoCpuS68k); - SekCycleCntS68k+=cyc_do-PicoCpuS68k.cycles; + PicoCpuCS68k.cycles=cyc_do; + CycloneRun(&PicoCpuCS68k); + SekCycleCntS68k+=cyc_do-PicoCpuCS68k.cycles; #elif defined(EMU_M68K) - m68k_set_context(&PicoS68kCPU); + m68k_set_context(&PicoCpuMS68k); SekCycleCntS68k+=m68k_execute(cyc_do); +#elif defined(EMU_F68K) + g_m68kcontext=&PicoCpuFS68k; + SekCycleCntS68k+=fm68k_emulate(cyc_do); #endif } @@ -122,7 +128,6 @@ void SekRunPS(int cyc_m68k, int cyc_s68k); static __inline void SekRunPS(int cyc_m68k, int cyc_s68k) { int cycn, cycn_s68k, cyc_do; - int d_cm = 0, d_cs = 0, ex; SekCycleAim+=cyc_m68k; SekCycleAimS68k+=cyc_s68k; @@ -132,34 +137,34 @@ static __inline void SekRunPS(int cyc_m68k, int cyc_s68k) /* loop 488 downto 0 in steps of PS_STEP */ for (cycn = (488<<16)-PS_STEP_M68K; cycn >= 0; cycn -= PS_STEP_M68K) { - ex = 0; cycn_s68k = (cycn + cycn/2 + cycn/8) >> 16; -//fprintf(stderr, "%3i/%3i: ", cycn>>16, cycn_s68k); if ((cyc_do = SekCycleAim-SekCycleCnt-(cycn>>16)) > 0) { #if defined(EMU_C68K) - PicoCpu.cycles = cyc_do; - CycloneRun(&PicoCpu); - SekCycleCnt += cyc_do - PicoCpu.cycles; + PicoCpuCM68k.cycles = cyc_do; + CycloneRun(&PicoCpuCM68k); + SekCycleCnt += cyc_do - PicoCpuCM68k.cycles; #elif defined(EMU_M68K) - m68k_set_context(&PicoM68kCPU); - SekCycleCnt += (ex = m68k_execute(cyc_do)); + m68k_set_context(&PicoCpuMM68k); + SekCycleCnt += m68k_execute(cyc_do); +#elif defined(EMU_F68K) + g_m68kcontext = &PicoCpuFM68k; + SekCycleCnt += fm68k_emulate(cyc_do); #endif } -//fprintf(stderr, "%3i ", ex); d_cm += ex; ex = 0; if ((cyc_do = SekCycleAimS68k-SekCycleCntS68k-cycn_s68k) > 0) { #if defined(EMU_C68K) - PicoCpuS68k.cycles = cyc_do; - CycloneRun(&PicoCpuS68k); - SekCycleCntS68k += cyc_do - PicoCpuS68k.cycles; + PicoCpuCS68k.cycles = cyc_do; + CycloneRun(&PicoCpuCS68k); + SekCycleCntS68k += cyc_do - PicoCpuCS68k.cycles; #elif defined(EMU_M68K) - m68k_set_context(&PicoS68kCPU); - SekCycleCntS68k += (ex = m68k_execute(cyc_do)); + m68k_set_context(&PicoCpuMS68k); + SekCycleCntS68k += m68k_execute(cyc_do); +#elif defined(EMU_F68K) + g_m68kcontext = &PicoCpuFS68k; + SekCycleCntS68k += fm68k_emulate(cyc_do); #endif } -//fprintf(stderr, "%3i\n", ex); d_cs += ex; } - -//fprintf(stderr, "== end %3i/%3i ==\n", d_cm, d_cs); } #endif @@ -199,7 +204,7 @@ static __inline void update_chips(void) Pico_mcd->m.timer_int3 -= counter_timer; if (Pico_mcd->m.timer_int3 < 0) { if (Pico_mcd->s68k_regs[0x33] & (1<<3)) { - dprintf("s68k: timer irq 3"); + elprintf(EL_INTS, "s68k: timer irq 3"); SekInterruptS68k(3); Pico_mcd->m.timer_int3 += int3_set << 16; } @@ -228,133 +233,17 @@ static __inline void update_chips(void) } -static int PicoFrameHintsMCD(void) +static __inline void getSamples(int y) { - struct PicoVideo *pv=&Pico.video; - int total_z80=0,lines,y,lines_vis = 224,z80CycleAim = 0,line_sample; - const int cycles_68k=488,cycles_z80=228,cycles_s68k=795; // both PAL and NTSC compile to same values - int skip=PicoSkipFrame || (PicoOpt&0x10); - int hint; // Hint counter - - 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 - lines = 312; // Steve Snake says there are 313 lines, but this seems to also work well - 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 - lines = 262; - line_sample = 93; - } - - SekCyclesReset(); - SekCyclesResetS68k(); - //z80ExtraCycles = 0; - - if(PicoOpt&4) - z80CycleAim = 0; -// z80_resetCycles(); - - pv->status&=~0x88; // clear V-Int, come out of vblank - - hint=pv->reg[10]; // Load H-Int counter - //dprintf("-hint: %i", hint); - - for (y=0;y 25) Pico.m.padTHPhase[0]=0; - if(Pico.m.padDelay[1]++ > 25) Pico.m.padTHPhase[1]=0; - } - - check_cd_dma(); - - // H-Interrupts: - if(y <= lines_vis && --hint < 0) // y <= lines_vis: Comix Zone, Golden Axe - { - //dprintf("rhint:old @ %06x", SekPc); - hint=pv->reg[10]; // Reload H-Int counter - pv->pending_ints|=0x10; - if (pv->reg[0]&0x10) SekInterrupt(4); - //dprintf("rhint: %i @ %06x [%i|%i]", hint, SekPc, y, SekCycleCnt); - //dprintf("hint_routine: %x", (*(unsigned short*)(Pico.ram+0x0B84)<<16)|*(unsigned short*)(Pico.ram+0x0B86)); - } - - // V-Interrupt: - if (y == lines_vis) - { - //dprintf("vint: @ %06x [%i|%i]", SekPc, y, SekCycleCnt); - pv->status|=0x88; // V-Int happened, go into vblank - SekRunM68k(128); SekCycleAim-=128; // there must be a gap between H and V ints, also after vblank bit set (Mazin Saga, Bram Stoker's Dracula) - /*if(Pico.m.z80Run && (PicoOpt&4)) { - z80CycleAim+=cycles_z80/2; - total_z80+=z80_run(z80CycleAim-total_z80); - z80CycleAim-=cycles_z80/2; - }*/ - pv->pending_ints|=0x20; - if(pv->reg[1]&0x20) SekInterrupt(6); - if(Pico.m.z80Run && (PicoOpt&4)) // ? - z80_int(); - //dprintf("zint: [%i|%i] zPC=%04x", Pico.m.scanline, SekCyclesDone(), mz80GetRegisterValue(NULL, 0)); - } - - // decide if we draw this line -#if CAN_HANDLE_240_LINES - if(!skip && ((!(pv->reg[1]&8) && y<224) || ((pv->reg[1]&8) && y<240)) ) -#else - if(!skip && y<224) -#endif - PicoLine(y); - - if(PicoOpt&1) - sound_timers_and_dac(y); - - // get samples from sound chips - if (y == 224 && PsndOut) { - int len = sound_render(0, PsndLen); - if (PicoWriteSound) PicoWriteSound(len); - // clear sound buffer - sound_clear(); - } - - // Run scanline: - //dprintf("m68k starting exec @ %06x", SekPc); - if (Pico.m.dma_bytes) SekCycleCnt+=CheckDMA(); - if ((PicoOpt & 0x2000) && (Pico_mcd->m.busreq&3) == 1) { - SekRunPS(cycles_68k, cycles_s68k); // "better/perfect sync" - } else { - SekRunM68k(cycles_68k); - if ((Pico_mcd->m.busreq&3) == 1) // no busreq/no reset - SekRunS68k(cycles_s68k); - } - - if ((PicoOpt&4) && Pico.m.z80Run) { - if (Pico.m.z80Run & 2) z80CycleAim+=cycles_z80; - else { - int cnt = SekCyclesDone() - z80startCycle; - cnt = (cnt>>1)-(cnt>>5); - //if (cnt > cycles_z80) printf("FIXME: z80 cycles: %i\n", cnt); - if (cnt > cycles_z80) cnt = cycles_z80; - Pico.m.z80Run |= 2; - z80CycleAim+=cnt; - } - total_z80+=z80_run(z80CycleAim-total_z80); - } - - update_chips(); - } + int len = sound_render(0, PsndLen); + if (PicoWriteSound) PicoWriteSound(len); + // clear sound buffer + sound_clear(); +} - // draw a frame just after vblank in alternative render mode - if (!PicoSkipFrame && (PicoOpt&0x10)) - PicoFrameFull(); - return 0; -} +#define PICO_CD +#include "../PicoFrameHints.c" PICO_INTERNAL int PicoFrameMCD(void) @@ -362,7 +251,7 @@ PICO_INTERNAL int PicoFrameMCD(void) if(!(PicoOpt&0x10)) PicoFrameStart(); - PicoFrameHintsMCD(); + PicoFrameHints(); return 0; }