X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FMemory.c;h=c941806e4c0a80e589a06d848e765ec850c79b58;hb=3a81ecde1cf95372e27a3e6ca6f9c2cccc86e272;hp=c56425bc9e1b66d82c9f3dc3809374359df06873;hpb=51a902ae2512cffdb3ac7751988c1bde4a641be4;p=picodrive.git

diff --git a/Pico/cd/Memory.c b/Pico/cd/Memory.c
index c56425b..c941806 100644
--- a/Pico/cd/Memory.c
+++ b/Pico/cd/Memory.c
@@ -17,6 +17,7 @@
 #include "../sound/sn76496.h"
 
 #include "gfx_cd.h"
+#include "pcm.h"
 
 typedef unsigned char  u8;
 typedef unsigned short u16;
@@ -29,8 +30,6 @@ typedef unsigned int   u32;
 
 // -----------------------------------------------------------------
 
-// extern m68ki_cpu_core m68ki_cpu;
-
 
 static u32 m68k_reg_read16(u32 a)
 {
@@ -44,7 +43,7 @@ static u32 m68k_reg_read16(u32 a)
       goto end;
     case 2:
       d = (Pico_mcd->s68k_regs[a]<<8) | (Pico_mcd->s68k_regs[a+1]&0xc7);
-      dprintf("m68k_regs r3: %02x @%06x", (u8)d, SekPc);
+      dprintf("m68k_regs r3: %02x @%06x", (u8)d, SekPcS68k);
       goto end;
     case 4:
       d = Pico_mcd->s68k_regs[4]<<8;
@@ -60,7 +59,8 @@ static u32 m68k_reg_read16(u32 a)
       goto end;
     case 0xC:
       dprintf("m68k stopwatch timer read");
-      break;
+      d = Pico_mcd->m.timer_stopwatch >> 16;
+      goto end;
   }
 
   if (a < 0x30) {
@@ -124,9 +124,6 @@ static void m68k_reg_write8(u32 a, u32 d)
       return;
     case 0xe:
       //dprintf("m68k: comm flag: %02x", d);
-
-      //dprintf("s68k @ %06x", SekPcS68k);
-
       Pico_mcd->s68k_regs[0xe] = d;
       return;
   }
@@ -163,7 +160,8 @@ static u32 s68k_reg_read16(u32 a)
       goto end;
     case 0xC:
       dprintf("s68k stopwatch timer read");
-      break;
+      d = Pico_mcd->m.timer_stopwatch >> 16;
+      goto end;
     case 0x30:
       dprintf("s68k int3 timer read");
       break;
@@ -214,10 +212,17 @@ static void s68k_reg_write8(u32 a, u32 d)
       dprintf("s68k set CDC dma addr");
       break;
     case 0xc:
+    case 0xd:
       dprintf("s68k set stopwatch timer");
-      break;
+      Pico_mcd->m.timer_stopwatch = 0;
+      return;
+    case 0xe:
+      Pico_mcd->s68k_regs[0Xf] = (d>>1) | (d<<7); // ror8, Gens note: Dragons lair
+      Pico_mcd->m.timer_stopwatch = 0;
+      return;
     case 0x31:
-      dprintf("s68k set int3 timer");
+      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);
@@ -244,9 +249,9 @@ static void s68k_reg_write8(u32 a, u32 d)
       return;
   }
 
-  if ((a&0x1f0) == 0x10 || a == 0x0e || (a >= 0x38 && a < 0x42))
+  if ((a&0x1f0) == 0x10 || (a >= 0x38 && a < 0x42))
   {
-    dprintf("m68k: invalid write @ %02x?", a);
+    dprintf("s68k: invalid write @ %02x?", a);
     return;
   }
 
@@ -810,7 +815,7 @@ u8 PicoReadS68k8(u32 a)
 
   // word RAM (2M area)
   if ((a&0xfc0000)==0x080000) { // 080000-0bffff
-    dprintf("s68k_wram2M r8: [%06x] @%06x", a, SekPc);
+    dprintf("s68k_wram2M r8: [%06x] @%06x", a, SekPcS68k);
     if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?
       // TODO (decode)
       dprintf("(decode)");
@@ -824,7 +829,7 @@ u8 PicoReadS68k8(u32 a)
 
   // word RAM (1M area)
   if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff
-    dprintf("s68k_wram1M r8: [%06x] @%06x", a, SekPc);
+    dprintf("s68k_wram1M r8: [%06x] @%06x", a, SekPcS68k);
     a=((a&0x1fffe)<<1)|(a&1);
     if (!(Pico_mcd->s68k_regs[3]&1)) a+=2;
     d = Pico_mcd->word_ram[a^1];
@@ -832,6 +837,21 @@ u8 PicoReadS68k8(u32 a)
     goto end;
   }
 
+  // PCM
+  if ((a&0xff8000)==0xff0000) {
+    dprintf("s68k_pcm r8: [%06x] @%06x", a, SekPcS68k);
+    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];
@@ -851,7 +871,7 @@ u8 PicoReadS68k8(u32 a)
 
 u16 PicoReadS68k16(u32 a)
 {
-  u16 d=0;
+  u32 d=0;
 
   a&=0xfffffe;
 
@@ -874,7 +894,7 @@ u16 PicoReadS68k16(u32 a)
 
   // word RAM (2M area)
   if ((a&0xfc0000)==0x080000) { // 080000-0bffff
-    dprintf("s68k_wram2M r16: [%06x] @%06x", a, SekPc);
+    dprintf("s68k_wram2M r16: [%06x] @%06x", a, SekPcS68k);
     if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?
       // TODO (decode)
       dprintf("(decode)");
@@ -888,7 +908,7 @@ u16 PicoReadS68k16(u32 a)
 
   // word RAM (1M area)
   if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff
-    dprintf("s68k_wram1M r16: [%06x] @%06x", a, SekPc);
+    dprintf("s68k_wram1M r16: [%06x] @%06x", a, SekPcS68k);
     a=((a&0x1fffe)<<1);
     if (!(Pico_mcd->s68k_regs[3]&1)) a+=2;
     d = *(u16 *)(Pico_mcd->word_ram+a);
@@ -898,14 +918,29 @@ u16 PicoReadS68k16(u32 a)
 
   // bram
   if ((a&0xff0000)==0xfe0000) {
-    dprintf("s68k_bram r16: [%06x] @%06x", a, SekPc);
+    dprintf("s68k_bram r16: [%06x] @%06x", a, SekPcS68k);
     a = (a>>1)&0x1fff;
-    d = Pico_mcd->bram[a++];		// Gens does little endian here, an so do we..
+    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, SekPcS68k);
+    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;
+  }
+
   dprintf("s68k r16: %06x, %04x  @%06x", a&0xffffff, d, SekPcS68k);
 
   end:
@@ -943,7 +978,7 @@ u32 PicoReadS68k32(u32 a)
 
   // word RAM (2M area)
   if ((a&0xfc0000)==0x080000) { // 080000-0bffff
-    dprintf("s68k_wram2M r32: [%06x] @%06x", a, SekPc);
+    dprintf("s68k_wram2M r32: [%06x] @%06x", a, SekPcS68k);
     if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?
       // TODO (decode)
       dprintf("(decode)");
@@ -957,7 +992,7 @@ u32 PicoReadS68k32(u32 a)
 
   // word RAM (1M area)
   if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff
-    dprintf("s68k_wram1M r32: [%06x] @%06x", a, SekPc);
+    dprintf("s68k_wram1M r32: [%06x] @%06x", a, SekPcS68k);
     a=((a&0x1fffe)<<1);
     if (!(Pico_mcd->s68k_regs[3]&1)) a+=2;
     d  = *(u16 *)(Pico_mcd->word_ram+a) << 16;
@@ -966,9 +1001,32 @@ u32 PicoReadS68k32(u32 a)
     goto end;
   }
 
+  // PCM
+  if ((a&0xff8000)==0xff0000) {
+    dprintf("s68k_pcm r32: [%06x] @%06x", a, SekPcS68k);
+    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);
+    dprintf("s68k_bram r32: [%06x] @%06x", a, SekPcS68k);
     a = (a>>1)&0x1fff;
     d = Pico_mcd->bram[a++] << 16;		// middle endian? TODO: verify against Fusion..
     d|= Pico_mcd->bram[a++] << 24;
@@ -1006,9 +1064,6 @@ void PicoWriteS68k8(u32 a,u8 d)
     return;
   }
 
-  if (a != 0xff0011 && (a&0xff8000) == 0xff0000) // PCM hack
-    return;
-
   // regs
   if ((a&0xfffe00) == 0xff8000) {
     a &= 0x1ff;
@@ -1021,7 +1076,7 @@ void PicoWriteS68k8(u32 a,u8 d)
 
   // word RAM (2M area)
   if ((a&0xfc0000)==0x080000) { // 080000-0bffff
-    dprintf("s68k_wram2M w8: [%06x] %02x @%06x", a, d, SekPc);
+    dprintf("s68k_wram2M w8: [%06x] %02x @%06x", a, d, SekPcS68k);
     if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?
       // TODO (decode)
       dprintf("(decode)");
@@ -1035,13 +1090,23 @@ void PicoWriteS68k8(u32 a,u8 d)
   // word RAM (1M area)
   if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff
     if (d)
-      dprintf("s68k_wram1M w8: [%06x] %02x @%06x", a, d, SekPc);
+      dprintf("s68k_wram1M w8: [%06x] %02x @%06x", a, d, SekPcS68k);
     a=((a&0x1fffe)<<1)|(a&1);
     if (!(Pico_mcd->s68k_regs[3]&1)) a+=2;
     *(u8 *)(Pico_mcd->word_ram+(a^1))=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;
@@ -1074,6 +1139,10 @@ void PicoWriteS68k16(u32 a,u16 d)
     if (a >= 0x50 && a < 0x68)
       gfx_cd_write(a, d);
     else {
+      if (a == 0xe) { // special case, 2 byte writes would be handled differently
+        Pico_mcd->s68k_regs[0xf] = d;
+	return;
+      }
       s68k_reg_write8(a,  d>>8);
       s68k_reg_write8(a+1,d&0xff);
     }
@@ -1082,7 +1151,7 @@ void PicoWriteS68k16(u32 a,u16 d)
 
   // word RAM (2M area)
   if ((a&0xfc0000)==0x080000) { // 080000-0bffff
-    dprintf("s68k_wram2M w16: [%06x] %04x @%06x", a, d, SekPc);
+    dprintf("s68k_wram2M w16: [%06x] %04x @%06x", a, d, SekPcS68k);
     if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?
       // TODO (decode)
       dprintf("(decode)");
@@ -1096,16 +1165,26 @@ void PicoWriteS68k16(u32 a,u16 d)
   // word RAM (1M area)
   if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff
     if (d)
-      dprintf("s68k_wram1M w16: [%06x] %04x @%06x", a, d, SekPc);
+      dprintf("s68k_wram1M w16: [%06x] %04x @%06x", a, d, SekPcS68k);
     a=((a&0x1fffe)<<1);
     if (!(Pico_mcd->s68k_regs[3]&1)) a+=2;
     *(u16 *)(Pico_mcd->word_ram+a)=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);
+    dprintf("s68k_bram w16: [%06x] %04x @%06x", a, d, SekPcS68k);
     a = (a>>1)&0x1fff;
     Pico_mcd->bram[a++] = d;		// Gens does little endian here, an so do we..
     Pico_mcd->bram[a++] = d >> 8;
@@ -1150,7 +1229,7 @@ void PicoWriteS68k32(u32 a,u32 d)
 
   // word RAM (2M area)
   if ((a&0xfc0000)==0x080000) { // 080000-0bffff
-    dprintf("s68k_wram2M w32: [%06x] %08x @%06x", a, d, SekPc);
+    dprintf("s68k_wram2M w32: [%06x] %08x @%06x", a, d, SekPcS68k);
     if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?
       // TODO (decode)
       dprintf("(decode)");
@@ -1165,7 +1244,7 @@ void PicoWriteS68k32(u32 a,u32 d)
   // word RAM (1M area)
   if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff
     if (d)
-      dprintf("s68k_wram1M w32: [%06x] %08x @%06x", a, d, SekPc);
+      dprintf("s68k_wram1M w32: [%06x] %08x @%06x", a, d, SekPcS68k);
     a=((a&0x1fffe)<<1);
     if (!(Pico_mcd->s68k_regs[3]&1)) a+=2;
     *(u16 *)(Pico_mcd->word_ram+a) = d>>16;
@@ -1173,9 +1252,24 @@ void PicoWriteS68k32(u32 a,u32 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);
+    dprintf("s68k_bram w32: [%06x] %08x @%06x", a, d, SekPcS68k);
     a = (a>>1)&0x1fff;
     Pico_mcd->bram[a++] = d >> 16;		// middle endian? verify?
     Pico_mcd->bram[a++] = d >> 24;