more sms wip, better ROM detect, line callback change

[picodrive.git] / pico / z80if.c

diff --git a/pico/z80if.c b/pico/z80if.c
index 815e003..1b35e50 100644 (file)
--- a/pico/z80if.c
+++ b/pico/z80if.c
@@ -22,11 +22,14 @@ void MEMH_FUNC z80_map_set(unsigned long *map, int start_addr, int end_addr,
     return;
   }
 
-  for (i = start_addr >> Z80_MEM_SHIFT; i <= end_addr >> Z80_MEM_SHIFT; i++)
+  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] = (addr >> 1) | (1 << (sizeof(addr) * 8 - 1));
-    else
-      map[i] = (addr - (i << Z80_MEM_SHIFT)) >> 1;
+      map[i] |= 1 << (sizeof(addr) * 8 - 1);
+  }
 }
 
 #ifdef _USE_MZ80
@@ -119,7 +122,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