X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=Pico%2Fcd%2FMemory.c;h=ff787b0db8ace57f53f4eccd18dcb89776357ac1;hb=4f265db77684ec33f9533e7c76734498df03bba4;hp=739f3bf872d45a64eca77413efa6ef7a56be4b9b;hpb=cb4a513a96b173624619686ca21360d556557ec3;p=picodrive.git diff --git a/Pico/cd/Memory.c b/Pico/cd/Memory.c index 739f3bf..ff787b0 100644 --- a/Pico/cd/Memory.c +++ b/Pico/cd/Memory.c @@ -1,7 +1,7 @@ // This is part of Pico Library // (c) Copyright 2004 Dave, All rights reserved. -// (c) Copyright 2006 notaz, All rights reserved. +// (c) Copyright 2007 notaz, All rights reserved. // Free for non-commercial use. // For commercial use, separate licencing terms must be obtained. @@ -17,6 +17,7 @@ #include "../sound/sn76496.h" #include "gfx_cd.h" +#include "pcm.h" typedef unsigned char u8; typedef unsigned short u16; @@ -29,10 +30,6 @@ typedef unsigned int u32; // ----------------------------------------------------------------- -// extern m68ki_cpu_core m68ki_cpu; - -extern int counter75hz; - static u32 m68k_reg_read16(u32 a) { @@ -61,7 +58,7 @@ static u32 m68k_reg_read16(u32 a) dprintf("m68k reserved read"); goto end; case 0xC: - dprintf("m68k stopwatch read"); + dprintf("m68k stopwatch timer read"); break; } @@ -91,12 +88,12 @@ static void m68k_reg_write8(u32 a, u32 d) return; case 1: d &= 3; - if (!(d&1)) PicoMCD |= 2; // reset pending, needed to be sure we fetch the right vectors on reset + if (!(d&1)) Pico_mcd->m.state_flags |= 1; // reset pending, needed to be sure we fetch the right vectors on reset if ( (Pico_mcd->m.busreq&1) != (d&1)) dprintf("m68k: s68k reset %i", !(d&1)); if ( (Pico_mcd->m.busreq&2) != (d&2)) dprintf("m68k: s68k brq %i", (d&2)>>1); - if ((PicoMCD&2) && (d&3)==1) { + if ((Pico_mcd->m.state_flags&1) && (d&3)==1) { SekResetS68k(); // S68k comes out of RESET or BRQ state - PicoMCD&=~2; + Pico_mcd->m.state_flags&=~1; dprintf("m68k: resetting s68k, cycles=%i", SekCyclesLeft); } Pico_mcd->m.busreq = d; @@ -118,9 +115,11 @@ static void m68k_reg_write8(u32 a, u32 d) return; case 6: *((char *)&Pico_mcd->m.hint_vector+1) = d; + Pico_mcd->bios[0x72 + 1] = d; // simple hint vector changer return; case 7: *(char *)&Pico_mcd->m.hint_vector = d; + Pico_mcd->bios[0x72] = d; return; case 0xe: //dprintf("m68k: comm flag: %02x", d); @@ -162,7 +161,11 @@ static u32 s68k_reg_read16(u32 a) d = Read_CDC_Host(1); // Gens returns 0 here on byte reads goto end; case 0xC: - dprintf("s68k stopwatch read"); + dprintf("s68k stopwatch timer read"); + d = Pico_mcd->m.timer_stopwatch >> 16; + goto end; + case 0x30: + dprintf("s68k int3 timer read"); break; case 0x34: // fader d = 0; // no busy bit @@ -210,11 +213,19 @@ static void s68k_reg_write8(u32 a, u32 d) case 0xa: dprintf("s68k set CDC dma addr"); break; + case 0xc: + case 0xd: + dprintf("s68k set stopwatch timer"); + Pico_mcd->m.timer_stopwatch = 0; + return; + case 0x31: + dprintf("s68k set int3 timer: %02x", d); + Pico_mcd->m.timer_int3 = d << 16; + break; case 0x33: // IRQ mask dprintf("s68k irq mask: %02x", d); if ((d&(1<<4)) && (Pico_mcd->s68k_regs[0x37]&4) && !(Pico_mcd->s68k_regs[0x33]&(1<<4))) { CDD_Export_Status(); - // counter75hz = 0; // ??? } break; case 0x34: // fader @@ -227,7 +238,6 @@ static void s68k_reg_write8(u32 a, u32 d) Pico_mcd->s68k_regs[0x37] = d&7; if ((d&4) && !(d_old&4)) { CDD_Export_Status(); - // counter75hz = 0; // ??? } return; } @@ -463,6 +473,22 @@ u8 PicoReadM68k8(u32 a) goto end; } +#if 0 + if (a == 0x200000 && SekPc == 0xff0b66 && Pico.m.frame_count > 1000) + { + int i; + FILE *ff; + unsigned short *ram = (unsigned short *) Pico.ram; + // unswap and dump RAM + for (i = 0; i < 0x10000/2; i++) + ram[i] = (ram[i]>>8) | (ram[i]<<8); + ff = fopen("ram.bin", "wb"); + fwrite(ram, 1, 0x10000, ff); + fclose(ff); + exit(0); + } +#endif + // word RAM if ((a&0xfc0000)==0x200000) { dprintf("m68k_wram r8: [%06x] @%06x", a, SekPc); @@ -500,6 +526,7 @@ u8 PicoReadM68k8(u32 a) return (u8)d; } + u16 PicoReadM68k16(u32 a) { u16 d=0; @@ -552,6 +579,7 @@ u16 PicoReadM68k16(u32 a) return d; } + u32 PicoReadM68k32(u32 a) { u32 d=0; @@ -577,11 +605,10 @@ u32 PicoReadM68k32(u32 a) if (a >= 0x220000) { dprintf("cell"); } else { - u16 *pm; a=((a&0x1fffe)<<1); if (Pico_mcd->s68k_regs[3]&1) a+=2; - pm=(u16 *)(Pico_mcd->word_ram+a); - d = (pm[0]<<16)|pm[1]; + d = *(u16 *)(Pico_mcd->word_ram+a) << 16; + d |= *(u16 *)(Pico_mcd->word_ram+a+4); } } else { // allow access in any mode, like Gens does @@ -606,6 +633,7 @@ u32 PicoReadM68k32(u32 a) return d; } + // ----------------------------------------------------------------- // Write Ram @@ -618,7 +646,10 @@ void PicoWriteM68k8(u32 a,u8 d) // dprintf("w8 : %06x, %02x @%06x", a&0xffffff, d, SekPc); - if ((a&0xe00000)==0xe00000) { u8 *pm=(u8 *)(Pico.ram+((a^1)&0xffff)); pm[0]=d; return; } // Ram + if ((a&0xe00000)==0xe00000) { // Ram + *(u8 *)(Pico.ram+((a^1)&0xffff)) = d; + return; + } a&=0xffffff; @@ -653,6 +684,7 @@ void PicoWriteM68k8(u32 a,u8 d) OtherWrite8(a,d,8); } + void PicoWriteM68k16(u32 a,u16 d) { #ifdef __debug_io @@ -660,7 +692,10 @@ void PicoWriteM68k16(u32 a,u16 d) #endif // dprintf("w16: %06x, %04x @%06x", a&0xffffff, d, SekPc); - if ((a&0xe00000)==0xe00000) { *(u16 *)(Pico.ram+(a&0xfffe))=d; return; } // Ram + if ((a&0xe00000)==0xe00000) { // Ram + *(u16 *)(Pico.ram+(a&0xfffe))=d; + return; + } a&=0xfffffe; @@ -695,6 +730,7 @@ void PicoWriteM68k16(u32 a,u16 d) OtherWrite16(a,d); } + void PicoWriteM68k32(u32 a,u32 d) { #ifdef __debug_io @@ -727,11 +763,10 @@ void PicoWriteM68k32(u32 a,u32 d) if (a >= 0x220000) { dprintf("cell"); } else { - u16 *pm; a=((a&0x1fffe)<<1); if (Pico_mcd->s68k_regs[3]&1) a+=2; - pm=(u16 *)(Pico_mcd->word_ram+a); - pm[0]=(u16)(d>>16); pm[1]=(u16)d; + *(u16 *)(Pico_mcd->word_ram+a) = d>>16; + *(u16 *)(Pico_mcd->word_ram+a+4) = d; } } else { // allow access in any mode, like Gens does @@ -800,6 +835,27 @@ u8 PicoReadS68k8(u32 a) goto end; } + // PCM + if ((a&0xff8000)==0xff0000) { + dprintf("s68k_pcm r8: [%06x] @%06x", a, SekPc); + a &= 0x7fff; + if (a >= 0x2000) + d = Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a>>1)&0xfff]; + else if (a >= 0x20) { + a &= 0x1e; + d = Pico_mcd->pcm.ch[a>>2].addr >> PCM_STEP_SHIFT; + if (a & 2) d >>= 8; + } + dprintf("ret = %02x", (u8)d); + goto end; + } + + // bram + if ((a&0xff0000)==0xfe0000) { + d = Pico_mcd->bram[(a>>1)&0x1fff]; + goto end; + } + dprintf("s68k r8 : %06x, %02x @%06x", a&0xffffff, (u8)d, SekPcS68k); end: @@ -810,9 +866,10 @@ u8 PicoReadS68k8(u32 a) return (u8)d; } + u16 PicoReadS68k16(u32 a) { - u16 d=0; + u32 d=0; a&=0xfffffe; @@ -843,7 +900,7 @@ u16 PicoReadS68k16(u32 a) // allow access in any mode, like Gens does d = *(u16 *)(Pico_mcd->word_ram+(a&0x3fffe)); } - dprintf("ret = %04x", (u8)d); + dprintf("ret = %04x", d); goto end; } @@ -853,7 +910,32 @@ u16 PicoReadS68k16(u32 a) a=((a&0x1fffe)<<1); if (!(Pico_mcd->s68k_regs[3]&1)) a+=2; d = *(u16 *)(Pico_mcd->word_ram+a); - dprintf("ret = %04x", (u8)d); + dprintf("ret = %04x", d); + goto end; + } + + // bram + if ((a&0xff0000)==0xfe0000) { + dprintf("s68k_bram r16: [%06x] @%06x", a, SekPc); + a = (a>>1)&0x1fff; + d = Pico_mcd->bram[a++]; // Gens does little endian here, and so do we.. + d|= Pico_mcd->bram[a++] << 8; + dprintf("ret = %04x", d); + goto end; + } + + // PCM + if ((a&0xff8000)==0xff0000) { + dprintf("s68k_pcm r16: [%06x] @%06x", a, SekPc); + a &= 0x7fff; + if (a >= 0x2000) + d = Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a>>1)&0xfff]; + else if (a >= 0x20) { + a &= 0x1e; + d = Pico_mcd->pcm.ch[a>>2].addr >> PCM_STEP_SHIFT; + if (a & 2) d >>= 8; + } + dprintf("ret = %04x", d); goto end; } @@ -867,6 +949,7 @@ u16 PicoReadS68k16(u32 a) return d; } + u32 PicoReadS68k32(u32 a) { u32 d=0; @@ -901,19 +984,53 @@ u32 PicoReadS68k32(u32 a) // allow access in any mode, like Gens does u16 *pm=(u16 *)(Pico_mcd->word_ram+(a&0x3fffe)); d = (pm[0]<<16)|pm[1]; } - dprintf("ret = %08x", (u8)d); + dprintf("ret = %08x", d); goto end; } // word RAM (1M area) if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff - u16 *pm; - dprintf("s68k_wram1M 32: [%06x] @%06x", a, SekPc); + dprintf("s68k_wram1M r32: [%06x] @%06x", a, SekPc); a=((a&0x1fffe)<<1); if (!(Pico_mcd->s68k_regs[3]&1)) a+=2; - pm=(u16 *)(Pico_mcd->word_ram+a); - d = (pm[0]<<16)|pm[1]; - dprintf("ret = %08x", (u8)d); + d = *(u16 *)(Pico_mcd->word_ram+a) << 16; + d |= *(u16 *)(Pico_mcd->word_ram+a+4); + dprintf("ret = %08x", d); + goto end; + } + + // PCM + if ((a&0xff8000)==0xff0000) { + dprintf("s68k_pcm r32: [%06x] @%06x", a, SekPc); + a &= 0x7fff; + if (a >= 0x2000) { + a >>= 1; + d = Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][a&0xfff] << 16; + d |= Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a+1)&0xfff]; + } else if (a >= 0x20) { + a &= 0x1e; + if (a & 2) { + a >>= 2; + d = (Pico_mcd->pcm.ch[a].addr >> (PCM_STEP_SHIFT-8)) & 0xff0000; + d |= (Pico_mcd->pcm.ch[(a+1)&7].addr >> PCM_STEP_SHIFT) & 0xff; + } else { + d = Pico_mcd->pcm.ch[a>>2].addr >> PCM_STEP_SHIFT; + d = ((d<<16)&0xff0000) | ((d>>8)&0xff); // PCM chip is LE + } + } + dprintf("ret = %08x", d); + goto end; + } + + // bram + if ((a&0xff0000)==0xfe0000) { + dprintf("s68k_bram r32: [%06x] @%06x", a, SekPc); + a = (a>>1)&0x1fff; + d = Pico_mcd->bram[a++] << 16; // middle endian? TODO: verify against Fusion.. + d|= Pico_mcd->bram[a++] << 24; + d|= Pico_mcd->bram[a++]; + d|= Pico_mcd->bram[a++] << 8; + dprintf("ret = %08x", d); goto end; } @@ -927,6 +1044,7 @@ u32 PicoReadS68k32(u32 a) return d; } + // ----------------------------------------------------------------- void PicoWriteS68k8(u32 a,u8 d) @@ -944,9 +1062,6 @@ void PicoWriteS68k8(u32 a,u8 d) return; } - if (a != 0xff0011 && (a&0xff8000) == 0xff0000) // PCM hack - return; - // regs if ((a&0xfffe00) == 0xff8000) { a &= 0x1ff; @@ -980,9 +1095,27 @@ void PicoWriteS68k8(u32 a,u8 d) return; } + // PCM + if ((a&0xff8000)==0xff0000) { + a &= 0x7fff; + if (a >= 0x2000) + Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a>>1)&0xfff] = d; + else if (a < 0x12) + pcm_write(a>>1, d); + return; + } + + // bram + if ((a&0xff0000)==0xfe0000) { + Pico_mcd->bram[(a>>1)&0x1fff] = d; + SRam.changed = 1; + return; + } + dprintf("s68k w8 : %06x, %02x @%06x", a&0xffffff, d, SekPcS68k); } + void PicoWriteS68k16(u32 a,u16 d) { #ifdef __debug_io2 @@ -1033,9 +1166,30 @@ void PicoWriteS68k16(u32 a,u16 d) return; } + // PCM + if ((a&0xff8000)==0xff0000) { + a &= 0x7fff; + if (a >= 0x2000) + Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a>>1)&0xfff] = d; + else if (a < 0x12) + pcm_write(a>>1, d & 0xff); + return; + } + + // bram + if ((a&0xff0000)==0xfe0000) { + dprintf("s68k_bram w16: [%06x] %04x @%06x", a, d, SekPc); + a = (a>>1)&0x1fff; + Pico_mcd->bram[a++] = d; // Gens does little endian here, an so do we.. + Pico_mcd->bram[a++] = d >> 8; + SRam.changed = 1; + return; + } + dprintf("s68k w16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k); } + void PicoWriteS68k32(u32 a,u32 d) { #ifdef __debug_io2 @@ -1083,15 +1237,42 @@ void PicoWriteS68k32(u32 a,u32 d) // word RAM (1M area) if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff - u16 *pm; if (d) dprintf("s68k_wram1M w32: [%06x] %08x @%06x", a, d, SekPc); a=((a&0x1fffe)<<1); if (!(Pico_mcd->s68k_regs[3]&1)) a+=2; - pm=(u16 *)(Pico_mcd->word_ram+a); - pm[0]=(u16)(d>>16); pm[1]=(u16)d; + *(u16 *)(Pico_mcd->word_ram+a) = d>>16; + *(u16 *)(Pico_mcd->word_ram+a+4) = d; + return; + } + + // PCM + if ((a&0xff8000)==0xff0000) { + a &= 0x7fff; + if (a >= 0x2000) { + a >>= 1; + Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][a&0xfff] = (d >> 16); + Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a+1)&0xfff] = d; + } else if (a < 0x12) { + a >>= 1; + pcm_write(a, (d>>16) & 0xff); + pcm_write(a+1, d & 0xff); + } return; } + + // bram + if ((a&0xff0000)==0xfe0000) { + dprintf("s68k_bram w32: [%06x] %08x @%06x", a, d, SekPc); + a = (a>>1)&0x1fff; + Pico_mcd->bram[a++] = d >> 16; // middle endian? verify? + Pico_mcd->bram[a++] = d >> 24; + Pico_mcd->bram[a++] = d; + Pico_mcd->bram[a++] = d >> 8; + SRam.changed = 1; + return; + } + dprintf("s68k w32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k); } @@ -1099,6 +1280,97 @@ void PicoWriteS68k32(u32 a,u32 d) // ----------------------------------------------------------------- + +#if defined(EMU_C68K) +static __inline int PicoMemBaseM68k(u32 pc) +{ + int membase=0; + + if (pc < 0x20000) + { + membase=(int)Pico_mcd->bios; // Program Counter in BIOS + } + else if ((pc&0xe00000)==0xe00000) + { + membase=(int)Pico.ram-(pc&0xff0000); // Program Counter in Ram + } + else if ((pc&0xfc0000)==0x200000 && !(Pico_mcd->s68k_regs[3]&4)) + { + membase=(int)Pico_mcd->word_ram-0x200000; // Program Counter in Word Ram + } + else + { + // Error - Program Counter is invalid + dprintf("m68k: unhandled jump to %06x", pc); + membase=(int)Pico.rom; + } + + return membase; +} + + +static u32 PicoCheckPcM68k(u32 pc) +{ + pc-=PicoCpu.membase; // Get real pc + pc&=0xfffffe; + + PicoCpu.membase=PicoMemBaseM68k(pc); + + return PicoCpu.membase+pc; +} + + +static __inline int PicoMemBaseS68k(u32 pc) +{ + int membase; + + membase=(int)Pico_mcd->prg_ram; // Program Counter in Prg RAM + if (pc >= 0x80000) + { + // Error - Program Counter is invalid + dprintf("s68k: unhandled jump to %06x", pc); + } + + return membase; +} + + +static u32 PicoCheckPcS68k(u32 pc) +{ + pc-=PicoCpuS68k.membase; // Get real pc + pc&=0xfffffe; + + PicoCpuS68k.membase=PicoMemBaseS68k(pc); + + return PicoCpuS68k.membase+pc; +} +#endif + + +void PicoMemSetupCD() +{ + dprintf("PicoMemSetupCD()"); +#ifdef EMU_C68K + // Setup m68k memory callbacks: + PicoCpu.checkpc=PicoCheckPcM68k; + PicoCpu.fetch8 =PicoCpu.read8 =PicoReadM68k8; + PicoCpu.fetch16=PicoCpu.read16=PicoReadM68k16; + PicoCpu.fetch32=PicoCpu.read32=PicoReadM68k32; + PicoCpu.write8 =PicoWriteM68k8; + PicoCpu.write16=PicoWriteM68k16; + PicoCpu.write32=PicoWriteM68k32; + // s68k + PicoCpuS68k.checkpc=PicoCheckPcS68k; + PicoCpuS68k.fetch8 =PicoCpuS68k.read8 =PicoReadS68k8; + PicoCpuS68k.fetch16=PicoCpuS68k.read16=PicoReadS68k16; + PicoCpuS68k.fetch32=PicoCpuS68k.read32=PicoReadS68k32; + PicoCpuS68k.write8 =PicoWriteS68k8; + PicoCpuS68k.write16=PicoWriteS68k16; + PicoCpuS68k.write32=PicoWriteS68k32; +#endif +} + + #ifdef EMU_M68K unsigned char PicoReadCD8w (unsigned int a) { return m68ki_cpu_p == &PicoS68kCPU ? PicoReadS68k8(a) : PicoReadM68k8(a); @@ -1124,10 +1396,13 @@ unsigned int m68k_read_pcrelative_CD8 (unsigned int a) { a&=0xffffff; if(m68ki_cpu_p == &PicoS68kCPU) { if (a < 0x80000) return *(u8 *)(Pico_mcd->prg_ram+(a^1)); // PRG Ram - else dprintf("s68k read_pcrel8 @ %06x", a); + dprintf("s68k_read_pcrelative_CD8: can't handle %06x", a); } else { - if(as68k_regs[3]&4) && (a&0xfc0000)==0x200000) + return Pico_mcd->word_ram[(a^1)&0x3fffe]; + dprintf("m68k_read_pcrelative_CD8: can't handle %06x", a); } return 0;//(u8) lastread_d; } @@ -1135,23 +1410,29 @@ unsigned int m68k_read_pcrelative_CD16(unsigned int a) { a&=0xffffff; if(m68ki_cpu_p == &PicoS68kCPU) { if (a < 0x80000) return *(u16 *)(Pico_mcd->prg_ram+(a&~1)); // PRG Ram - else dprintf("s68k read_pcrel16 @ %06x", a); + dprintf("s68k_read_pcrelative_CD16: can't handle %06x", a); } else { - if(as68k_regs[3]&4) && (a&0xfc0000)==0x200000) + return *(u16 *)(Pico_mcd->word_ram+(a&0x3fffe)); + dprintf("m68k_read_pcrelative_CD16: can't handle %06x", a); } - return 0;//(u16) lastread_d; + return 0; } unsigned int m68k_read_pcrelative_CD32(unsigned int a) { a&=0xffffff; if(m68ki_cpu_p == &PicoS68kCPU) { if (a < 0x80000) { u16 *pm=(u16 *)(Pico_mcd->prg_ram+(a&~1)); return (pm[0]<<16)|pm[1]; } // PRG Ram - else dprintf("s68k read_pcrel32 @ %06x", a); + dprintf("s68k_read_pcrelative_CD32: can't handle %06x", a); } else { - if(as68k_regs[3]&4) && (a&0xfc0000)==0x200000) + { u16 *pm=(u16 *)(Pico_mcd->word_ram+(a&0x3fffe)); return (pm[0]<<16)|pm[1]; } + dprintf("m68k_read_pcrelative_CD32: can't handle %06x", a); } - return 0; //lastread_d; + return 0; } #endif // EMU_M68K