new memory handling, but asm and mappers need update.

[picodrive.git] / pico / z80if.c

diff --git a/pico/z80if.c b/pico/z80if.c
index 815e003..63b79da 100644 (file)
--- a/pico/z80if.c
+++ b/pico/z80if.c
@@ -6,29 +6,6 @@
 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;
-  }
-
-  for (i = start_addr >> Z80_MEM_SHIFT; i <= end_addr >> Z80_MEM_SHIFT; i++)
-    if (is_func)
-      map[i] = (addr >> 1) | (1 << (sizeof(addr) * 8 - 1));
-    else
-      map[i] = (addr - (i << Z80_MEM_SHIFT)) >> 1;
-}
-
 #ifdef _USE_MZ80
 
 // memhandlers for mz80 core
@@ -119,7 +96,8 @@ PICO_INTERNAL void z80_reset(void)
   drZ80.z80irqvector = 0xff0000; // RST 38h
   drZ80.Z80PC_BASE = drZ80.Z80PC = z80_read_map[0] << 1;
   // drZ80 is locked in single bank
-  drZ80.Z80SP_BASE = z80_read_map[0] << 1;
+  drZ80.Z80SP_BASE = ((PicoAHW & PAHW_SMS) ?
+    z80_read_map[0xc000 >> Z80_MEM_SHIFT] : z80_read_map[0]) << 1;
 //  drZ80.Z80SP = drZ80.z80_rebaseSP(0x2000); // 0xf000 ?
 #endif
 #ifdef _USE_CZ80