X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FPico.c;h=0759acb4157cd19333057add11c4262ab9085eb0;hb=d9153729685381acb0559d8a4fdca47cb839427a;hp=770eddba3e9540e748ec4fb355309273adb97234;hpb=76276b0bc0b532394d1ba067bf2b17a27b0b3be6;p=picodrive.git diff --git a/Pico/cd/Pico.c b/Pico/cd/Pico.c index 770eddb..0759acb 100644 --- a/Pico/cd/Pico.c +++ b/Pico/cd/Pico.c @@ -12,6 +12,28 @@ extern unsigned char formatted_bram[4*0x10]; +extern unsigned int s68k_poll_adclk; + + +#define dump_ram(ram,fname) \ +{ \ + int i, d; \ + FILE *f; \ +\ + for (i = 0; i < sizeof(ram); i+=2) { \ + d = (ram[i]<<8) | ram[i+1]; \ + *(unsigned short *)(ram+i) = d; \ + } \ + f = fopen(fname, "wb"); \ + if (f) { \ + fwrite(ram, 1, sizeof(ram), f); \ + fclose(f); \ + } \ + for (i = 0; i < sizeof(ram); i+=2) { \ + d = (ram[i]<<8) | ram[i+1]; \ + *(unsigned short *)(ram+i) = d; \ + } \ +} int PicoInitMCD(void) @@ -26,29 +48,36 @@ int PicoInitMCD(void) void PicoExitMCD(void) { End_CD_Driver(); + + //dump_ram(Pico_mcd->prg_ram, "prg.bin"); + //dump_ram(Pico.ram, "ram.bin"); } int PicoResetMCD(int hard) { - memset(Pico_mcd->prg_ram, 0, sizeof(Pico_mcd->prg_ram)); - memset(Pico_mcd->word_ram, 0, sizeof(Pico_mcd->word_ram)); - memset(Pico_mcd->pcm_ram, 0, sizeof(Pico_mcd->pcm_ram)); if (hard) { - int fmt_size = sizeof(formatted_bram); - memset(Pico_mcd->bram, 0, sizeof(Pico_mcd->bram)); - memcpy(Pico_mcd->bram + sizeof(Pico_mcd->bram) - fmt_size, formatted_bram, fmt_size); + int fmt_size = sizeof(formatted_bram); + memset(Pico_mcd->prg_ram, 0, sizeof(Pico_mcd->prg_ram)); + memset(Pico_mcd->word_ram2M, 0, sizeof(Pico_mcd->word_ram2M)); + memset(Pico_mcd->pcm_ram, 0, sizeof(Pico_mcd->pcm_ram)); + memset(Pico_mcd->bram, 0, sizeof(Pico_mcd->bram)); + memcpy(Pico_mcd->bram + sizeof(Pico_mcd->bram) - fmt_size, formatted_bram, fmt_size); } memset(Pico_mcd->s68k_regs, 0, sizeof(Pico_mcd->s68k_regs)); memset(&Pico_mcd->pcm, 0, sizeof(Pico_mcd->pcm)); + memset(&Pico_mcd->m, 0, sizeof(Pico_mcd->m)); *(unsigned int *)(Pico_mcd->bios + 0x70) = 0xffffffff; // reset hint vector (simplest way to implement reg6) - Pico_mcd->m.state_flags |= 2; // s68k reset pending + Pico_mcd->m.state_flags |= 1; // s68k reset pending Pico_mcd->s68k_regs[3] = 1; // 2M word RAM mode with m68k access after reset - Pico_mcd->m.counter75hz = 0; - LC89510_Reset(); Reset_CD(); + LC89510_Reset(); gfx_cd_reset(); +#ifdef _ASM_CD_MEMORY_C + PicoMemResetCD(1); + //PicoMemResetCDdecode(1); // don't have to call this in 2M mode +#endif return 0; } @@ -83,6 +112,57 @@ static __inline void SekRunS68k(int cyc) #endif } +#define PS_STEP_M68K ((488<<16)/20) // ~24 +//#define PS_STEP_S68K 13 + +#ifdef _ASM_CD_PICO_C +void SekRunPS(int cyc_m68k, int cyc_s68k); +#else +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; + +// fprintf(stderr, "=== start %3i/%3i [%3i/%3i] {%05i.%i} ===\n", cyc_m68k, cyc_s68k, +// SekCycleAim-SekCycleCnt, SekCycleAimS68k-SekCycleCntS68k, Pico.m.frame_count, Pico.m.scanline); + + /* 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; +#elif defined(EMU_M68K) + m68k_set_context(&PicoM68kCPU); + SekCycleCnt += (ex = m68k_execute(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; +#elif defined(EMU_M68K) + m68k_set_context(&PicoS68kCPU); + SekCycleCntS68k += (ex = m68k_execute(cyc_do)); +#endif + } +//fprintf(stderr, "%3i\n", ex); d_cs += ex; + } + +//fprintf(stderr, "== end %3i/%3i ==\n", d_cm, d_cs); +} +#endif + + static __inline void check_cd_dma(void) { int ddx; @@ -130,6 +210,18 @@ static __inline void update_chips(void) // update gfx chip if (Pico_mcd->rot_comp.Reg_58 & 0x8000) gfx_cd_update(); + + // delayed setting of DMNA bit (needed for Silpheed) + if (Pico_mcd->m.state_flags & 2) { + Pico_mcd->m.state_flags &= ~2; + Pico_mcd->s68k_regs[3] |= 2; + Pico_mcd->s68k_regs[3] &= ~1; +#ifdef USE_POLL_DETECT + if ((s68k_poll_adclk&0xfe) == 2) { + SekSetStopS68k(0); s68k_poll_adclk = 0; + } +#endif + } } @@ -229,29 +321,25 @@ static int PicoFrameHintsMCD(void) // Run scanline: //dprintf("m68k starting exec @ %06x", SekPc); - if(Pico.m.dma_bytes) SekCycleCnt+=CheckDMA(); - SekRun(cycles_68k); - if ((Pico_mcd->m.busreq&3) == 1) { // no busreq/no reset -#if 0 - int i; - FILE *f = fopen("prg_ram.bin", "wb"); - for (i = 0; i < 0x80000; i+=2) - { - int tmp = Pico_mcd->prg_ram[i]; - Pico_mcd->prg_ram[i] = Pico_mcd->prg_ram[i+1]; - Pico_mcd->prg_ram[i+1] = tmp; - } - fwrite(Pico_mcd->prg_ram, 1, 0x80000, f); - fclose(f); - exit(1); -#endif - //dprintf("s68k starting exec @ %06x", SekPcS68k); - SekRunS68k(cycles_s68k); + 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 { + SekRun(cycles_68k); + if ((Pico_mcd->m.busreq&3) == 1) // no busreq/no reset + SekRunS68k(cycles_s68k); } - if((PicoOpt&4) && Pico.m.z80Run) { - Pico.m.z80Run|=2; - z80CycleAim+=cycles_z80; + 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); } @@ -259,7 +347,7 @@ static int PicoFrameHintsMCD(void) } // draw a frame just after vblank in alternative render mode - if(!PicoSkipFrame && (PicoOpt&0x10)) + if (!PicoSkipFrame && (PicoOpt&0x10)) PicoFrameFull(); return 0;