X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fmemory.c;h=e72628e6223c6f684c91b44241f0e48370adc763;hb=653f0b1399313ecef86d99a2552f40fb9e51b820;hp=24e5f21e963dcb81c1448e9894788173b44618b6;hpb=ae214f1c37e5b02b6413040649a40f8ba3874e1b;p=picodrive.git

diff --git a/pico/memory.c b/pico/memory.c
index 24e5f21..e72628e 100644
--- a/pico/memory.c
+++ b/pico/memory.c
@@ -49,7 +49,7 @@ static void xmap_set(uptr *map, int shift, int start_addr, int end_addr,
   for (i = start_addr >> shift; i <= end_addr >> shift; i++) {
     map[i] = addr >> 1;
     if (is_func)
-      map[i] |= (uptr)1 << (sizeof(addr) * 8 - 1);
+      map[i] |= MAP_FLAG;
   }
 }
 
@@ -126,19 +126,19 @@ void m68k_map_unmap(int start_addr, int end_addr)
 
   addr = (uptr)m68k_unmapped_read8;
   for (i = start_addr >> shift; i <= end_addr >> shift; i++)
-    m68k_read8_map[i] = (addr >> 1) | (1 << 31);
+    m68k_read8_map[i] = (addr >> 1) | MAP_FLAG;
 
   addr = (uptr)m68k_unmapped_read16;
   for (i = start_addr >> shift; i <= end_addr >> shift; i++)
-    m68k_read16_map[i] = (addr >> 1) | (1 << 31);
+    m68k_read16_map[i] = (addr >> 1) | MAP_FLAG;
 
   addr = (uptr)m68k_unmapped_write8;
   for (i = start_addr >> shift; i <= end_addr >> shift; i++)
-    m68k_write8_map[i] = (addr >> 1) | (1 << 31);
+    m68k_write8_map[i] = (addr >> 1) | MAP_FLAG;
 
   addr = (uptr)m68k_unmapped_write16;
   for (i = start_addr >> shift; i <= end_addr >> shift; i++)
-    m68k_write16_map[i] = (addr >> 1) | (1 << 31);
+    m68k_write16_map[i] = (addr >> 1) | MAP_FLAG;
 }
 
 MAKE_68K_READ8(m68k_read8, m68k_read8_map)
@@ -459,7 +459,7 @@ static void PicoWrite16_sram(u32 a, u32 d)
 
 // z80 area (0xa00000 - 0xa0ffff)
 // TODO: verify mirrors VDP and bank reg (bank area mirroring verified)
-static u32 PicoRead8_z80(u32 a)
+u32 PicoRead8_z80(u32 a)
 {
   u32 d = 0xff;
   if ((Pico.m.z80Run & 1) || Pico.m.z80_reset) {
@@ -483,7 +483,7 @@ static u32 PicoRead16_z80(u32 a)
   return d | (d << 8);
 }
 
-static void PicoWrite8_z80(u32 a, u32 d)
+void PicoWrite8_z80(u32 a, u32 d)
 {
   if ((Pico.m.z80Run & 1) || Pico.m.z80_reset) {
     // verified on real hw