--- uae/src/memory.c	2018/04/24 16:42:12	1.1.1.4
+++ uae/src/memory.c	2018/04/24 16:43:32	1.1.1.5
@@ -36,29 +36,29 @@ addrbank mem_banks[65536];
 #endif
 
 #ifdef NO_INLINE_MEMORY_ACCESS
-__inline__ uae_u32 longget(uaecptr addr)
+__inline__ uae_u32 longget (uaecptr addr)
 {
-    return call_mem_get_func(get_mem_bank(addr).lget, addr);
+    return call_mem_get_func (get_mem_bank (addr).lget, addr);
 }
-__inline__ uae_u32 wordget(uaecptr addr)
+__inline__ uae_u32 wordget (uaecptr addr)
 {
-    return call_mem_get_func(get_mem_bank(addr).wget, addr);
+    return call_mem_get_func (get_mem_bank (addr).wget, addr);
 }
-__inline__ uae_u32 byteget(uaecptr addr)
+__inline__ uae_u32 byteget (uaecptr addr)
 {
-    return call_mem_get_func(get_mem_bank(addr).bget, addr);
+    return call_mem_get_func (get_mem_bank (addr).bget, addr);
 }
-__inline__ void longput(uaecptr addr, uae_u32 l)
+__inline__ void longput (uaecptr addr, uae_u32 l)
 {
-    call_mem_put_func(get_mem_bank(addr).lput, addr, l);
+    call_mem_put_func (get_mem_bank (addr).lput, addr, l);
 }
-__inline__ void wordput(uaecptr addr, uae_u32 w)
+__inline__ void wordput (uaecptr addr, uae_u32 w)
 {
-    call_mem_put_func(get_mem_bank(addr).wput, addr, w);
+    call_mem_put_func (get_mem_bank (addr).wput, addr, w);
 }
-__inline__ void byteput(uaecptr addr, uae_u32 b)
+__inline__ void byteput (uaecptr addr, uae_u32 b)
 {
-    call_mem_put_func(get_mem_bank(addr).bput, addr, b);
+    call_mem_put_func (get_mem_bank (addr).bput, addr, b);
 }
 #endif
 
@@ -203,7 +203,7 @@ uae_u32 REGPARAM2 chipmem_lget (uaecptr
     addr -= chipmem_start & chipmem_mask;
     addr &= chipmem_mask;
     m = (uae_u32 *)(chipmemory + addr);
-    return do_get_mem_long(m);
+    return do_get_mem_long (m);
 }
 
 uae_u32 REGPARAM2 chipmem_wget (uaecptr addr)
@@ -212,7 +212,7 @@ uae_u32 REGPARAM2 chipmem_wget (uaecptr
     addr -= chipmem_start & chipmem_mask;
     addr &= chipmem_mask;
     m = (uae_u16 *)(chipmemory + addr);
-    return do_get_mem_word(m);
+    return do_get_mem_word (m);
 }
 
 uae_u32 REGPARAM2 chipmem_bget (uaecptr addr)
@@ -228,7 +228,7 @@ void REGPARAM2 chipmem_lput (uaecptr add
     addr -= chipmem_start & chipmem_mask;
     addr &= chipmem_mask;
     m = (uae_u32 *)(chipmemory + addr);
-    do_put_mem_long(m, l);
+    do_put_mem_long (m, l);
 }
 
 void REGPARAM2 chipmem_wput (uaecptr addr, uae_u32 w)
@@ -237,7 +237,7 @@ void REGPARAM2 chipmem_wput (uaecptr add
     addr -= chipmem_start & chipmem_mask;
     addr &= chipmem_mask;
     m = (uae_u16 *)(chipmemory + addr);
-    do_put_mem_word(m, w);
+    do_put_mem_word (m, w);
 }
 
 void REGPARAM2 chipmem_bput (uaecptr addr, uae_u32 b)
@@ -280,7 +280,7 @@ uae_u32 REGPARAM2 bogomem_lget (uaecptr
     addr -= bogomem_start & bogomem_mask;
     addr &= bogomem_mask;
     m = (uae_u32 *)(bogomemory + addr);
-    return do_get_mem_long(m);
+    return do_get_mem_long (m);
 }
 
 uae_u32 REGPARAM2 bogomem_wget (uaecptr addr)
@@ -289,7 +289,7 @@ uae_u32 REGPARAM2 bogomem_wget (uaecptr
     addr -= bogomem_start & bogomem_mask;
     addr &= bogomem_mask;
     m = (uae_u16 *)(bogomemory + addr);
-    return do_get_mem_word(m);
+    return do_get_mem_word (m);
 }
 
 uae_u32 REGPARAM2 bogomem_bget (uaecptr addr)
@@ -305,7 +305,7 @@ void REGPARAM2 bogomem_lput (uaecptr add
     addr -= bogomem_start & bogomem_mask;
     addr &= bogomem_mask;
     m = (uae_u32 *)(bogomemory + addr);
-    do_put_mem_long(m, l);
+    do_put_mem_long (m, l);
 }
 
 void REGPARAM2 bogomem_wput (uaecptr addr, uae_u32 w)
@@ -314,7 +314,7 @@ void REGPARAM2 bogomem_wput (uaecptr add
     addr -= bogomem_start & bogomem_mask;
     addr &= bogomem_mask;
     m = (uae_u16 *)(bogomemory + addr);
-    do_put_mem_word(m, w);
+    do_put_mem_word (m, w);
 }
 
 void REGPARAM2 bogomem_bput (uaecptr addr, uae_u32 b)
@@ -357,7 +357,7 @@ uae_u32 REGPARAM2 a3000mem_lget (uaecptr
     addr -= a3000mem_start & a3000mem_mask;
     addr &= a3000mem_mask;
     m = (uae_u32 *)(a3000memory + addr);
-    return do_get_mem_long(m);
+    return do_get_mem_long (m);
 }
 
 uae_u32 REGPARAM2 a3000mem_wget (uaecptr addr)
@@ -366,7 +366,7 @@ uae_u32 REGPARAM2 a3000mem_wget (uaecptr
     addr -= a3000mem_start & a3000mem_mask;
     addr &= a3000mem_mask;
     m = (uae_u16 *)(a3000memory + addr);
-    return do_get_mem_word(m);
+    return do_get_mem_word (m);
 }
 
 uae_u32 REGPARAM2 a3000mem_bget (uaecptr addr)
@@ -382,7 +382,7 @@ void REGPARAM2 a3000mem_lput (uaecptr ad
     addr -= a3000mem_start & a3000mem_mask;
     addr &= a3000mem_mask;
     m = (uae_u32 *)(a3000memory + addr);
-    do_put_mem_long(m, l);
+    do_put_mem_long (m, l);
 }
 
 void REGPARAM2 a3000mem_wput (uaecptr addr, uae_u32 w)
@@ -391,7 +391,7 @@ void REGPARAM2 a3000mem_wput (uaecptr ad
     addr -= a3000mem_start & a3000mem_mask;
     addr &= a3000mem_mask;
     m = (uae_u16 *)(a3000memory + addr);
-    do_put_mem_word(m, w);
+    do_put_mem_word (m, w);
 }
 
 void REGPARAM2 a3000mem_bput (uaecptr addr, uae_u32 b)
@@ -434,7 +434,7 @@ uae_u32 REGPARAM2 kickmem_lget (uaecptr
     addr -= kickmem_start & kickmem_mask;
     addr &= kickmem_mask;
     m = (uae_u32 *)(kickmemory + addr);
-    return do_get_mem_long(m);
+    return do_get_mem_long (m);
 }
 
 uae_u32 REGPARAM2 kickmem_wget (uaecptr addr)
@@ -443,7 +443,7 @@ uae_u32 REGPARAM2 kickmem_wget (uaecptr
     addr -= kickmem_start & kickmem_mask;
     addr &= kickmem_mask;
     m = (uae_u16 *)(kickmemory + addr);
-    return do_get_mem_word(m);
+    return do_get_mem_word (m);
 }
 
 uae_u32 REGPARAM2 kickmem_bget (uaecptr addr)
@@ -687,7 +687,8 @@ void memory_init (void)
 	abort ();
     }
 #endif
-
+    
+    do_put_mem_long (chipmemory + 4, 0);
     init_mem_banks ();
 
     /* Map the chipmem into all of the lower 16MB */
@@ -753,5 +754,5 @@ void map_banks (addrbank *bank, int star
 	endhioffs = 0x10000;
     for (hioffs = 0; hioffs < endhioffs; hioffs += 0x100)
 	for (bnr = start; bnr < start+size; bnr++)
-	    put_mem_bank((bnr + hioffs) << 16, bank);
+	    put_mem_bank ((bnr + hioffs) << 16, bank);
 }