1.1 --- a/src/mem.c	Wed Jan 14 00:19:04 2009 +0000
     1.2 +++ b/src/mem.c	Thu Jan 15 11:23:20 2009 +0000
     1.3 @@ -44,8 +44,8 @@
     1.4  
     1.5  extern struct mem_region_fn mem_region_unmapped; 
     1.6  
     1.7 -int mem_load(FILE *f);
     1.8 -void mem_save(FILE *f);
     1.9 +static int mem_load(FILE *f);
    1.10 +static void mem_save(FILE *f);
    1.11  struct dreamcast_module mem_module =
    1.12  { "MEM", mem_init, mem_reset, NULL, NULL, NULL, mem_save, mem_load };
    1.13  
    1.14 @@ -107,7 +107,7 @@
    1.15      uintptr_t i = (uintptr_t)region;
    1.16      uintptr_t mask = ~(PAGE_SIZE-1);
    1.17      void *ptr = (void *)(i & mask);
    1.18 -    size_t len = i & (PAGE_SIZE-1) + size;
    1.19 +    size_t len = (i & (PAGE_SIZE-1)) + size;
    1.20      len = (len + (PAGE_SIZE-1)) & mask;
    1.21      
    1.22      int status = mprotect( ptr, len, PROT_READ|PROT_WRITE|PROT_EXEC );
    1.23 @@ -151,7 +151,7 @@
    1.24      }
    1.25  }
    1.26  
    1.27 -void mem_save( FILE *f ) 
    1.28 +static void mem_save( FILE *f ) 
    1.29  {
    1.30      int i, num_ram_regions = 0;
    1.31      uint32_t len;
    1.32 @@ -186,7 +186,7 @@
    1.33      }
    1.34  }
    1.35  
    1.36 -int mem_load( FILE *f )
    1.37 +static int mem_load( FILE *f )
    1.38  {
    1.39      char tmp[64];
    1.40      uint32_t len;
    1.41 @@ -332,7 +332,7 @@
    1.42      do {
    1.43          for( i=0; i<size>>LXDREAM_PAGE_BITS; i++ ) {
    1.44              if( mem != NULL ) {
    1.45 -                page_map[(base>>LXDREAM_PAGE_BITS)+i] = mem + (i<<LXDREAM_PAGE_BITS);
    1.46 +                page_map[(base>>LXDREAM_PAGE_BITS)+i] = ((unsigned char *)mem) + (i<<LXDREAM_PAGE_BITS);
    1.47              }
    1.48              ext_address_space[(base>>LXDREAM_PAGE_BITS)+i] = fn;
    1.49              mem_page_remapped( base + (i<<LXDREAM_PAGE_BITS), fn );
    1.50 @@ -443,7 +443,7 @@
    1.51      ext_address_space[(addr&0x1FFFFFFF)>>12]->write_long(addr, value);
    1.52  }
    1.53  
    1.54 -struct mmio_region *mem_get_io_region_by_name( const gchar *name )
    1.55 +static struct mmio_region *mem_get_io_region_by_name( const gchar *name )
    1.56  {
    1.57      int i;
    1.58      for( i=0; i<num_io_rgns; i++ ) {