X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=Pico%2Fcd%2FMemory.c;h=739f3bf872d45a64eca77413efa6ef7a56be4b9b;hb=cb4a513a96b173624619686ca21360d556557ec3;hp=78602144cd103189858765988802003f0f5828a9;hpb=bf098bc53228f6b5016cb4a6126f4466bfba4e00;p=picodrive.git

diff --git a/Pico/cd/Memory.c b/Pico/cd/Memory.c
index 7860214..739f3bf 100644
--- a/Pico/cd/Memory.c
+++ b/Pico/cd/Memory.c
@@ -16,12 +16,16 @@
 #include "../sound/ym2612.h"
 #include "../sound/sn76496.h"
 
+#include "gfx_cd.h"
+
 typedef unsigned char  u8;
 typedef unsigned short u16;
 typedef unsigned int   u32;
 
 //#define __debug_io
 //#define __debug_io2
+//#define rdprintf dprintf
+#define rdprintf(...)
 
 // -----------------------------------------------------------------
 
@@ -30,7 +34,7 @@ typedef unsigned int   u32;
 extern int counter75hz;
 
 
-static u32 m68k_reg_read16(u32 a, int realsize)
+static u32 m68k_reg_read16(u32 a)
 {
   u32 d=0;
   a &= 0x3e;
@@ -38,26 +42,29 @@ static u32 m68k_reg_read16(u32 a, int realsize)
 
   switch (a) {
     case 0:
-      d = ((Pico_mcd->s68k_regs[0x33]<<13)&0x8000) | Pico_mcd->m68k_regs[1]; // here IFL2 is always 0, just like in Gens
+      d = ((Pico_mcd->s68k_regs[0x33]<<13)&0x8000) | Pico_mcd->m.busreq; // here IFL2 is always 0, just like in Gens
       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);
       goto end;
+    case 4:
+      d = Pico_mcd->s68k_regs[4]<<8;
+      goto end;
+    case 6:
+      d = Pico_mcd->m.hint_vector;
+      goto end;
     case 8:
-      dprintf("m68k host data read");
       d = Read_CDC_Host(0);
       goto end;
+    case 0xA:
+      dprintf("m68k reserved read");
+      goto end;
     case 0xC:
       dprintf("m68k stopwatch read");
       break;
   }
 
-  if (a < 0xE) {
-    d = (Pico_mcd->m68k_regs[a]<<8) | Pico_mcd->m68k_regs[a+1];
-    goto end;
-  }
-
   if (a < 0x30) {
     // comm flag/cmd/status (0xE-0x2F)
     d = (Pico_mcd->s68k_regs[a]<<8) | Pico_mcd->s68k_regs[a+1];
@@ -72,7 +79,7 @@ end:
   return d;
 }
 
-static void m68k_reg_write8(u32 a, u32 d, int realsize)
+static void m68k_reg_write8(u32 a, u32 d)
 {
   a &= 0x3f;
   // dprintf("m68k_regs w%2i: [%02x] %02x @%06x", realsize, a, d, SekPc);
@@ -81,18 +88,19 @@ static void m68k_reg_write8(u32 a, u32 d, int realsize)
     case 0:
       d &= 1;
       if ((d&1) && (Pico_mcd->s68k_regs[0x33]&(1<<2))) { dprintf("m68k: s68k irq 2"); SekInterruptS68k(2); }
-      break;
+      return;
     case 1:
       d &= 3;
       if (!(d&1)) PicoMCD |= 2; // reset pending, needed to be sure we fetch the right vectors on reset
-      if ( (Pico_mcd->m68k_regs[1]&1) != (d&1)) dprintf("m68k: s68k reset %i", !(d&1));
-      if ( (Pico_mcd->m68k_regs[1]&2) != (d&2)) dprintf("m68k: s68k brq %i", (d&2)>>1);
-      if (/*!(Pico_mcd->m68k_regs[1]&1) &&*/ (PicoMCD&2) && (d&3)==1) {
+      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) {
         SekResetS68k(); // S68k comes out of RESET or BRQ state
 	PicoMCD&=~2;
 	dprintf("m68k: resetting s68k, cycles=%i", SekCyclesLeft);
       }
-      break;
+      Pico_mcd->m.busreq = d;
+      return;
     case 2:
       Pico_mcd->s68k_regs[2] = d; // really use s68k side register
       return;
@@ -108,18 +116,19 @@ static void m68k_reg_write8(u32 a, u32 d, int realsize)
       if (!(d & 4) && (d & 2)) d &= ~1; // return word RAM to s68k in 2M mode
       Pico_mcd->s68k_regs[3] = d; // really use s68k side register
       return;
+    case 6:
+      *((char *)&Pico_mcd->m.hint_vector+1) = d;
+      return;
+    case 7:
+      *(char *)&Pico_mcd->m.hint_vector = d;
+      return;
     case 0xe:
       //dprintf("m68k: comm flag: %02x", d);
 
       //dprintf("s68k @ %06x", SekPcS68k);
 
       Pico_mcd->s68k_regs[0xe] = d;
-      break;
-  }
-
-  if (a < 0x10) {
-    Pico_mcd->m68k_regs[a] = (u8) d;
-    return;
+      return;
   }
 
   if ((a&0xf0) == 0x10) {
@@ -127,22 +136,21 @@ static void m68k_reg_write8(u32 a, u32 d, int realsize)
       return;
   }
 
-  if (a >= 0x20 || (a >= 0xa && a <= 0xd) || a == 0x0f)
-    dprintf("m68k: invalid write?");
+  dprintf("m68k: invalid write? [%02x] %02x", a, d);
 }
 
 
 
-static u32 s68k_reg_read16(u32 a, int realsize)
+static u32 s68k_reg_read16(u32 a)
 {
   u32 d=0;
-  a &= 0x1fe;
 
   // dprintf("s68k_regs r%2i: [%02x] @ %06x", realsize&~1, a+(realsize&1), SekPcS68k);
 
   switch (a) {
     case 0:
-      d = 1; goto end; // ver = 0, not in reset state
+      d = ((Pico_mcd->s68k_regs[0]&3)<<8) | 1; // ver = 0, not in reset state
+      goto end;
     case 2:
       d = (Pico_mcd->s68k_regs[a]<<8) | (Pico_mcd->s68k_regs[a+1]&0x1f);
       dprintf("s68k_regs r3: %02x @%06x", (u8)d, SekPc);
@@ -151,8 +159,7 @@ static u32 s68k_reg_read16(u32 a, int realsize)
       d = CDC_Read_Reg();
       goto end;
     case 8:
-      dprintf("s68k host data read");
-      d = Read_CDC_Host(1);
+      d = Read_CDC_Host(1); // Gens returns 0 here on byte reads
       goto end;
     case 0xC:
       dprintf("s68k stopwatch read");
@@ -171,9 +178,8 @@ end:
   return d;
 }
 
-static void s68k_reg_write8(u32 a, u32 d, int realsize)
+static void s68k_reg_write8(u32 a, u32 d)
 {
-  a &= 0x1ff;
   //dprintf("s68k_regs w%2i: [%02x] %02x @ %06x", realsize, a, d, SekPcS68k);
 
   // TODO: review against Gens
@@ -196,7 +202,7 @@ static void s68k_reg_write8(u32 a, u32 d, int realsize)
       Pico_mcd->s68k_regs[4] = (Pico_mcd->s68k_regs[4]&0xC0) | (d&7); // CDC mode
       return;
     case 5:
-      dprintf("s68k CDC reg addr: %x", d&0xf);
+      //dprintf("s68k CDC reg addr: %x", d&0xf);
       break;
     case 7:
       CDC_Write_Reg(d);
@@ -342,7 +348,7 @@ static u32 OtherRead16(u32 a, int realsize)
   if ((a&0xe700e0)==0xc00000) { d=PicoVideoRead(a); goto end; }
 
   if ((a&0xffffc0)==0xa12000) {
-    d=m68k_reg_read16(a, realsize);
+    d=m68k_reg_read16(a);
     goto end;
   }
 
@@ -404,7 +410,7 @@ static void OtherWrite8(u32 a,u32 d,int realsize)
 
   if ((a&0xe700e0)==0xc00000) { PicoVideoWrite(a,(u16)(d|(d<<8))); return; } // Byte access gets mirrored
 
-  if ((a&0xffffc0)==0xa12000) { m68k_reg_write8(a, d, realsize); return; }
+  if ((a&0xffffc0)==0xa12000) { m68k_reg_write8(a, d); return; }
 
   dprintf("strange w%i: %06x, %08x @%06x", realsize, a&0xffffff, d, SekPc);
 }
@@ -478,13 +484,13 @@ u8 PicoReadM68k8(u32 a)
 
   if ((a&0xff4000)==0xa00000) { d=z80Read8(a); goto end; } // Z80 Ram
 
-  //if ((a&0xffffc0)==0xa12000)
-  //  dprintf("m68k_regs r8: [%02x] @%06x", a&0x3f, SekPc);
+  if ((a&0xffffc0)==0xa12000)
+    rdprintf("m68k_regs r8: [%02x] @%06x", a&0x3f, SekPc);
 
   d=OtherRead16(a&~1, 8|(a&1)); if ((a&1)==0) d>>=8;
 
-  //if ((a&0xffffc0)==0xa12000)
-  //  dprintf("ret = %02x", (u8)d);
+  if ((a&0xffffc0)==0xa12000)
+    rdprintf("ret = %02x", (u8)d);
 
   end:
 
@@ -530,13 +536,13 @@ u16 PicoReadM68k16(u32 a)
     goto end;
   }
 
-  //if ((a&0xffffc0)==0xa12000)
-  //  dprintf("m68k_regs r16: [%02x] @%06x", a&0x3f, SekPc);
+  if ((a&0xffffc0)==0xa12000)
+    rdprintf("m68k_regs r16: [%02x] @%06x", a&0x3f, SekPc);
 
   d = (u16)OtherRead16(a, 16);
 
-  //if ((a&0xffffc0)==0xa12000)
-  //  dprintf("ret = %04x", d);
+  if ((a&0xffffc0)==0xa12000)
+    rdprintf("ret = %04x", d);
 
   end:
 
@@ -585,13 +591,13 @@ u32 PicoReadM68k32(u32 a)
     goto end;
   }
 
-  //if ((a&0xffffc0)==0xa12000)
-  //  dprintf("m68k_regs r32: [%02x] @%06x", a&0x3f, SekPc);
+  if ((a&0xffffc0)==0xa12000)
+    rdprintf("m68k_regs r32: [%02x] @%06x", a&0x3f, SekPc);
 
   d = (OtherRead16(a, 32)<<16)|OtherRead16(a+2, 32);
 
-  //if ((a&0xffffc0)==0xa12000)
-  //  dprintf("ret = %08x", d);
+  if ((a&0xffffc0)==0xa12000)
+    rdprintf("ret = %08x", d);
 
   end:
 #ifdef __debug_io
@@ -641,8 +647,8 @@ void PicoWriteM68k8(u32 a,u8 d)
     return;
   }
 
-  //if ((a&0xffffc0)==0xa12000)
-  //  dprintf("m68k_regs w8: [%02x] %02x @%06x", a&0x3f, d, SekPc);
+  if ((a&0xffffc0)==0xa12000)
+    rdprintf("m68k_regs w8: [%02x] %02x @%06x", a&0x3f, d, SekPc);
 
   OtherWrite8(a,d,8);
 }
@@ -683,8 +689,8 @@ void PicoWriteM68k16(u32 a,u16 d)
     return;
   }
 
-  //if ((a&0xffffc0)==0xa12000)
-  //  dprintf("m68k_regs w16: [%02x] %04x @%06x", a&0x3f, d, SekPc);
+  if ((a&0xffffc0)==0xa12000)
+    rdprintf("m68k_regs w16: [%02x] %04x @%06x", a&0x3f, d, SekPc);
 
   OtherWrite16(a,d);
 }
@@ -735,8 +741,8 @@ void PicoWriteM68k32(u32 a,u32 d)
     return;
   }
 
-  //if ((a&0xffffc0)==0xa12000)
-  //  dprintf("m68k_regs w32: [%02x] %08x @%06x", a&0x3f, d, SekPc);
+  if ((a&0xffffc0)==0xa12000)
+    rdprintf("m68k_regs w32: [%02x] %08x @%06x", a&0x3f, d, SekPc);
 
   OtherWrite16(a,  (u16)(d>>16));
   OtherWrite16(a+2,(u16)d);
@@ -760,9 +766,13 @@ u8 PicoReadS68k8(u32 a)
 
   // regs
   if ((a&0xfffe00) == 0xff8000) {
-    //dprintf("s68k_regs r8: [%02x] @ %06x", a&0x1ff, SekPcS68k);
-    d = s68k_reg_read16(a&~1, 8|(a&1)); if ((a&1)==0) d>>=8;
-    //dprintf("ret = %02x", (u8)d);
+    a &= 0x1ff;
+    rdprintf("s68k_regs r8: [%02x] @ %06x", a, SekPcS68k);
+    if (a >= 0x50 && a < 0x68)
+         d = gfx_cd_read(a&~1);
+    else d = s68k_reg_read16(a&~1);
+    if ((a&1)==0) d>>=8;
+    rdprintf("ret = %02x", (u8)d);
     goto end;
   }
 
@@ -814,9 +824,12 @@ u16 PicoReadS68k16(u32 a)
 
   // regs
   if ((a&0xfffe00) == 0xff8000) {
-    //dprintf("s68k_regs r16: [%02x] @ %06x", a&0x1fe, SekPcS68k);
-    d = s68k_reg_read16(a, 16);
-    //dprintf("ret = %04x", d);
+    a &= 0x1fe;
+    rdprintf("s68k_regs r16: [%02x] @ %06x", a, SekPcS68k);
+    if (a >= 0x50 && a < 0x68)
+         d = gfx_cd_read(a);
+    else d = s68k_reg_read16(a);
+    rdprintf("ret = %04x", d);
     goto end;
   }
 
@@ -869,9 +882,12 @@ u32 PicoReadS68k32(u32 a)
 
   // regs
   if ((a&0xfffe00) == 0xff8000) {
-    //dprintf("s68k_regs r32: [%02x] @ %06x", a&0x1fe, SekPcS68k);
-    d = (s68k_reg_read16(a, 32)<<16)|s68k_reg_read16(a+2, 32);
-    //dprintf("ret = %08x", d);
+    a &= 0x1fe;
+    rdprintf("s68k_regs r32: [%02x] @ %06x", a, SekPcS68k);
+    if (a >= 0x50 && a < 0x68)
+         d = (gfx_cd_read(a)<<16)|gfx_cd_read(a+2);
+    else d = (s68k_reg_read16(a)<<16)|s68k_reg_read16(a+2);
+    rdprintf("ret = %08x", d);
     goto end;
   }
 
@@ -933,8 +949,11 @@ void PicoWriteS68k8(u32 a,u8 d)
 
   // regs
   if ((a&0xfffe00) == 0xff8000) {
-    //dprintf("s68k_regs w8: [%02x] %02x @ %06x", a&0x1ff, d, SekPcS68k);
-    s68k_reg_write8(a,d,8);
+    a &= 0x1ff;
+    rdprintf("s68k_regs w8: [%02x] %02x @ %06x", a, d, SekPcS68k);
+    if (a >= 0x50 && a < 0x68)
+         gfx_cd_write(a&~1, (d<<8)|d);
+    else s68k_reg_write8(a,d);
     return;
   }
 
@@ -980,9 +999,14 @@ void PicoWriteS68k16(u32 a,u16 d)
 
   // regs
   if ((a&0xfffe00) == 0xff8000) {
-    //dprintf("s68k_regs w16: [%02x] %04x @ %06x", a&0x1ff, d, SekPcS68k);
-    s68k_reg_write8(a,  d>>8, 16);
-    s68k_reg_write8(a+1,d&0xff, 16);
+    a &= 0x1fe;
+    rdprintf("s68k_regs w16: [%02x] %04x @ %06x", a, d, SekPcS68k);
+    if (a >= 0x50 && a < 0x68)
+      gfx_cd_write(a, d);
+    else {
+      s68k_reg_write8(a,  d>>8);
+      s68k_reg_write8(a+1,d&0xff);
+    }
     return;
   }
 
@@ -1029,11 +1053,17 @@ void PicoWriteS68k32(u32 a,u32 d)
 
   // regs
   if ((a&0xfffe00) == 0xff8000) {
-    //dprintf("s68k_regs w32: [%02x] %08x @ %06x", a&0x1ff, d, SekPcS68k);
-    s68k_reg_write8(a,   d>>24, 32);
-    s68k_reg_write8(a+1,(d>>16)&0xff, 32);
-    s68k_reg_write8(a+2,(d>>8) &0xff, 32);
-    s68k_reg_write8(a+3, d     &0xff, 32);
+    a &= 0x1fe;
+    rdprintf("s68k_regs w32: [%02x] %08x @ %06x", a, d, SekPcS68k);
+    if (a >= 0x50 && a < 0x68) {
+      gfx_cd_write(a,   d>>16);
+      gfx_cd_write(a+2, d&0xffff);
+    } else {
+      s68k_reg_write8(a,   d>>24);
+      s68k_reg_write8(a+1,(d>>16)&0xff);
+      s68k_reg_write8(a+2,(d>>8) &0xff);
+      s68k_reg_write8(a+3, d     &0xff);
+    }
     return;
   }