core, some type issues

diff --git a/pico/memory.c b/pico/memory.c
index 9c35a18..6bdbec3 100644 (file)
--- a/pico/memory.c
+++ b/pico/memory.c
@@ -20,7 +20,7 @@ uptr m68k_read16_map [0x1000000 >> M68K_MEM_SHIFT];
 uptr m68k_write8_map [0x1000000 >> M68K_MEM_SHIFT];\r
 uptr m68k_write16_map[0x1000000 >> M68K_MEM_SHIFT];\r
 \r
-static void xmap_set(uptr *map, int shift, int start_addr, int end_addr,\r
+static void xmap_set(uptr *map, int shift, u32 start_addr, u32 end_addr,\r
     const void *func_or_mh, int is_func)\r
 {\r
 #ifdef __clang__\r
@@ -53,7 +53,7 @@ static void xmap_set(uptr *map, int shift, int start_addr, int end_addr,
   }\r
 }\r
 \r
-void z80_map_set(uptr *map, int start_addr, int end_addr,\r
+void z80_map_set(uptr *map, u16 start_addr, u16 end_addr,\r
     const void *func_or_mh, int is_func)\r
 {\r
   xmap_set(map, Z80_MEM_SHIFT, start_addr, end_addr, func_or_mh, is_func);\r
@@ -63,7 +63,7 @@ void z80_map_set(uptr *map, int start_addr, int end_addr,
 #endif\r
 }\r
 \r
-void cpu68k_map_set(uptr *map, int start_addr, int end_addr,\r
+void cpu68k_map_set(uptr *map, u32 start_addr, u32 end_addr,\r
     const void *func_or_mh, int is_func)\r
 {\r
   xmap_set(map, M68K_MEM_SHIFT, start_addr, end_addr, func_or_mh, is_func);\r
@@ -81,7 +81,7 @@ void cpu68k_map_set(uptr *map, int start_addr, int end_addr,
 }\r
 \r
 // more specialized/optimized function (does same as above)\r
-void cpu68k_map_all_ram(int start_addr, int end_addr, void *ptr, int is_sub)\r
+void cpu68k_map_all_ram(u32 start_addr, u32 end_addr, void *ptr, int is_sub)\r
 {\r
   uptr *r8map, *r16map, *w8map, *w16map;\r
   uptr addr = (uptr)ptr;\r
@@ -139,7 +139,7 @@ static void m68k_unmapped_write16(u32 a, u32 d)
   elprintf(EL_UIO, "m68k unmapped w16 [%06x] %04x @%06x", a, d & 0xffff, SekPc);\r
 }\r
 \r
-void m68k_map_unmap(int start_addr, int end_addr)\r
+void m68k_map_unmap(u32 start_addr, u32 end_addr)\r
 {\r
 #ifdef __clang__\r
   // workaround bug (segfault) in \r

diff --git a/pico/memory.h b/pico/memory.h
index 7fef8d2..e3da68d 100644 (file)
--- a/pico/memory.h
+++ b/pico/memory.h
@@ -44,12 +44,12 @@ extern uptr z80_write_map[0x10000 >> Z80_MEM_SHIFT];
 typedef unsigned char (z80_read_f)(unsigned short a);
 typedef void (z80_write_f)(unsigned int a, unsigned char data);
 
-void z80_map_set(uptr *map, int start_addr, int end_addr,
+void z80_map_set(uptr *map, u16 start_addr, u16 end_addr,
     const void *func_or_mh, int is_func);
-void cpu68k_map_set(uptr *map, int start_addr, int end_addr,
+void cpu68k_map_set(uptr *map, u32 start_addr, u32 end_addr,
     const void *func_or_mh, int is_func);
-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);
+void cpu68k_map_all_ram(u32 start_addr, u32 end_addr, void *ptr, int is_sub);
+void m68k_map_unmap(u32 start_addr, u32 end_addr);
 
 #define MAP_FLAG ((uptr)1 << (sizeof(uptr) * 8 - 1))
 #define map_flag_set(x) ((x) & MAP_FLAG)