X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=pico%2Fz80if.c;h=454938bab0540d28718ff3ba42f2b28469403fd9;hb=e05b81fc5b3f640496795ced5d893ece4cc51c2d;hp=1b35e50cccc41d75bd8f401d47974534967c7849;hpb=67e50ff8d93a40397833d595d4d48b7ee472ab8a;p=picodrive.git

diff --git a/pico/z80if.c b/pico/z80if.c
index 1b35e50..454938b 100644
--- a/pico/z80if.c
+++ b/pico/z80if.c
@@ -1,36 +1,9 @@
+#include <stddef.h>
 #include "pico_int.h"
-#include "sound/sn76496.h"
+#include "memory.h"
 
-#define Z80_MEM_SHIFT 13
-
-unsigned long z80_read_map [0x10000 >> Z80_MEM_SHIFT];
-unsigned long z80_write_map[0x10000 >> Z80_MEM_SHIFT];
-
-void MEMH_FUNC z80_map_set(unsigned long *map, int start_addr, int end_addr,
-    void *func_or_mh, int is_func)
-{
-  unsigned long addr = (unsigned long)func_or_mh;
-  int mask = (1 << Z80_MEM_SHIFT) - 1;
-  int i;
-
-  if ((start_addr & mask) != 0 || (end_addr & mask) != mask)
-    elprintf(EL_STATUS|EL_ANOMALY, "z80_map_set: tried to map bad range: %04x-%04x",
-      start_addr, end_addr);
-
-  if (addr & 1) {
-    elprintf(EL_STATUS|EL_ANOMALY, "z80_map_set: ptr is not aligned: %08lx", addr);
-    return;
-  }
-
-  if (!is_func)
-    addr -= (start_addr >> Z80_MEM_SHIFT) << Z80_MEM_SHIFT;
-
-  for (i = start_addr >> Z80_MEM_SHIFT; i <= end_addr >> Z80_MEM_SHIFT; i++) {
-    map[i] = addr >> 1;
-    if (is_func)
-      map[i] |= 1 << (sizeof(addr) * 8 - 1);
-  }
-}
+uptr z80_read_map [0x10000 >> Z80_MEM_SHIFT];
+uptr z80_write_map[0x10000 >> Z80_MEM_SHIFT];
 
 #ifdef _USE_MZ80
 
@@ -132,7 +105,6 @@ PICO_INTERNAL void z80_reset(void)
   Cz80_Set_Reg(&CZ80, CZ80_IY, 0xffff);
   Cz80_Set_Reg(&CZ80, CZ80_SP, 0x2000);
 #endif
-  Pico.m.z80_fakeval = 0; // for faking when Z80 is disabled
 }
 
 // XXX TODO: should better use universal z80 save format
@@ -151,7 +123,7 @@ PICO_INTERNAL void z80_pack(unsigned char *data)
 #elif defined(_USE_CZ80)
   *(int *)data = 0x00007a43; // "Cz"
   *(int *)(data+4) = Cz80_Get_Reg(&CZ80, CZ80_PC);
-  memcpy(data+8, &CZ80, (INT32)&CZ80.BasePC - (INT32)&CZ80);
+  memcpy(data+8, &CZ80, offsetof(cz80_struc, BasePC));
 #endif
 }
 
@@ -198,7 +170,7 @@ PICO_INTERNAL void z80_unpack(unsigned char *data)
   }
 #elif defined(_USE_CZ80)
   if (*(int *)data == 0x00007a43) { // "Cz" save?
-    memcpy(&CZ80, data+8, (INT32)&CZ80.BasePC - (INT32)&CZ80);
+    memcpy(&CZ80, data+8, offsetof(cz80_struc, BasePC));
     Cz80_Set_Reg(&CZ80, CZ80_PC, *(int *)(data+4));
   } else {
     z80_reset();
@@ -219,6 +191,6 @@ PICO_INTERNAL void z80_debug(char *dstr)
 #if defined(_USE_DRZ80)
   sprintf(dstr, "Z80 state: PC: %04x SP: %04x\n", drZ80.Z80PC-drZ80.Z80PC_BASE, drZ80.Z80SP-drZ80.Z80SP_BASE);
 #elif defined(_USE_CZ80)
-  sprintf(dstr, "Z80 state: PC: %04x SP: %04x\n", CZ80.PC - CZ80.BasePC, CZ80.SP.W);
+  sprintf(dstr, "Z80 state: PC: %04x SP: %04x\n", (unsigned int)(CZ80.PC - CZ80.BasePC), CZ80.SP.W);
 #endif
 }