X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FMemory.c;h=ce23433bd437d6bca289094e8870c5032afd1cbd;hb=5c69a605aeaa09798db62a4cfcce7bba4f9dc2b6;hp=890af0a22b737ad7239ce7b498d6a0c8c53e2bca;hpb=fa1e5e2948e9b06dec3353081081173f7ae4d742;p=picodrive.git

diff --git a/Pico/cd/Memory.c b/Pico/cd/Memory.c
index 890af0a..ce23433 100644
--- a/Pico/cd/Memory.c
+++ b/Pico/cd/Memory.c
@@ -19,20 +19,28 @@
 #include "gfx_cd.h"
 #include "pcm.h"
 
-#include "cell_map.c"
-
 typedef unsigned char  u8;
 typedef unsigned short u16;
 typedef unsigned int   u32;
 
 //#define __debug_io
 //#define __debug_io2
+
 //#define rdprintf dprintf
 #define rdprintf(...)
+//#define wrdprintf dprintf
+#define wrdprintf(...)
 
 // -----------------------------------------------------------------
 
 
+#ifndef _ASM_CD_MEMORY_C
+void PicoMemResetCD(int r3)
+{
+}
+#endif
+
+#ifndef _ASM_CD_MEMORY_C
 static u32 m68k_reg_read16(u32 a)
 {
   u32 d=0;
@@ -51,7 +59,7 @@ static u32 m68k_reg_read16(u32 a)
       d = Pico_mcd->s68k_regs[4]<<8;
       goto end;
     case 6:
-      d = Pico_mcd->m.hint_vector;
+      d = *(u16 *)(Pico_mcd->bios + 0x72);
       goto end;
     case 8:
       d = Read_CDC_Host(0);
@@ -60,8 +68,8 @@ static u32 m68k_reg_read16(u32 a)
       dprintf("m68k FIXME: reserved read");
       goto end;
     case 0xC:
-      dprintf("m68k stopwatch timer read");
       d = Pico_mcd->m.timer_stopwatch >> 16;
+      dprintf("m68k stopwatch timer read (%04x)", d);
       goto end;
   }
 
@@ -78,8 +86,12 @@ end:
   // dprintf("ret = %04x", d);
   return d;
 }
+#endif
 
-static void m68k_reg_write8(u32 a, u32 d)
+#ifndef _ASM_CD_MEMORY_C
+static
+#endif
+void m68k_reg_write8(u32 a, u32 d)
 {
   a &= 0x3f;
   // dprintf("m68k_regs w%2i: [%02x] %02x @%06x", realsize, a, d, SekPc);
@@ -96,34 +108,44 @@ static void m68k_reg_write8(u32 a, u32 d)
       if ( (Pico_mcd->m.busreq&2) != (d&2)) dprintf("m68k: s68k brq %i", (d&2)>>1);
       if ((Pico_mcd->m.state_flags&1) && (d&3)==1) {
         SekResetS68k(); // S68k comes out of RESET or BRQ state
-	Pico_mcd->m.state_flags&=~1;
-	dprintf("m68k: resetting s68k, cycles=%i", SekCyclesLeft);
+        Pico_mcd->m.state_flags&=~1;
+        dprintf("m68k: resetting s68k, cycles=%i", SekCyclesLeft);
       }
       Pico_mcd->m.busreq = d;
       return;
     case 2:
       Pico_mcd->s68k_regs[2] = d; // really use s68k side register
       return;
-    case 3:
+    case 3: {
+      u32 dold = Pico_mcd->s68k_regs[3]&0x1f;
       dprintf("m68k_regs w3: %02x @%06x", (u8)d, SekPc);
       d &= 0xc2;
-      if ((Pico_mcd->s68k_regs[3]>>6) != ((d>>6)&3))
+      if ((dold>>6) != ((d>>6)&3))
         dprintf("m68k: prg bank: %i -> %i", (Pico_mcd->s68k_regs[a]>>6), ((d>>6)&3));
       //if ((Pico_mcd->s68k_regs[3]&4) != (d&4)) dprintf("m68k: ram mode %i mbit", (d&4) ? 1 : 2);
       //if ((Pico_mcd->s68k_regs[3]&2) != (d&2)) dprintf("m68k: %s", (d&4) ? ((d&2) ? "word swap req" : "noop?") :
       //                                             ((d&2) ? "word ram to s68k" : "word ram to m68k"));
-      d |= Pico_mcd->s68k_regs[3]&0x1d;
-      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
+      if (dold & 4) {
+        d ^= 2;                // writing 0 to DMNA actually sets it, 1 does nothing
+      } else {
+        //dold &= ~2; // ??
+        if (d & 2) dold &= ~1; // return word RAM to s68k in 2M mode
+      }
+      Pico_mcd->s68k_regs[3] = d | dold; // really use s68k side register
+
+/*
+     d |= Pico_mcd->s68k_regs[3]&0x1d;
+     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:
-      dprintf("FIXME hint[2]: %02x @%06x", (u8)d, SekPc);
       Pico_mcd->bios[0x72 + 1] = d; // simple hint vector changer
       return;
     case 7:
-      dprintf("FIXME hint[3]: %02x @%06x", (u8)d, SekPc);
       Pico_mcd->bios[0x72] = d;
-      dprintf("vector is now %08x", PicoRead32(0x70));
+      dprintf("hint vector set to %08x", PicoRead32(0x70));
       return;
     case 0xe:
       //dprintf("m68k: comm flag: %02x", d);
@@ -140,8 +162,21 @@ static void m68k_reg_write8(u32 a, u32 d)
 }
 
 
+#define READ_FONT_DATA(basemask) \
+{ \
+      unsigned int fnt = *(unsigned int *)(Pico_mcd->s68k_regs + 0x4c); \
+      unsigned int col0 = (fnt >> 8) & 0x0f, col1 = (fnt >> 12) & 0x0f;   \
+      if (fnt & (basemask << 0)) d  = col1      ; else d  = col0;       \
+      if (fnt & (basemask << 1)) d |= col1 <<  4; else d |= col0 <<  4; \
+      if (fnt & (basemask << 2)) d |= col1 <<  8; else d |= col0 <<  8; \
+      if (fnt & (basemask << 3)) d |= col1 << 12; else d |= col0 << 12; \
+}
+
 
-static u32 s68k_reg_read16(u32 a)
+#ifndef _ASM_CD_MEMORY_C
+static
+#endif
+u32 s68k_reg_read16(u32 a)
 {
   u32 d=0;
 
@@ -153,7 +188,7 @@ static u32 s68k_reg_read16(u32 a)
       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);
+      dprintf("s68k_regs r3: %02x @%06x", (u8)d, SekPcS68k);
       goto end;
     case 6:
       d = CDC_Read_Reg();
@@ -162,15 +197,27 @@ 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 timer read");
       d = Pico_mcd->m.timer_stopwatch >> 16;
+      dprintf("s68k stopwatch timer read (%04x)", d);
       goto end;
     case 0x30:
-      dprintf("s68k int3 timer read");
+      dprintf("s68k int3 timer read (%02x%02x)", Pico_mcd->s68k_regs[30], Pico_mcd->s68k_regs[31]);
       break;
     case 0x34: // fader
       d = 0; // no busy bit
       goto end;
+    case 0x50: // font data (check: Lunar 2, Silpheed)
+      READ_FONT_DATA(0x00100000);
+      goto end;
+    case 0x52:
+      READ_FONT_DATA(0x00010000);
+      goto end;
+    case 0x54:
+      READ_FONT_DATA(0x10000000);
+      goto end;
+    case 0x56:
+      READ_FONT_DATA(0x01000000);
+      goto end;
   }
 
   d = (Pico_mcd->s68k_regs[a]<<8) | Pico_mcd->s68k_regs[a+1];
@@ -182,7 +229,10 @@ end:
   return d;
 }
 
-static void s68k_reg_write8(u32 a, u32 d)
+#ifndef _ASM_CD_MEMORY_C
+static
+#endif
+void s68k_reg_write8(u32 a, u32 d)
 {
   //dprintf("s68k_regs w%2i: [%02x] %02x @ %06x", realsize, a, d, SekPcS68k);
 
@@ -194,20 +244,33 @@ static void s68k_reg_write8(u32 a, u32 d)
       int dold = Pico_mcd->s68k_regs[3];
       dprintf("s68k_regs w3: %02x @%06x", (u8)d, SekPc);
       d &= 0x1d;
+      d |= dold&0xc2;
       if (d&4) {
-        d |= dold&0xc2;
-        if ((d ^ dold) & 5) d &= ~2; // in case of mode or bank change we clear DMNA (m68k req) bit
+        if ((d ^ dold) & 5) {
+          d &= ~2; // in case of mode or bank change we clear DMNA (m68k req) bit
+#ifdef _ASM_CD_MEMORY_C
+          PicoMemResetCD(d);
+#endif
+        }
         if (!(dold & 4)) {
           dprintf("wram mode 2M->1M");
           wram_2M_to_1M(Pico_mcd->word_ram2M);
-	}
+        }
       } else {
-        d |= Pico_mcd->s68k_regs[3]&0xc3;
-        if (d&1) d &= ~2; // return word RAM to m68k in 2M mode
         if (dold & 4) {
           dprintf("wram mode 1M->2M");
+          if (!(d&1)) { // it didn't set the ret bit, which means it doesn't want to give WRAM to m68k
+            d &= ~3;
+            d |= (dold&1) ? 2 : 1; // then give it to the one which had bank0 in 1M mode
+          }
           wram_1M_to_2M(Pico_mcd->word_ram2M);
-	}
+#ifdef _ASM_CD_MEMORY_C
+          PicoMemResetCD(d);
+#endif
+        }
+        else
+          d |= dold&1;
+        if (d&1) d &= ~2; // return word RAM to m68k in 2M mode
       }
       break;
     }
@@ -272,7 +335,7 @@ static void s68k_reg_write8(u32 a, u32 d)
 }
 
 
-
+#ifndef _ASM_CD_MEMORY_C
 static u32 OtherRead16End(u32 a, int realsize)
 {
   u32 d=0;
@@ -299,12 +362,17 @@ static void OtherWrite8End(u32 a, u32 d, int realsize)
 
 #undef _ASM_MEMORY_C
 #include "../MemoryCmn.c"
-
+#include "cell_map.c"
+#endif // !def _ASM_CD_MEMORY_C
 
 // -----------------------------------------------------------------
 //                     Read Rom and read Ram
 
-u8 PicoReadM68k8(u32 a)
+//u8 PicoReadM68k8_(u32 a);
+#ifdef _ASM_CD_MEMORY_C
+u8 PicoReadM68k8(u32 a);
+#else
+static u8 PicoReadM68k8(u32 a)
 {
   u32 d=0;
 
@@ -315,31 +383,15 @@ u8 PicoReadM68k8(u32 a)
   if (a < 0x20000) { d = *(u8 *)(Pico_mcd->bios+(a^1)); goto end; } // bios
 
   // prg RAM
-  if ((a&0xfe0000)==0x020000) {
+  if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) {
     u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];
     d = *(prg_bank+((a^1)&0x1ffff));
     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);
+    wrdprintf("m68k_wram r8: [%06x] @%06x", a, SekPc);
     if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?
       int bank = Pico_mcd->s68k_regs[3]&1;
       if (a >= 0x220000)
@@ -350,7 +402,7 @@ u8 PicoReadM68k8(u32 a)
       // allow access in any mode, like Gens does
       d = Pico_mcd->word_ram2M[(a^1)&0x3ffff];
     }
-    dprintf("ret = %02x", (u8)d);
+    wrdprintf("ret = %02x", (u8)d);
     goto end;
   }
 
@@ -371,9 +423,13 @@ u8 PicoReadM68k8(u32 a)
 #endif
   return (u8)d;
 }
+#endif
 
 
-u16 PicoReadM68k16(u32 a)
+#ifdef _ASM_CD_MEMORY_C
+u16 PicoReadM68k16(u32 a);
+#else
+static u16 PicoReadM68k16(u32 a)
 {
   u16 d=0;
 
@@ -384,7 +440,7 @@ u16 PicoReadM68k16(u32 a)
   if (a < 0x20000) { d = *(u16 *)(Pico_mcd->bios+a); goto end; } // bios
 
   // prg RAM
-  if ((a&0xfe0000)==0x020000) {
+  if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) {
     u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];
     d = *(u16 *)(prg_bank+(a&0x1fffe));
     goto end;
@@ -392,7 +448,7 @@ u16 PicoReadM68k16(u32 a)
 
   // word RAM
   if ((a&0xfc0000)==0x200000) {
-    dprintf("m68k_wram r16: [%06x] @%06x", a, SekPc);
+    wrdprintf("m68k_wram r16: [%06x] @%06x", a, SekPc);
     if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?
       int bank = Pico_mcd->s68k_regs[3]&1;
       if (a >= 0x220000)
@@ -403,7 +459,7 @@ u16 PicoReadM68k16(u32 a)
       // allow access in any mode, like Gens does
       d = *(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe));
     }
-    dprintf("ret = %04x", d);
+    wrdprintf("ret = %04x", d);
     goto end;
   }
 
@@ -422,9 +478,13 @@ u16 PicoReadM68k16(u32 a)
 #endif
   return d;
 }
+#endif
 
 
-u32 PicoReadM68k32(u32 a)
+#ifdef _ASM_CD_MEMORY_C
+u32 PicoReadM68k32(u32 a);
+#else
+static u32 PicoReadM68k32(u32 a)
 {
   u32 d=0;
 
@@ -435,7 +495,7 @@ u32 PicoReadM68k32(u32 a)
   if (a < 0x20000) { u16 *pm=(u16 *)(Pico_mcd->bios+a); d = (pm[0]<<16)|pm[1]; goto end; } // bios
 
   // prg RAM
-  if ((a&0xfe0000)==0x020000) {
+  if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) {
     u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];
     u16 *pm=(u16 *)(prg_bank+(a&0x1fffe));
     d = (pm[0]<<16)|pm[1];
@@ -444,16 +504,16 @@ u32 PicoReadM68k32(u32 a)
 
   // word RAM
   if ((a&0xfc0000)==0x200000) {
-    dprintf("m68k_wram r32: [%06x] @%06x", a, SekPc);
+    wrdprintf("m68k_wram r32: [%06x] @%06x", a, SekPc);
     if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?
       int bank = Pico_mcd->s68k_regs[3]&1;
       if (a >= 0x220000) { // cell arranged
         u32 a1, a2;
         a1 = (a&2) | (cell_map(a >> 2) << 2);
-	if (a&2) a2 = cell_map((a+2) >> 2) << 2;
-	else     a2 = a1 + 2;
-	d  = *(u16 *)(Pico_mcd->word_ram1M[bank]+a1) << 16;
-	d |= *(u16 *)(Pico_mcd->word_ram1M[bank]+a2);
+        if (a&2) a2 = cell_map((a+2) >> 2) << 2;
+        else     a2 = a1 + 2;
+        d  = *(u16 *)(Pico_mcd->word_ram1M[bank]+a1) << 16;
+        d |= *(u16 *)(Pico_mcd->word_ram1M[bank]+a2);
       } else {
         u16 *pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); d = (pm[0]<<16)|pm[1];
       }
@@ -461,7 +521,7 @@ u32 PicoReadM68k32(u32 a)
       // allow access in any mode, like Gens does
       u16 *pm=(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe)); d = (pm[0]<<16)|pm[1];
     }
-    dprintf("ret = %08x", d);
+    wrdprintf("ret = %08x", d);
     goto end;
   }
 
@@ -479,12 +539,16 @@ u32 PicoReadM68k32(u32 a)
 #endif
   return d;
 }
+#endif
 
 
 // -----------------------------------------------------------------
 //                            Write Ram
 
-void PicoWriteM68k8(u32 a,u8 d)
+#ifdef _ASM_CD_MEMORY_C
+void PicoWriteM68k8(u32 a,u8 d);
+#else
+static void PicoWriteM68k8(u32 a,u8 d)
 {
 #ifdef __debug_io
   dprintf("w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPc);
@@ -501,7 +565,7 @@ void PicoWriteM68k8(u32 a,u8 d)
   a&=0xffffff;
 
   // prg RAM
-  if ((a&0xfe0000)==0x020000) {
+  if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) {
     u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];
     *(u8 *)(prg_bank+((a^1)&0x1ffff))=d;
     return;
@@ -509,7 +573,7 @@ void PicoWriteM68k8(u32 a,u8 d)
 
   // word RAM
   if ((a&0xfc0000)==0x200000) {
-    dprintf("m68k_wram w8: [%06x] %02x @%06x", a, d, SekPc);
+    wrdprintf("m68k_wram w8: [%06x] %02x @%06x", a, d, SekPc);
     if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?
       int bank = Pico_mcd->s68k_regs[3]&1;
       if (a >= 0x220000)
@@ -528,9 +592,13 @@ void PicoWriteM68k8(u32 a,u8 d)
 
   OtherWrite8(a,d,8);
 }
+#endif
 
 
-void PicoWriteM68k16(u32 a,u16 d)
+#ifdef _ASM_CD_MEMORY_C
+void PicoWriteM68k16(u32 a,u16 d);
+#else
+static void PicoWriteM68k16(u32 a,u16 d)
 {
 #ifdef __debug_io
   dprintf("w16: %06x, %04x", a&0xffffff, d);
@@ -545,7 +613,7 @@ void PicoWriteM68k16(u32 a,u16 d)
   a&=0xfffffe;
 
   // prg RAM
-  if ((a&0xfe0000)==0x020000) {
+  if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) {
     u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];
     *(u16 *)(prg_bank+(a&0x1fffe))=d;
     return;
@@ -553,7 +621,7 @@ void PicoWriteM68k16(u32 a,u16 d)
 
   // word RAM
   if ((a&0xfc0000)==0x200000) {
-    dprintf("m68k_wram w16: [%06x] %04x @%06x", a, d, SekPc);
+    wrdprintf("m68k_wram w16: [%06x] %04x @%06x", a, d, SekPc);
     if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?
       int bank = Pico_mcd->s68k_regs[3]&1;
       if (a >= 0x220000)
@@ -572,9 +640,13 @@ void PicoWriteM68k16(u32 a,u16 d)
 
   OtherWrite16(a,d);
 }
+#endif
 
 
-void PicoWriteM68k32(u32 a,u32 d)
+#ifdef _ASM_CD_MEMORY_C
+void PicoWriteM68k32(u32 a,u32 d);
+#else
+static void PicoWriteM68k32(u32 a,u32 d)
 {
 #ifdef __debug_io
   dprintf("w32: %06x, %08x", a&0xffffff, d);
@@ -591,7 +663,7 @@ void PicoWriteM68k32(u32 a,u32 d)
   a&=0xfffffe;
 
   // prg RAM
-  if ((a&0xfe0000)==0x020000) {
+  if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) {
     u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];
     u16 *pm=(u16 *)(prg_bank+(a&0x1fffe));
     pm[0]=(u16)(d>>16); pm[1]=(u16)d;
@@ -601,16 +673,16 @@ void PicoWriteM68k32(u32 a,u32 d)
   // word RAM
   if ((a&0xfc0000)==0x200000) {
     if (d != 0) // don't log clears
-      dprintf("m68k_wram w32: [%06x] %08x @%06x", a, d, SekPc);
+      wrdprintf("m68k_wram w32: [%06x] %08x @%06x", a, d, SekPc);
     if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?
       int bank = Pico_mcd->s68k_regs[3]&1;
       if (a >= 0x220000) { // cell arranged
         u32 a1, a2;
         a1 = (a&2) | (cell_map(a >> 2) << 2);
-	if (a&2) a2 = cell_map((a+2) >> 2) << 2;
-	else     a2 = a1 + 2;
-	*(u16 *)(Pico_mcd->word_ram1M[bank]+a1) = d >> 16;
-	*(u16 *)(Pico_mcd->word_ram1M[bank]+a2) = d;
+        if (a&2) a2 = cell_map((a+2) >> 2) << 2;
+        else     a2 = a1 + 2;
+        *(u16 *)(Pico_mcd->word_ram1M[bank]+a1) = d >> 16;
+        *(u16 *)(Pico_mcd->word_ram1M[bank]+a2) = d;
       } else {
         u16 *pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe));
         pm[0]=(u16)(d>>16); pm[1]=(u16)d;
@@ -629,12 +701,15 @@ void PicoWriteM68k32(u32 a,u32 d)
   OtherWrite16(a,  (u16)(d>>16));
   OtherWrite16(a+2,(u16)d);
 }
+#endif
 
 
 // -----------------------------------------------------------------
 
-
-u8 PicoReadS68k8(u32 a)
+#ifdef _ASM_CD_MEMORY_C
+u8 PicoReadS68k8(u32 a);
+#else
+static u8 PicoReadS68k8(u32 a)
 {
   u32 d=0;
 
@@ -650,7 +725,7 @@ u8 PicoReadS68k8(u32 a)
   if ((a&0xfffe00) == 0xff8000) {
     a &= 0x1ff;
     rdprintf("s68k_regs r8: [%02x] @ %06x", a, SekPcS68k);
-    if (a >= 0x50 && a < 0x68)
+    if (a >= 0x58 && a < 0x68)
          d = gfx_cd_read(a&~1);
     else d = s68k_reg_read16(a&~1);
     if ((a&1)==0) d>>=8;
@@ -661,7 +736,7 @@ u8 PicoReadS68k8(u32 a)
   // word RAM (2M area)
   if ((a&0xfc0000)==0x080000) { // 080000-0bffff
     // test: batman returns
-    dprintf("s68k_wram2M r8: [%06x] @%06x", a, SekPcS68k);
+    wrdprintf("s68k_wram2M r8: [%06x] @%06x", a, SekPcS68k);
     if (Pico_mcd->s68k_regs[3]&4) { // 1M decode mode?
       int bank = !(Pico_mcd->s68k_regs[3]&1);
       d = Pico_mcd->word_ram1M[bank][((a>>1)^1)&0x1ffff];
@@ -672,19 +747,19 @@ u8 PicoReadS68k8(u32 a)
       // allow access in any mode, like Gens does
       d = Pico_mcd->word_ram2M[(a^1)&0x3ffff];
     }
-    dprintf("ret = %02x", (u8)d);
+    wrdprintf("ret = %02x", (u8)d);
     goto end;
   }
 
   // word RAM (1M area)
-  if ((a&0xfe0000)==0x0c0000) { // 0c0000-0dffff
+  if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff
     int bank;
-    dprintf("s68k_wram1M r8: [%06x] @%06x", a, SekPcS68k);
-    if (!(Pico_mcd->s68k_regs[3]&4))
-      dprintf("s68k_wram1M FIXME: wrong mode");
+    wrdprintf("s68k_wram1M r8: [%06x] @%06x", a, SekPcS68k);
+//    if (!(Pico_mcd->s68k_regs[3]&4))
+//      dprintf("s68k_wram1M FIXME: wrong mode");
     bank = !(Pico_mcd->s68k_regs[3]&1);
     d = Pico_mcd->word_ram1M[bank][(a^1)&0x1ffff];
-    dprintf("ret = %02x", (u8)d);
+    wrdprintf("ret = %02x", (u8)d);
     goto end;
   }
 
@@ -718,9 +793,14 @@ u8 PicoReadS68k8(u32 a)
 #endif
   return (u8)d;
 }
+#endif
 
 
-u16 PicoReadS68k16(u32 a)
+//u16 PicoReadS68k16_(u32 a);
+#ifdef _ASM_CD_MEMORY_C
+u16 PicoReadS68k16(u32 a);
+#else
+static u16 PicoReadS68k16(u32 a)
 {
   u32 d=0;
 
@@ -736,7 +816,7 @@ u16 PicoReadS68k16(u32 a)
   if ((a&0xfffe00) == 0xff8000) {
     a &= 0x1fe;
     rdprintf("s68k_regs r16: [%02x] @ %06x", a, SekPcS68k);
-    if (a >= 0x50 && a < 0x68)
+    if (a >= 0x58 && a < 0x68)
          d = gfx_cd_read(a);
     else d = s68k_reg_read16(a);
     rdprintf("ret = %04x", d);
@@ -745,7 +825,7 @@ u16 PicoReadS68k16(u32 a)
 
   // word RAM (2M area)
   if ((a&0xfc0000)==0x080000) { // 080000-0bffff
-    dprintf("s68k_wram2M r16: [%06x] @%06x", a, SekPcS68k);
+    wrdprintf("s68k_wram2M r16: [%06x] @%06x", a, SekPcS68k);
     if (Pico_mcd->s68k_regs[3]&4) { // 1M decode mode?
       int bank = !(Pico_mcd->s68k_regs[3]&1);
       d = Pico_mcd->word_ram1M[bank][((a>>1)^1)&0x1ffff];
@@ -755,35 +835,35 @@ u16 PicoReadS68k16(u32 a)
       // allow access in any mode, like Gens does
       d = *(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe));
     }
-    dprintf("ret = %04x", d);
+    wrdprintf("ret = %04x", d);
     goto end;
   }
 
   // word RAM (1M area)
-  if ((a&0xfe0000)==0x0c0000) { // 0c0000-0dffff
+  if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff
     int bank;
-    dprintf("s68k_wram1M r16: [%06x] @%06x", a, SekPcS68k);
-    if (!(Pico_mcd->s68k_regs[3]&4))
-      dprintf("s68k_wram1M FIXME: wrong mode");
+    wrdprintf("s68k_wram1M r16: [%06x] @%06x", a, SekPcS68k);
+//    if (!(Pico_mcd->s68k_regs[3]&4))
+//      dprintf("s68k_wram1M FIXME: wrong mode");
     bank = !(Pico_mcd->s68k_regs[3]&1);
     d = *(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe));
-    dprintf("ret = %04x", d);
+    wrdprintf("ret = %04x", d);
     goto end;
   }
 
   // bram
   if ((a&0xff0000)==0xfe0000) {
-    dprintf("s68k_bram r16: [%06x] @%06x", a, SekPcS68k);
+    dprintf("FIXME: s68k_bram r16: [%06x] @%06x", a, SekPcS68k);
     a = (a>>1)&0x1fff;
     d = Pico_mcd->bram[a++];		// Gens does little endian here, and so do we..
-    d|= Pico_mcd->bram[a++] << 8;
+    d|= Pico_mcd->bram[a++] << 8;	// This is most likely wrong
     dprintf("ret = %04x", d);
     goto end;
   }
 
   // PCM
   if ((a&0xff8000)==0xff0000) {
-    dprintf("s68k_pcm r16: [%06x] @%06x", a, SekPcS68k);
+    dprintf("FIXME: 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];
@@ -805,9 +885,13 @@ u16 PicoReadS68k16(u32 a)
 #endif
   return d;
 }
+#endif
 
 
-u32 PicoReadS68k32(u32 a)
+#ifdef _ASM_CD_MEMORY_C
+u32 PicoReadS68k32(u32 a);
+#else
+static u32 PicoReadS68k32(u32 a)
 {
   u32 d=0;
 
@@ -824,7 +908,7 @@ u32 PicoReadS68k32(u32 a)
   if ((a&0xfffe00) == 0xff8000) {
     a &= 0x1fe;
     rdprintf("s68k_regs r32: [%02x] @ %06x", a, SekPcS68k);
-    if (a >= 0x50 && a < 0x68)
+    if (a >= 0x58 && 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);
@@ -833,7 +917,7 @@ u32 PicoReadS68k32(u32 a)
 
   // word RAM (2M area)
   if ((a&0xfc0000)==0x080000) { // 080000-0bffff
-    dprintf("s68k_wram2M r32: [%06x] @%06x", a, SekPcS68k);
+    wrdprintf("s68k_wram2M r32: [%06x] @%06x", a, SekPcS68k);
     if (Pico_mcd->s68k_regs[3]&4) { // 1M decode mode?
       int bank = !(Pico_mcd->s68k_regs[3]&1);
       a >>= 1;
@@ -845,25 +929,25 @@ u32 PicoReadS68k32(u32 a)
       // allow access in any mode, like Gens does
       u16 *pm=(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe)); d = (pm[0]<<16)|pm[1];
     }
-    dprintf("ret = %08x", d);
+    wrdprintf("ret = %08x", d);
     goto end;
   }
 
   // word RAM (1M area)
-  if ((a&0xfe0000)==0x0c0000) { // 0c0000-0dffff
+  if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff
     int bank;
-    dprintf("s68k_wram1M r32: [%06x] @%06x", a, SekPcS68k);
-    if (!(Pico_mcd->s68k_regs[3]&4))
-      dprintf("s68k_wram1M FIXME: wrong mode");
+    wrdprintf("s68k_wram1M r32: [%06x] @%06x", a, SekPcS68k);
+//    if (!(Pico_mcd->s68k_regs[3]&4))
+//      dprintf("s68k_wram1M FIXME: wrong mode");
     bank = !(Pico_mcd->s68k_regs[3]&1);
     u16 *pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); d = (pm[0]<<16)|pm[1];
-    dprintf("ret = %08x", d);
+    wrdprintf("ret = %08x", d);
     goto end;
   }
 
   // PCM
   if ((a&0xff8000)==0xff0000) {
-    dprintf("s68k_pcm r32: [%06x] @%06x", a, SekPcS68k);
+    dprintf("FIXME: s68k_pcm r32: [%06x] @%06x", a, SekPcS68k);
     a &= 0x7fff;
     if (a >= 0x2000) {
       a >>= 1;
@@ -886,7 +970,7 @@ u32 PicoReadS68k32(u32 a)
 
   // bram
   if ((a&0xff0000)==0xfe0000) {
-    dprintf("s68k_bram r32: [%06x] @%06x", a, SekPcS68k);
+    dprintf("FIXME: 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;
@@ -905,11 +989,69 @@ u32 PicoReadS68k32(u32 a)
 #endif
   return d;
 }
+#endif
+
+
+/* check: jaguar xj 220 (draws entire world using decode) */
+static void decode_write8(u32 a, u8 d, int r3)
+{
+  u8 *pd = Pico_mcd->word_ram1M[!(r3 & 1)] + (((a>>1)^1)&0x1ffff);
+  u8 oldmask = (a&1) ? 0xf0 : 0x0f;
+
+  r3 &= 0x18;
+  d  &= 0x0f;
+  if (!(a&1)) d <<= 4;
+
+  //dprintf("FIXME: decode, r3 = %02x", r3);
+
+  if (r3 == 8) {
+    if ((!(*pd & (~oldmask))) && d) goto do_it;
+  } else if (r3 > 8) {
+    if (d) goto do_it;
+  } else {
+    goto do_it;
+  }
+
+  return;
+do_it:
+  *pd = d | (*pd & oldmask);
+}
+
+
+static void decode_write16(u32 a, u16 d, int r3)
+{
+  u8 *pd = Pico_mcd->word_ram1M[!(r3 & 1)] + (((a>>1)^1)&0x1ffff);
+
+  //if ((a & 0x3ffff) < 0x28000) return;
+
+  r3 &= 0x18;
+  d  &= 0x0f0f;
+  d  |= d >> 4;
+
+  if (r3 == 8) {
+    u8 dold = *pd;
+    if (!(dold & 0xf0)) dold |= d & 0xf0;
+    if (!(dold & 0x0f)) dold |= d & 0x0f;
+    *pd = dold;
+  } else if (r3 > 8) {
+    u8 dold = *pd;
+    if (!(d & 0xf0)) d |= dold & 0xf0;
+    if (!(d & 0x0f)) d |= dold & 0x0f;
+    *pd = d;
+  } else {
+    *pd = d;
+  }
+
+  //dprintf("FIXME: decode");
+}
 
 
 // -----------------------------------------------------------------
 
-void PicoWriteS68k8(u32 a,u8 d)
+#ifdef _ASM_CD_MEMORY_C
+void PicoWriteS68k8(u32 a,u8 d);
+#else
+static void PicoWriteS68k8(u32 a,u8 d)
 {
 #ifdef __debug_io2
   dprintf("s68k w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPcS68k);
@@ -928,7 +1070,7 @@ void PicoWriteS68k8(u32 a,u8 d)
   if ((a&0xfffe00) == 0xff8000) {
     a &= 0x1ff;
     rdprintf("s68k_regs w8: [%02x] %02x @ %06x", a, d, SekPcS68k);
-    if (a >= 0x50 && a < 0x68)
+    if (a >= 0x58 && a < 0x68)
          gfx_cd_write(a&~1, (d<<8)|d);
     else s68k_reg_write8(a,d);
     return;
@@ -936,13 +1078,10 @@ 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, SekPcS68k);
-    if (Pico_mcd->s68k_regs[3]&4) { // 1M decode mode?
-      int bank = !(Pico_mcd->s68k_regs[3]&1);
-      if (a&1) d &= 0x0f;
-      else d >>= 4;
-      Pico_mcd->word_ram1M[bank][((a>>1)^1)&0x1ffff]=d;
-      dprintf("FIXME: decode");
+    int r3 = Pico_mcd->s68k_regs[3];
+    wrdprintf("s68k_wram2M w8: [%06x] %02x @%06x", a, d, SekPcS68k);
+    if (r3 & 4) { // 1M decode mode?
+      decode_write8(a, d, r3);
     } else {
       // allow access in any mode, like Gens does
       *(u8 *)(Pico_mcd->word_ram2M+((a^1)&0x3ffff))=d;
@@ -951,12 +1090,13 @@ void PicoWriteS68k8(u32 a,u8 d)
   }
 
   // word RAM (1M area)
-  if ((a&0xfe0000)==0x0c0000) { // 0c0000-0dffff
+  if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff
+    // Wing Commander tries to write here in wrong mode
     int bank;
     if (d)
-      dprintf("s68k_wram1M w8: [%06x] %02x @%06x", a, d, SekPcS68k);
-    if (!(Pico_mcd->s68k_regs[3]&4))
-      dprintf("s68k_wram1M FIXME: wrong mode");
+      wrdprintf("s68k_wram1M w8: [%06x] %02x @%06x", a, d, SekPcS68k);
+//    if (!(Pico_mcd->s68k_regs[3]&4))
+//      dprintf("s68k_wram1M FIXME: wrong mode");
     bank = !(Pico_mcd->s68k_regs[3]&1);
     *(u8 *)(Pico_mcd->word_ram1M[bank]+((a^1)&0x1ffff))=d;
     return;
@@ -981,9 +1121,13 @@ void PicoWriteS68k8(u32 a,u8 d)
 
   dprintf("s68k w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPcS68k);
 }
+#endif
 
 
-void PicoWriteS68k16(u32 a,u16 d)
+#ifdef _ASM_CD_MEMORY_C
+void PicoWriteS68k16(u32 a,u16 d);
+#else
+static void PicoWriteS68k16(u32 a,u16 d)
 {
 #ifdef __debug_io2
   dprintf("s68k w16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k);
@@ -1001,12 +1145,12 @@ void PicoWriteS68k16(u32 a,u16 d)
   if ((a&0xfffe00) == 0xff8000) {
     a &= 0x1fe;
     rdprintf("s68k_regs w16: [%02x] %04x @ %06x", a, d, SekPcS68k);
-    if (a >= 0x50 && a < 0x68)
+    if (a >= 0x58 && 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;
+        return;
       }
       s68k_reg_write8(a,  d>>8);
       s68k_reg_write8(a+1,d&0xff);
@@ -1016,12 +1160,10 @@ 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, SekPcS68k);
-    if (Pico_mcd->s68k_regs[3]&4) { // 1M decode mode?
-      int bank = !(Pico_mcd->s68k_regs[3]&1);
-      d &= ~0xf0; d |= d >> 8;
-      Pico_mcd->word_ram1M[bank][((a>>1)^1)&0x1ffff] = d;
-      dprintf("FIXME: decode");
+    int r3 = Pico_mcd->s68k_regs[3];
+    wrdprintf("s68k_wram2M w16: [%06x] %04x @%06x", a, d, SekPcS68k);
+    if (r3 & 4) { // 1M decode mode?
+      decode_write16(a, d, r3);
     } else {
       // allow access in any mode, like Gens does
       *(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe))=d;
@@ -1030,12 +1172,12 @@ void PicoWriteS68k16(u32 a,u16 d)
   }
 
   // word RAM (1M area)
-  if ((a&0xfe0000)==0x0c0000) { // 0c0000-0dffff
+  if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff
     int bank;
     if (d)
-      dprintf("s68k_wram1M w16: [%06x] %04x @%06x", a, d, SekPcS68k);
-    if (!(Pico_mcd->s68k_regs[3]&4))
-      dprintf("s68k_wram1M FIXME: wrong mode");
+      wrdprintf("s68k_wram1M w16: [%06x] %04x @%06x", a, d, SekPcS68k);
+//    if (!(Pico_mcd->s68k_regs[3]&4))
+//      dprintf("s68k_wram1M FIXME: wrong mode");
     bank = !(Pico_mcd->s68k_regs[3]&1);
     *(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe))=d;
     return;
@@ -1063,9 +1205,13 @@ void PicoWriteS68k16(u32 a,u16 d)
 
   dprintf("s68k w16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k);
 }
+#endif
 
 
-void PicoWriteS68k32(u32 a,u32 d)
+#ifdef _ASM_CD_MEMORY_C
+void PicoWriteS68k32(u32 a,u32 d);
+#else
+static void PicoWriteS68k32(u32 a,u32 d)
 {
 #ifdef __debug_io2
   dprintf("s68k w32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k);
@@ -1084,7 +1230,7 @@ void PicoWriteS68k32(u32 a,u32 d)
   if ((a&0xfffe00) == 0xff8000) {
     a &= 0x1fe;
     rdprintf("s68k_regs w32: [%02x] %08x @ %06x", a, d, SekPcS68k);
-    if (a >= 0x50 && a < 0x68) {
+    if (a >= 0x58 && a < 0x68) {
       gfx_cd_write(a,   d>>16);
       gfx_cd_write(a+2, d&0xffff);
     } else {
@@ -1098,14 +1244,11 @@ 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, SekPcS68k);
-    if (Pico_mcd->s68k_regs[3]&4) { // 1M decode mode?
-      int bank = !(Pico_mcd->s68k_regs[3]&1);
-      a >>= 1;
-      d &= 0x0f0f0f0f; d |= d >> 4;
-      Pico_mcd->word_ram1M[bank][((a+0)^1)&0x1ffff] = d >> 16;
-      Pico_mcd->word_ram1M[bank][((a+1)^1)&0x1ffff] = d;
-      dprintf("FIXME: decode");
+    int r3 = Pico_mcd->s68k_regs[3];
+    wrdprintf("s68k_wram2M w32: [%06x] %08x @%06x", a, d, SekPcS68k);
+    if (r3 & 4) { // 1M decode mode?
+      decode_write16(a  , d >> 16, r3);
+      decode_write16(a+2, d      , r3);
     } else {
       // allow access in any mode, like Gens does
       u16 *pm=(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe));
@@ -1115,13 +1258,13 @@ void PicoWriteS68k32(u32 a,u32 d)
   }
 
   // word RAM (1M area)
-  if ((a&0xfe0000)==0x0c0000) { // 0c0000-0dffff
+  if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff
     int bank;
     u16 *pm;
     if (d)
-      dprintf("s68k_wram1M w32: [%06x] %08x @%06x", a, d, SekPcS68k);
-    if (!(Pico_mcd->s68k_regs[3]&4))
-      dprintf("s68k_wram1M FIXME: wrong mode");
+      wrdprintf("s68k_wram1M w32: [%06x] %08x @%06x", a, d, SekPcS68k);
+//    if (!(Pico_mcd->s68k_regs[3]&4))
+//      dprintf("s68k_wram1M FIXME: wrong mode");
     bank = !(Pico_mcd->s68k_regs[3]&1);
     pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe));
     pm[0]=(u16)(d>>16); pm[1]=(u16)d;
@@ -1157,7 +1300,7 @@ void PicoWriteS68k32(u32 a,u32 d)
 
   dprintf("s68k w32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k);
 }
-
+#endif
 
 
 // -----------------------------------------------------------------