some changes for common z80 code

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@474 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index cd5ba5b..12d8e2a 100644 (file)
--- a/Pico/PicoInt.h
+++ b/Pico/PicoInt.h
@@ -1,7 +1,7 @@
 // Pico Library - Internal Header File\r
 \r
 // (c) Copyright 2004 Dave, All rights reserved.\r
-// (c) Copyright 2006,2007 Grazvydas "notaz" Ignotas, all rights reserved.\r
+// (c) Copyright 2006-2008 Grazvydas "notaz" Ignotas, all rights reserved.\r
 // Free for non-commercial use.\r
 \r
 // For commercial use, separate licencing terms must be obtained.\r
@@ -185,10 +185,7 @@ extern struct DrZ80 drZ80;
 \r
 #define z80_run(cycles)    ((cycles) - DrZ80Run(&drZ80, cycles))\r
 #define z80_run_nr(cycles) DrZ80Run(&drZ80, cycles)\r
-#define z80_int() { \\r
-  drZ80.z80irqvector = 0xFF; /* default IRQ vector RST opcode */ \\r
-  drZ80.Z80_IRQ = 1; \\r
-}\r
+#define z80_int()          drZ80.Z80_IRQ = 1\r
 \r
 #define z80_cyclesLeft     drZ80.cycles\r
 \r

diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c
index ab6b7e1..e296742 100644 (file)
--- a/Pico/sound/sound.c
+++ b/Pico/sound/sound.c
@@ -366,8 +366,7 @@ PICO_INTERNAL int PsndRender(int offset, int length)
 // -----------------------------------------------------------------\r
 //                            z80 stuff\r
 \r
-\r
-#if defined(_USE_MZ80)\r
+#ifdef _USE_MZ80\r
 \r
 // memhandlers for mz80 core\r
 unsigned char mz80_read(UINT32 a,  struct MemoryReadByte *w)  { return z80_read(a); }\r
@@ -398,7 +397,9 @@ int mz80_run(int cycles)
   return mz80GetElapsedTicks(0) - ticks_pre;\r
 }\r
 \r
-#elif defined(_USE_DRZ80)\r
+#endif\r
+\r
+#ifdef _USE_DRZ80\r
 \r
 struct DrZ80 drZ80;\r
 \r
@@ -413,11 +414,6 @@ static unsigned int DrZ80_rebaseSP(unsigned short a)
   drZ80.Z80SP_BASE = (unsigned int) Pico.zram;\r
   return drZ80.Z80SP_BASE + a;\r
 }\r
-\r
-static void DrZ80_irq_callback()\r
-{\r
-  drZ80.Z80_IRQ = 0; // lower irq when accepted\r
-}\r
 #endif\r
 \r
 #if defined(_USE_DRZ80) || defined(_USE_CZ80)\r
@@ -437,7 +433,7 @@ static void z80_out(unsigned short p,unsigned char d)
 // z80 functionality wrappers\r
 PICO_INTERNAL void z80_init(void)\r
 {\r
-#if defined(_USE_MZ80)\r
+#ifdef _USE_MZ80\r
   struct mz80context z80;\r
 \r
   // z80\r
@@ -453,20 +449,20 @@ PICO_INTERNAL void z80_init(void)
   z80.z80IoWrite=mz80_io_write;\r
 \r
   mz80SetContext(&z80);\r
-\r
-#elif defined(_USE_DRZ80)\r
+#endif\r
+#ifdef _USE_DRZ80\r
   memset(&drZ80, 0, sizeof(struct DrZ80));\r
   drZ80.z80_rebasePC=DrZ80_rebasePC;\r
   drZ80.z80_rebaseSP=DrZ80_rebaseSP;\r
   drZ80.z80_read8   =z80_read;\r
-  drZ80.z80_read16  =z80_read16;\r
+  drZ80.z80_read16  =NULL;\r
   drZ80.z80_write8  =z80_write;\r
-  drZ80.z80_write16 =z80_write16;\r
+  drZ80.z80_write16 =NULL;\r
   drZ80.z80_in      =z80_in;\r
   drZ80.z80_out     =z80_out;\r
-  drZ80.z80_irq_callback=DrZ80_irq_callback;\r
-\r
-#elif defined(_USE_CZ80)\r
+  drZ80.z80_irq_callback=NULL;\r
+#endif\r
+#ifdef _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
@@ -480,18 +476,21 @@ PICO_INTERNAL void z80_init(void)
 \r
 PICO_INTERNAL void z80_reset(void)\r
 {\r
-#if defined(_USE_MZ80)\r
+#ifdef _USE_MZ80\r
   mz80reset();\r
-#elif defined(_USE_DRZ80)\r
+#endif\r
+#ifdef _USE_DRZ80\r
   memset(&drZ80, 0, 0x54);\r
   drZ80.Z80F  = (1<<2);  // set ZFlag\r
   drZ80.Z80F2 = (1<<2);  // set ZFlag\r
   drZ80.Z80IX = 0xFFFF << 16;\r
   drZ80.Z80IY = 0xFFFF << 16;\r
   drZ80.Z80IM = 0; // 1?\r
+  drZ80.z80irqvector = 0xff0000; // RST 38h\r
   drZ80.Z80PC = drZ80.z80_rebasePC(0);\r
   drZ80.Z80SP = drZ80.z80_rebaseSP(0x2000); // 0xf000 ?\r
-#elif defined(_USE_CZ80)\r
+#endif\r
+#ifdef _USE_CZ80\r
   Cz80_Reset(&CZ80);\r
   Cz80_Set_Reg(&CZ80, CZ80_IX, 0xffff);\r
   Cz80_Set_Reg(&CZ80, CZ80_IY, 0xffff);\r
@@ -500,6 +499,66 @@ PICO_INTERNAL void z80_reset(void)
   Pico.m.z80_fakeval = 0; // for faking when Z80 is disabled\r
 }\r
 \r
+#if 0\r
+static int had_irq = 0, z80_ppc, z80_ops_done = 0;\r
+int z80_cycles_left = 0;\r
+\r
+void z80_int(void)\r
+{\r
+  had_irq = 1;\r
+}\r
+\r
+static void xfail(void)\r
+{\r
+  printf("PC: %04x, %04x\n", Cz80_Get_Reg(&CZ80, CZ80_PC), z80_ppc);\r
+  printf("z80_ops_done done: %i\n", z80_ops_done);\r
+  exit(1);\r
+}\r
+\r
+int  z80_run(int cycles)\r
+{\r
+  int fail = 0;\r
+  int cdrz, ccz;\r
+\r
+  z80_cycles_left = cycles;\r
+  z80_ppc = Cz80_Get_Reg(&CZ80, CZ80_PC);\r
+\r
+  if (had_irq) {\r
+    printf("irq @ %04x\n", Cz80_Get_Reg(&CZ80, CZ80_PC));\r
+    Cz80_Set_IRQ(&CZ80, 0, HOLD_LINE);\r
+    drZ80.Z80_IRQ = 1;\r
+    had_irq = 0;\r
+  }\r
+\r
+  while (z80_cycles_left > 0)\r
+  {\r
+    ccz = Cz80_Exec(&CZ80, 1);\r
+    cdrz = 1 - DrZ80Run(&drZ80, 1);\r
+\r
+    if (drZ80.Z80_IRQ && (drZ80.Z80IF&1))\r
+      cdrz += 1 - DrZ80Run(&drZ80, 1); // cz80 processes IRQ after EI, DrZ80 does not\r
+\r
+    if (cdrz != ccz) {\r
+      printf("cycles: %i vs %i\n", cdrz, ccz);\r
+      fail = 1;\r
+    }\r
+\r
+    if (drZ80.Z80PC - drZ80.Z80PC_BASE != Cz80_Get_Reg(&CZ80, CZ80_PC)) {\r
+      printf("PC: %04x vs %04x\n", drZ80.Z80PC - drZ80.Z80PC_BASE, Cz80_Get_Reg(&CZ80, CZ80_PC));\r
+      fail = 1;\r
+    }\r
+\r
+    if (fail) xfail();\r
+\r
+    z80_ops_done++;\r
+    z80_cycles_left -= ccz;\r
+    z80_ppc = Cz80_Get_Reg(&CZ80, CZ80_PC);\r
+  }\r
+\r
+  return co - z80_cycles_left;\r
+}\r
+#endif\r
+\r
 \r
 PICO_INTERNAL void z80_pack(unsigned char *data)\r
 {\r