bugfixes, adjusted famec timing

[picodrive.git] / Pico / sound / sound.c

diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c
index ac37c61..9950084 100644 (file)
--- a/Pico/sound/sound.c
+++ b/Pico/sound/sound.c
@@ -15,6 +15,8 @@
 #include "../../cpu/mz80/mz80.h"\r
 #elif defined(_USE_DRZ80)\r
 #include "../../cpu/DrZ80/drz80.h"\r
+#elif defined(_USE_CZ80)\r
+#include "../../cpu/cz80/cz80.h"\r
 #endif\r
 \r
 #include "../PicoInt.h"\r
@@ -106,9 +108,7 @@ PICO_INTERNAL void sound_reset(void)
   // also clear the internal registers+addr line\r
   ym2612_regs = YM2612GetRegs();\r
   memset(ym2612_regs, 0, 0x200+4);\r
-  // setting these to 0 might confuse timing code,\r
-  // so better set to something like this instead\r
-  z80startCycle = z80stopCycle = 0x01000000;\r
+  z80startCycle = z80stopCycle = 0;\r
 \r
   sound_rerate(0);\r
 }\r
@@ -262,7 +262,8 @@ PICO_INTERNAL int sound_render(int offset, int length)
   }\r
 \r
   // CD: CDDA audio\r
-  if ((PicoMCD & 1) && (PicoOpt & 0x800))\r
+  // CD mode, cdda enabled, not data track, CDC is reading\r
+  if ((PicoMCD & 1) && (PicoOpt & 0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))\r
     mp3_update(buf32, length, stereo);\r
 \r
   // convert + limit to normal 16bit output\r
@@ -330,7 +331,6 @@ static void DrZ80_irq_callback()
 {\r
   drZ80.Z80_IRQ = 0; // lower irq when accepted\r
 }\r
-\r
 #endif\r
 \r
 // z80 functionality wrappers\r
@@ -354,7 +354,6 @@ PICO_INTERNAL void z80_init(void)
   mz80SetContext(&z80);\r
 \r
 #elif defined(_USE_DRZ80)\r
-\r
   memset(&drZ80, 0, sizeof(struct DrZ80));\r
   drZ80.z80_rebasePC=DrZ80_rebasePC;\r
   drZ80.z80_rebaseSP=DrZ80_rebaseSP;\r
@@ -365,6 +364,14 @@ PICO_INTERNAL void z80_init(void)
   drZ80.z80_in      =DrZ80_in;\r
   drZ80.z80_out     =DrZ80_out;\r
   drZ80.z80_irq_callback=DrZ80_irq_callback;\r
+\r
+#elif defined(_USE_CZ80)\r
+  memset(&CZ80, 0, sizeof(CZ80));\r
+  Cz80_Init(&CZ80);\r
+  Cz80_Set_Fetch(&CZ80, 0x0000, 0x1fff, (UINT32)Pico.zram); // main RAM\r
+  Cz80_Set_Fetch(&CZ80, 0x2000, 0x3fff, (UINT32)Pico.zram - 0x2000); // mirror\r
+  Cz80_Set_ReadB(&CZ80, (UINT8 (*)(UINT32 address))z80_read);\r
+  Cz80_Set_WriteB(&CZ80, z80_write);\r
 #endif\r
 }\r
 \r
@@ -381,6 +388,8 @@ PICO_INTERNAL void z80_reset(void)
   drZ80.Z80IM = 0; // 1?\r
   drZ80.Z80PC = drZ80.z80_rebasePC(0);\r
   drZ80.Z80SP = drZ80.z80_rebaseSP(0x2000); // 0xf000 ?\r
+#elif defined(_USE_CZ80)\r
+  Cz80_Reset(&CZ80);\r
 #endif\r
   Pico.m.z80_fakeval = 0; // for faking when Z80 is disabled\r
 }\r
@@ -399,6 +408,8 @@ PICO_INTERNAL void z80_int(void)
 #elif defined(_USE_DRZ80)\r
   drZ80.z80irqvector = 0xFF; // default IRQ vector RST opcode\r
   drZ80.Z80_IRQ = 1;\r
+#elif defined(_USE_CZ80)\r
+  Cz80_Set_IRQ(&CZ80, 0, HOLD_LINE);\r
 #endif\r
 }\r
 \r
@@ -411,6 +422,8 @@ PICO_INTERNAL int z80_run(int cycles)
   return mz80GetElapsedTicks(0) - ticks_pre;\r
 #elif defined(_USE_DRZ80)\r
   return cycles - DrZ80Run(&drZ80, cycles);\r
+#elif defined(_USE_CZ80)\r
+  return Cz80_Exec(&CZ80, cycles);\r
 #else\r
   return cycles;\r
 #endif\r
@@ -428,13 +441,16 @@ PICO_INTERNAL void z80_pack(unsigned char *data)
   drZ80.Z80PC = drZ80.z80_rebasePC(drZ80.Z80PC-drZ80.Z80PC_BASE);\r
   drZ80.Z80SP = drZ80.z80_rebaseSP(drZ80.Z80SP-drZ80.Z80SP_BASE);\r
   memcpy(data+4, &drZ80, 0x54);\r
+#elif defined(_USE_CZ80)\r
+  *(int *)data = 0x00007a43; // "Cz"\r
+  memcpy(data+4, &CZ80, (INT32)&CZ80.BasePC - (INT32)&CZ80);\r
 #endif\r
 }\r
 \r
 PICO_INTERNAL void z80_unpack(unsigned char *data)\r
 {\r
 #if defined(_USE_MZ80)\r
-  if(*(int *)data == 0x00005A6D) { // "mZ" save?\r
+  if (*(int *)data == 0x00005A6D) { // "mZ" save?\r
     struct mz80context mz80;\r
     mz80GetContext(&mz80);\r
     memcpy(&mz80.z80clockticks, data+4, sizeof(mz80)-5*4);\r
@@ -444,7 +460,7 @@ PICO_INTERNAL void z80_unpack(unsigned char *data)
     z80_int();\r
   }\r
 #elif defined(_USE_DRZ80)\r
-  if(*(int *)data == 0x015A7244) { // "DrZ" v1 save?\r
+  if (*(int *)data == 0x015A7244) { // "DrZ" v1 save?\r
     memcpy(&drZ80, data+4, 0x54);\r
     // update bases\r
     drZ80.Z80PC = drZ80.z80_rebasePC(drZ80.Z80PC-drZ80.Z80PC_BASE);\r
@@ -454,6 +470,13 @@ PICO_INTERNAL void z80_unpack(unsigned char *data)
     drZ80.Z80IM = 1;\r
     z80_int(); // try to goto int handler, maybe we won't execute trash there?\r
   }\r
+#elif defined(_USE_CZ80)\r
+  if (*(int *)data == 0x00007a43) // "Cz" save?\r
+    memcpy(&CZ80, data+4, (INT32)&CZ80.BasePC - (INT32)&CZ80);\r
+  else {\r
+    z80_reset();\r
+    z80_int();\r
+  }\r
 #endif\r
 }\r
 \r
@@ -464,11 +487,13 @@ PICO_INTERNAL void z80_exit(void)
 #endif\r
 }\r
 \r
-#if defined(__DEBUG_PRINT) || defined(__GP2X__)\r
+#if 1 // defined(__DEBUG_PRINT) || defined(__GP2X__) || defined(__GIZ__)\r
 PICO_INTERNAL void z80_debug(char *dstr)\r
 {\r
 #if defined(_USE_DRZ80)\r
   sprintf(dstr, "Z80 state: PC: %04x SP: %04x\n", drZ80.Z80PC-drZ80.Z80PC_BASE, drZ80.Z80SP-drZ80.Z80SP_BASE);\r
+#elif defined(_USE_CZ80)\r
+  sprintf(dstr, "Z80 state: PC: %04x SP: %04x\n", CZ80.PC - CZ80.BasePC, CZ80.SP.W);\r
 #endif\r
 }\r
 #endif\r