some poor timing improvement attempts

[picodrive.git] / pico / memory.c

diff --git a/pico/memory.c b/pico/memory.c
index 83fe181..3900208 100644 (file)
--- a/pico/memory.c
+++ b/pico/memory.c
@@ -385,6 +385,28 @@ void NOINLINE ctl_write_z80reset(u32 d)
   }\r
 }\r
 \r
+static int get_scanline(int is_from_z80);\r
+\r
+static void psg_write_68k(u32 d)\r
+{\r
+  // look for volume write and update if needed\r
+  if ((d & 0x90) == 0x90 && PsndPsgLine < Pico.m.scanline)\r
+    PsndDoPSG(Pico.m.scanline);\r
+\r
+  SN76496Write(d);\r
+}\r
+\r
+static void psg_write_z80(u32 d)\r
+{\r
+  if ((d & 0x90) == 0x90) {\r
+    int scanline = get_scanline(1);\r
+    if (PsndPsgLine < scanline)\r
+      PsndDoPSG(scanline);\r
+  }\r
+\r
+  SN76496Write(d);\r
+}\r
+\r
 // -----------------------------------------------------------------\r
 \r
 #ifndef _ASM_MEMORY_C\r
@@ -528,8 +550,7 @@ static void PicoWrite8_z80(u32 a, u32 d)
   }\r
   // TODO: probably other VDP access too? Maybe more mirrors?\r
   if ((a & 0x7ff9) == 0x7f11) { // PSG Sound\r
-    if (PicoOpt & POPT_EN_PSG)\r
-      SN76496Write(d);\r
+    psg_write_68k(d);\r
     return;\r
   }\r
   if ((a & 0x7f00) == 0x6000) // Z80 BANK register\r
@@ -682,10 +703,21 @@ void PicoWrite16_io(u32 a, u32 d)
 \r
 // VDP area (0xc00000 - 0xdfffff)\r
 // TODO: verify if lower byte goes to PSG on word writes\r
-static u32 PicoRead8_vdp(u32 a)\r
+u32 PicoRead8_vdp(u32 a)\r
 {\r
-  if ((a & 0x00e0) == 0x0000)\r
-    return PicoVideoRead8(a);\r
+  if ((a & 0x00f0) == 0x0000) {\r
+    switch (a & 0x0d)\r
+    {\r
+      case 0x00: return PicoVideoRead8DataH();\r
+      case 0x01: return PicoVideoRead8DataL();\r
+      case 0x04: return PicoVideoRead8CtlH();\r
+      case 0x05: return PicoVideoRead8CtlL();\r
+      case 0x08:\r
+      case 0x0c: return PicoVideoRead8HV_H();\r
+      case 0x09:\r
+      case 0x0d: return PicoVideoRead8HV_L();\r
+    }\r
+  }\r
 \r
   elprintf(EL_UIO|EL_ANOMALY, "68k bad read [%06x] @%06x", a, SekPc);\r
   return 0;\r
@@ -703,8 +735,7 @@ static u32 PicoRead16_vdp(u32 a)
 static void PicoWrite8_vdp(u32 a, u32 d)\r
 {\r
   if ((a & 0x00f9) == 0x0011) { // PSG Sound\r
-    if (PicoOpt & POPT_EN_PSG)\r
-      SN76496Write(d);\r
+    psg_write_68k(d);\r
     return;\r
   }\r
   if ((a & 0x00e0) == 0x0000) {\r
@@ -718,11 +749,8 @@ static void PicoWrite8_vdp(u32 a, u32 d)
 \r
 static void PicoWrite16_vdp(u32 a, u32 d)\r
 {\r
-  if ((a & 0x00f9) == 0x0010) { // PSG Sound\r
-    if (PicoOpt & POPT_EN_PSG)\r
-      SN76496Write(d);\r
-    return;\r
-  }\r
+  if ((a & 0x00f9) == 0x0010) // PSG Sound\r
+    psg_write_68k(d);\r
   if ((a & 0x00e0) == 0x0000) {\r
     PicoVideoWrite(a, d);\r
     return;\r
@@ -932,7 +960,7 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
     int scanline = get_scanline(is_from_z80);\r
     //elprintf(EL_STATUS, "%03i -> %03i dac w %08x z80 %i", PsndDacLine, scanline, d, is_from_z80);\r
     ym2612.dacout = ((int)d - 0x80) << 6;\r
-    if (PsndOut && ym2612.dacen && scanline >= PsndDacLine)\r
+    if (ym2612.dacen)\r
       PsndDoDAC(scanline);\r
     return 0;\r
   }\r
@@ -1016,8 +1044,10 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
         }\r
         case 0x2b: { /* DAC Sel  (YM2612) */\r
           int scanline = get_scanline(is_from_z80);\r
-          ym2612.dacen = d & 0x80;\r
-          if (d & 0x80) PsndDacLine = scanline;\r
+          if (ym2612.dacen != (d & 0x80)) {\r
+            ym2612.dacen = d & 0x80;\r
+            PsndDacLine = scanline;\r
+          }\r
 #ifdef __GP2X__\r
           if (PicoOpt & POPT_EXT_FM) YM2612Write_940(a, d, scanline);\r
 #endif\r
@@ -1165,7 +1195,22 @@ void PicoWrite16_32x(u32 a, u32 d) {}
 \r
 static unsigned char z80_md_vdp_read(unsigned short a)\r
 {\r
-  // TODO?\r
+  z80_subCLeft(2);\r
+\r
+  if ((a & 0x00f0) == 0x0000) {\r
+    switch (a & 0x0d)\r
+    {\r
+      case 0x00: return PicoVideoRead8DataH();\r
+      case 0x01: return PicoVideoRead8DataL();\r
+      case 0x04: return PicoVideoRead8CtlH();\r
+      case 0x05: return PicoVideoRead8CtlL();\r
+      case 0x08:\r
+      case 0x0c: return get_scanline(1); // FIXME: make it proper\r
+      case 0x09:\r
+      case 0x0d: return Pico.m.rotate++;\r
+    }\r
+  }\r
+\r
   elprintf(EL_ANOMALY, "z80 invalid r8 [%06x] %02x", a, 0xff);\r
   return 0xff;\r
 }\r
@@ -1175,8 +1220,10 @@ static unsigned char z80_md_bank_read(unsigned short a)
   unsigned int addr68k;\r
   unsigned char ret;\r
 \r
-  addr68k = Pico.m.z80_bank68k<<15;\r
-  addr68k += a & 0x7fff;\r
+  z80_subCLeft(3);\r
+\r
+  addr68k = Pico.m.z80_bank68k << 15;\r
+  addr68k |= a & 0x7fff;\r
 \r
   ret = m68k_read8(addr68k);\r
 \r
@@ -1192,13 +1239,12 @@ static void z80_md_ym2612_write(unsigned int a, unsigned char data)
 \r
 static void z80_md_vdp_br_write(unsigned int a, unsigned char data)\r
 {\r
-  // TODO: allow full VDP access\r
   if ((a&0xfff9) == 0x7f11) // 7f11 7f13 7f15 7f17\r
   {\r
-    if (PicoOpt & POPT_EN_PSG)\r
-      SN76496Write(data);\r
+    psg_write_z80(data);\r
     return;\r
   }\r
+  // at least VDP data writes hang my machine\r
 \r
   if ((a>>8) == 0x60)\r
   {\r