fix yet another portability issue

diff --git a/pico/memory.c b/pico/memory.c
index 24e5f21..4f38e5e 100644 (file)
--- 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++) {\r
     map[i] = addr >> 1;\r
     if (is_func)\r
-      map[i] |= (uptr)1 << (sizeof(addr) * 8 - 1);\r
+      map[i] |= MAP_FLAG;\r
   }\r
 }\r
 \r
@@ -126,19 +126,19 @@ void m68k_map_unmap(int start_addr, int end_addr)
 \r
   addr = (uptr)m68k_unmapped_read8;\r
   for (i = start_addr >> shift; i <= end_addr >> shift; i++)\r
-    m68k_read8_map[i] = (addr >> 1) | (1 << 31);\r
+    m68k_read8_map[i] = (addr >> 1) | MAP_FLAG;\r
 \r
   addr = (uptr)m68k_unmapped_read16;\r
   for (i = start_addr >> shift; i <= end_addr >> shift; i++)\r
-    m68k_read16_map[i] = (addr >> 1) | (1 << 31);\r
+    m68k_read16_map[i] = (addr >> 1) | MAP_FLAG;\r
 \r
   addr = (uptr)m68k_unmapped_write8;\r
   for (i = start_addr >> shift; i <= end_addr >> shift; i++)\r
-    m68k_write8_map[i] = (addr >> 1) | (1 << 31);\r
+    m68k_write8_map[i] = (addr >> 1) | MAP_FLAG;\r
 \r
   addr = (uptr)m68k_unmapped_write16;\r
   for (i = start_addr >> shift; i <= end_addr >> shift; i++)\r
-    m68k_write16_map[i] = (addr >> 1) | (1 << 31);\r
+    m68k_write16_map[i] = (addr >> 1) | MAP_FLAG;\r
 }\r
 \r
 MAKE_68K_READ8(m68k_read8, m68k_read8_map)\r

diff --git a/pico/memory.h b/pico/memory.h
index 4421371..afca082 100644 (file)
--- a/pico/memory.h
+++ b/pico/memory.h
@@ -45,7 +45,8 @@ void cpu68k_map_set(uptr *map, int start_addr, int end_addr,
 void cpu68k_map_all_ram(int start_addr, int end_addr, void *ptr, int is_sub);
 void m68k_map_unmap(int start_addr, int end_addr);
 
-#define map_flag_set(x) ((x) & ((uptr)1 << (sizeof(uptr) * 8 - 1)))
+#define MAP_FLAG ((uptr)1 << (sizeof(uptr) * 8 - 1))
+#define map_flag_set(x) ((x) & MAP_FLAG)
 
 #define MAKE_68K_READ8(name, map)               \
 u32 name(u32 a)                                 \