ISO loading, menus, LEDs

[picodrive.git] / Pico / cd / Memory.c

diff --git a/Pico/cd/Memory.c b/Pico/cd/Memory.c
index 49b1113..7860214 100644 (file)
--- a/Pico/cd/Memory.c
+++ b/Pico/cd/Memory.c
@@ -42,6 +42,7 @@ static u32 m68k_reg_read16(u32 a, int realsize)
       goto end;\r
     case 2:\r
       d = (Pico_mcd->s68k_regs[a]<<8) | (Pico_mcd->s68k_regs[a+1]&0xc7);\r
+      dprintf("m68k_regs r3: %02x @%06x", (u8)d, SekPc);\r
       goto end;\r
     case 8:\r
       dprintf("m68k host data read");\r
@@ -96,6 +97,7 @@ static void m68k_reg_write8(u32 a, u32 d, int realsize)
       Pico_mcd->s68k_regs[2] = d; // really use s68k side register\r
       return;\r
     case 3:\r
+      dprintf("m68k_regs w3: %02x @%06x", (u8)d, SekPc);\r
       d &= 0xc2;\r
       if ((Pico_mcd->s68k_regs[3]>>6) != ((d>>6)&3))\r
         dprintf("m68k: prg bank: %i -> %i", (Pico_mcd->s68k_regs[a]>>6), ((d>>6)&3));\r
@@ -143,6 +145,7 @@ static u32 s68k_reg_read16(u32 a, int realsize)
       d = 1; goto end; // ver = 0, not in reset state\r
     case 2:\r
       d = (Pico_mcd->s68k_regs[a]<<8) | (Pico_mcd->s68k_regs[a+1]&0x1f);\r
+      dprintf("s68k_regs r3: %02x @%06x", (u8)d, SekPc);\r
       goto end;\r
     case 6:\r
       d = CDC_Read_Reg();\r
@@ -178,6 +181,7 @@ static void s68k_reg_write8(u32 a, u32 d, int realsize)
     case 2:\r
       return; // only m68k can change WP\r
     case 3:\r
+      dprintf("s68k_regs w3: %02x @%06x", (u8)d, SekPc);\r
       d &= 0x1d;\r
       if (d&4) {\r
         d |= Pico_mcd->s68k_regs[3]&0xc2;\r
@@ -457,7 +461,13 @@ u8 PicoReadM68k8(u32 a)
   if ((a&0xfc0000)==0x200000) {\r
     dprintf("m68k_wram r8: [%06x] @%06x", a, SekPc);\r
     if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?\r
-      // TODO\r
+      if (a >= 0x220000) {\r
+        dprintf("cell");\r
+      } else {\r
+        a=((a&0x1fffe)<<1)|(a&1);\r
+       if (Pico_mcd->s68k_regs[3]&1) a+=2;\r
+        d = Pico_mcd->word_ram[a^1];\r
+      }\r
     } else {\r
       // allow access in any mode, like Gens does\r
       d = Pico_mcd->word_ram[(a^1)&0x3ffff];\r
@@ -468,13 +478,13 @@ u8 PicoReadM68k8(u32 a)
 \r
   if ((a&0xff4000)==0xa00000) { d=z80Read8(a); goto end; } // Z80 Ram\r
 \r
-  if ((a&0xffffc0)==0xa12000)\r
-    dprintf("m68k_regs r8: [%02x] @%06x", a&0x3f, SekPc);\r
+  //if ((a&0xffffc0)==0xa12000)\r
+  //  dprintf("m68k_regs r8: [%02x] @%06x", a&0x3f, SekPc);\r
 \r
   d=OtherRead16(a&~1, 8|(a&1)); if ((a&1)==0) d>>=8;\r
 \r
-  if ((a&0xffffc0)==0xa12000)\r
-    dprintf("ret = %02x", (u8)d);\r
+  //if ((a&0xffffc0)==0xa12000)\r
+  //  dprintf("ret = %02x", (u8)d);\r
 \r
   end:\r
 \r
@@ -505,7 +515,13 @@ u16 PicoReadM68k16(u32 a)
   if ((a&0xfc0000)==0x200000) {\r
     dprintf("m68k_wram r16: [%06x] @%06x", a, SekPc);\r
     if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?\r
-      // TODO\r
+      if (a >= 0x220000) {\r
+        dprintf("cell");\r
+      } else {\r
+        a=((a&0x1fffe)<<1);\r
+       if (Pico_mcd->s68k_regs[3]&1) a+=2;\r
+        d = *(u16 *)(Pico_mcd->word_ram+a);\r
+      }\r
     } else {\r
       // allow access in any mode, like Gens does\r
       d = *(u16 *)(Pico_mcd->word_ram+(a&0x3fffe));\r
@@ -514,13 +530,13 @@ u16 PicoReadM68k16(u32 a)
     goto end;\r
   }\r
 \r
-  if ((a&0xffffc0)==0xa12000)\r
-    dprintf("m68k_regs r16: [%02x] @%06x", a&0x3f, SekPc);\r
+  //if ((a&0xffffc0)==0xa12000)\r
+  //  dprintf("m68k_regs r16: [%02x] @%06x", a&0x3f, SekPc);\r
 \r
   d = (u16)OtherRead16(a, 16);\r
 \r
-  if ((a&0xffffc0)==0xa12000)\r
-    dprintf("ret = %04x", d);\r
+  //if ((a&0xffffc0)==0xa12000)\r
+  //  dprintf("ret = %04x", d);\r
 \r
   end:\r
 \r
@@ -552,7 +568,15 @@ u32 PicoReadM68k32(u32 a)
   if ((a&0xfc0000)==0x200000) {\r
     dprintf("m68k_wram r32: [%06x] @%06x", a, SekPc);\r
     if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?\r
-      // TODO\r
+      if (a >= 0x220000) {\r
+        dprintf("cell");\r
+      } else {\r
+        u16 *pm;\r
+        a=((a&0x1fffe)<<1);\r
+       if (Pico_mcd->s68k_regs[3]&1) a+=2;\r
+        pm=(u16 *)(Pico_mcd->word_ram+a);\r
+       d = (pm[0]<<16)|pm[1];\r
+      }\r
     } else {\r
       // allow access in any mode, like Gens does\r
       u16 *pm=(u16 *)(Pico_mcd->word_ram+(a&0x3fffe)); d = (pm[0]<<16)|pm[1];\r
@@ -561,13 +585,13 @@ u32 PicoReadM68k32(u32 a)
     goto end;\r
   }\r
 \r
-  if ((a&0xffffc0)==0xa12000)\r
-    dprintf("m68k_regs r32: [%02x] @%06x", a&0x3f, SekPc);\r
+  //if ((a&0xffffc0)==0xa12000)\r
+  //  dprintf("m68k_regs r32: [%02x] @%06x", a&0x3f, SekPc);\r
 \r
   d = (OtherRead16(a, 32)<<16)|OtherRead16(a+2, 32);\r
 \r
-  if ((a&0xffffc0)==0xa12000)\r
-    dprintf("ret = %08x", d);\r
+  //if ((a&0xffffc0)==0xa12000)\r
+  //  dprintf("ret = %08x", d);\r
 \r
   end:\r
 #ifdef __debug_io\r
@@ -595,8 +619,7 @@ void PicoWriteM68k8(u32 a,u8 d)
   // prg RAM\r
   if ((a&0xfe0000)==0x020000) {\r
     u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];\r
-    u8 *pm=(u8 *)(prg_bank+((a^1)&0x1ffff));\r
-    *pm=d;\r
+    *(u8 *)(prg_bank+((a^1)&0x1ffff))=d;\r
     return;\r
   }\r
 \r
@@ -604,17 +627,22 @@ void PicoWriteM68k8(u32 a,u8 d)
   if ((a&0xfc0000)==0x200000) {\r
     dprintf("m68k_wram w8: [%06x] %02x @%06x", a, d, SekPc);\r
     if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?\r
-      // TODO\r
+      if (a >= 0x220000) {\r
+        dprintf("cell");\r
+      } else {\r
+        a=((a&0x1fffe)<<1)|(a&1);\r
+       if (Pico_mcd->s68k_regs[3]&1) a+=2;\r
+        *(u8 *)(Pico_mcd->word_ram+(a^1))=d;\r
+      }\r
     } else {\r
       // allow access in any mode, like Gens does\r
-      u8 *pm=(u8 *)(Pico_mcd->word_ram+((a^1)&0x3ffff));\r
-      *pm=d;\r
+      *(u8 *)(Pico_mcd->word_ram+((a^1)&0x3ffff))=d;\r
     }\r
     return;\r
   }\r
 \r
-  if ((a&0xffffc0)==0xa12000)\r
-    dprintf("m68k_regs w8: [%02x] %02x @%06x", a&0x3f, d, SekPc);\r
+  //if ((a&0xffffc0)==0xa12000)\r
+  //  dprintf("m68k_regs w8: [%02x] %02x @%06x", a&0x3f, d, SekPc);\r
 \r
   OtherWrite8(a,d,8);\r
 }\r
@@ -624,7 +652,6 @@ void PicoWriteM68k16(u32 a,u16 d)
 #ifdef __debug_io\r
   dprintf("w16: %06x, %04x", a&0xffffff, d);\r
 #endif\r
-  //if ((a&0xe0ffff)==0xe0AF0E+0x69c||(a&0xe0ffff)==0xe0A9A8+0x69c||(a&0xe0ffff)==0xe0A9AA+0x69c||(a&0xe0ffff)==0xe0A9AC+0x69c)\r
   //  dprintf("w16: %06x, %04x  @%06x", a&0xffffff, d, SekPc);\r
 \r
   if ((a&0xe00000)==0xe00000) { *(u16 *)(Pico.ram+(a&0xfffe))=d; return; } // Ram\r
@@ -642,7 +669,13 @@ void PicoWriteM68k16(u32 a,u16 d)
   if ((a&0xfc0000)==0x200000) {\r
     dprintf("m68k_wram w16: [%06x] %04x @%06x", a, d, SekPc);\r
     if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?\r
-      // TODO\r
+      if (a >= 0x220000) {\r
+        dprintf("cell");\r
+      } else {\r
+        a=((a&0x1fffe)<<1);\r
+       if (Pico_mcd->s68k_regs[3]&1) a+=2;\r
+        *(u16 *)(Pico_mcd->word_ram+a)=d;\r
+      }\r
     } else {\r
       // allow access in any mode, like Gens does\r
       *(u16 *)(Pico_mcd->word_ram+(a&0x3fffe))=d;\r
@@ -650,8 +683,8 @@ void PicoWriteM68k16(u32 a,u16 d)
     return;\r
   }\r
 \r
-  if ((a&0xffffc0)==0xa12000)\r
-    dprintf("m68k_regs w16: [%02x] %04x @%06x", a&0x3f, d, SekPc);\r
+  //if ((a&0xffffc0)==0xa12000)\r
+  //  dprintf("m68k_regs w16: [%02x] %04x @%06x", a&0x3f, d, SekPc);\r
 \r
   OtherWrite16(a,d);\r
 }\r
@@ -685,7 +718,15 @@ void PicoWriteM68k32(u32 a,u32 d)
     if (d != 0) // don't log clears\r
       dprintf("m68k_wram w32: [%06x] %08x @%06x", a, d, SekPc);\r
     if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?\r
-      // TODO\r
+      if (a >= 0x220000) {\r
+        dprintf("cell");\r
+      } else {\r
+        u16 *pm;\r
+        a=((a&0x1fffe)<<1);\r
+       if (Pico_mcd->s68k_regs[3]&1) a+=2;\r
+        pm=(u16 *)(Pico_mcd->word_ram+a);\r
+        pm[0]=(u16)(d>>16); pm[1]=(u16)d;\r
+      }\r
     } else {\r
       // allow access in any mode, like Gens does\r
       u16 *pm=(u16 *)(Pico_mcd->word_ram+(a&0x3fffe));\r
@@ -694,8 +735,8 @@ void PicoWriteM68k32(u32 a,u32 d)
     return;\r
   }\r
 \r
-  if ((a&0xffffc0)==0xa12000)\r
-    dprintf("m68k_regs w32: [%02x] %08x @%06x", a&0x3f, d, SekPc);\r
+  //if ((a&0xffffc0)==0xa12000)\r
+  //  dprintf("m68k_regs w32: [%02x] %08x @%06x", a&0x3f, d, SekPc);\r
 \r
   OtherWrite16(a,  (u16)(d>>16));\r
   OtherWrite16(a+2,(u16)d);\r
@@ -719,9 +760,9 @@ u8 PicoReadS68k8(u32 a)
 \r
   // regs\r
   if ((a&0xfffe00) == 0xff8000) {\r
-    dprintf("s68k_regs r8: [%02x] @ %06x", a&0x1ff, SekPcS68k);\r
+    //dprintf("s68k_regs r8: [%02x] @ %06x", a&0x1ff, SekPcS68k);\r
     d = s68k_reg_read16(a&~1, 8|(a&1)); if ((a&1)==0) d>>=8;\r
-    dprintf("ret = %02x", (u8)d);\r
+    //dprintf("ret = %02x", (u8)d);\r
     goto end;\r
   }\r
 \r
@@ -742,7 +783,10 @@ u8 PicoReadS68k8(u32 a)
   // word RAM (1M area)\r
   if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff\r
     dprintf("s68k_wram1M r8: [%06x] @%06x", a, SekPc);\r
-    // TODO\r
+    a=((a&0x1fffe)<<1)|(a&1);\r
+    if (!(Pico_mcd->s68k_regs[3]&1)) a+=2;\r
+    d = Pico_mcd->word_ram[a^1];\r
+    dprintf("ret = %02x", (u8)d);\r
     goto end;\r
   }\r
 \r
@@ -770,9 +814,9 @@ u16 PicoReadS68k16(u32 a)
 \r
   // regs\r
   if ((a&0xfffe00) == 0xff8000) {\r
-    dprintf("s68k_regs r16: [%02x] @ %06x", a&0x1fe, SekPcS68k);\r
+    //dprintf("s68k_regs r16: [%02x] @ %06x", a&0x1fe, SekPcS68k);\r
     d = s68k_reg_read16(a, 16);\r
-    dprintf("ret = %04x", d);\r
+    //dprintf("ret = %04x", d);\r
     goto end;\r
   }\r
 \r
@@ -793,7 +837,10 @@ u16 PicoReadS68k16(u32 a)
   // word RAM (1M area)\r
   if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff\r
     dprintf("s68k_wram1M r16: [%06x] @%06x", a, SekPc);\r
-    // TODO\r
+    a=((a&0x1fffe)<<1);\r
+    if (!(Pico_mcd->s68k_regs[3]&1)) a+=2;\r
+    d = *(u16 *)(Pico_mcd->word_ram+a);\r
+    dprintf("ret = %04x", (u8)d);\r
     goto end;\r
   }\r
 \r
@@ -822,9 +869,9 @@ u32 PicoReadS68k32(u32 a)
 \r
   // regs\r
   if ((a&0xfffe00) == 0xff8000) {\r
-    dprintf("s68k_regs r32: [%02x] @ %06x", a&0x1fe, SekPcS68k);\r
+    //dprintf("s68k_regs r32: [%02x] @ %06x", a&0x1fe, SekPcS68k);\r
     d = (s68k_reg_read16(a, 32)<<16)|s68k_reg_read16(a+2, 32);\r
-    dprintf("ret = %08x", d);\r
+    //dprintf("ret = %08x", d);\r
     goto end;\r
   }\r
 \r
@@ -844,8 +891,13 @@ u32 PicoReadS68k32(u32 a)
 \r
   // word RAM (1M area)\r
   if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff\r
+    u16 *pm;\r
     dprintf("s68k_wram1M 32: [%06x] @%06x", a, SekPc);\r
-    // TODO\r
+    a=((a&0x1fffe)<<1);\r
+    if (!(Pico_mcd->s68k_regs[3]&1)) a+=2;\r
+    pm=(u16 *)(Pico_mcd->word_ram+a);\r
+    d  = (pm[0]<<16)|pm[1];\r
+    dprintf("ret = %08x", (u8)d);\r
     goto end;\r
   }\r
 \r
@@ -881,7 +933,7 @@ void PicoWriteS68k8(u32 a,u8 d)
 \r
   // regs\r
   if ((a&0xfffe00) == 0xff8000) {\r
-    dprintf("s68k_regs w8: [%02x] %02x @ %06x", a&0x1ff, d, SekPcS68k);\r
+    //dprintf("s68k_regs w8: [%02x] %02x @ %06x", a&0x1ff, d, SekPcS68k);\r
     s68k_reg_write8(a,d,8);\r
     return;\r
   }\r
@@ -894,8 +946,7 @@ void PicoWriteS68k8(u32 a,u8 d)
       dprintf("(decode)");\r
     } else {\r
       // allow access in any mode, like Gens does\r
-      u8 *pm=(u8 *)(Pico_mcd->word_ram+((a^1)&0x3ffff));\r
-      *pm=d;\r
+      *(u8 *)(Pico_mcd->word_ram+((a^1)&0x3ffff))=d;\r
     }\r
     return;\r
   }\r
@@ -904,7 +955,9 @@ void PicoWriteS68k8(u32 a,u8 d)
   if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff\r
     if (d)\r
       dprintf("s68k_wram1M w8: [%06x] %02x @%06x", a, d, SekPc);\r
-    // TODO\r
+    a=((a&0x1fffe)<<1)|(a&1);\r
+    if (!(Pico_mcd->s68k_regs[3]&1)) a+=2;\r
+    *(u8 *)(Pico_mcd->word_ram+(a^1))=d;\r
     return;\r
   }\r
 \r
@@ -927,7 +980,7 @@ void PicoWriteS68k16(u32 a,u16 d)
 \r
   // regs\r
   if ((a&0xfffe00) == 0xff8000) {\r
-    dprintf("s68k_regs w16: [%02x] %04x @ %06x", a&0x1ff, d, SekPcS68k);\r
+    //dprintf("s68k_regs w16: [%02x] %04x @ %06x", a&0x1ff, d, SekPcS68k);\r
     s68k_reg_write8(a,  d>>8, 16);\r
     s68k_reg_write8(a+1,d&0xff, 16);\r
     return;\r
@@ -950,7 +1003,9 @@ void PicoWriteS68k16(u32 a,u16 d)
   if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff\r
     if (d)\r
       dprintf("s68k_wram1M w16: [%06x] %04x @%06x", a, d, SekPc);\r
-    // TODO\r
+    a=((a&0x1fffe)<<1);\r
+    if (!(Pico_mcd->s68k_regs[3]&1)) a+=2;\r
+    *(u16 *)(Pico_mcd->word_ram+a)=d;\r
     return;\r
   }\r
 \r
@@ -974,7 +1029,7 @@ void PicoWriteS68k32(u32 a,u32 d)
 \r
   // regs\r
   if ((a&0xfffe00) == 0xff8000) {\r
-    dprintf("s68k_regs w32: [%02x] %08x @ %06x", a&0x1ff, d, SekPcS68k);\r
+    //dprintf("s68k_regs w32: [%02x] %08x @ %06x", a&0x1ff, d, SekPcS68k);\r
     s68k_reg_write8(a,   d>>24, 32);\r
     s68k_reg_write8(a+1,(d>>16)&0xff, 32);\r
     s68k_reg_write8(a+2,(d>>8) &0xff, 32);\r
@@ -998,9 +1053,13 @@ void PicoWriteS68k32(u32 a,u32 d)
 \r
   // word RAM (1M area)\r
   if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff\r
+    u16 *pm;\r
     if (d)\r
       dprintf("s68k_wram1M w32: [%06x] %08x @%06x", a, d, SekPc);\r
-    // TODO\r
+    a=((a&0x1fffe)<<1);\r
+    if (!(Pico_mcd->s68k_regs[3]&1)) a+=2;\r
+    pm=(u16 *)(Pico_mcd->word_ram+a);\r
+    pm[0]=(u16)(d>>16); pm[1]=(u16)d;\r
     return;\r
   }\r
   dprintf("s68k w32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k);\r