--- uae/src/include/memory.h	2018/04/24 16:38:39	1.1
+++ uae/src/include/memory.h	2018/04/24 16:39:19	1.1.1.2
@@ -6,6 +6,25 @@
   * Copyright 1995 Bernd Schmidt
   */
 
+typedef ULONG (*mem_get_func)(CPTR) REGPARAM;
+typedef void (*mem_put_func)(CPTR, ULONG) REGPARAM;
+typedef UBYTE *(*xlate_func)(CPTR) REGPARAM;
+typedef int (*check_func)(CPTR, ULONG) REGPARAM;
+
+extern char *address_space, *good_address_map;
+extern UBYTE *chipmemory;
+
+#undef DIRECT_MEMFUNCS_SUCCESSFUL
+#include "machdep/memory.h"
+
+#ifndef CAN_MAP_MEMORY
+#undef USE_COMPILER
+#endif
+
+#if defined(USE_COMPILER) && !defined(USE_MAPPED_MEMORY)
+#define USE_MAPPED_MEMORY
+#endif
+
 #define kickmem_size 0x080000
 
 #define chipmem_start 0x000000
@@ -14,30 +33,11 @@
 
 extern int ersatzkickfile;
 
-extern char *address_space, *good_address_map;
-
-typedef ULONG (*lget_afunc)(CPTR) REGPARAM;
-typedef UWORD (*wget_afunc)(CPTR) REGPARAM;
-typedef ULONG (*lget_func)(CPTR) REGPARAM;
-typedef UWORD (*wget_func)(CPTR) REGPARAM;
-typedef UBYTE (*bget_func)(CPTR) REGPARAM;
-typedef void (*lput_func)(CPTR,ULONG) REGPARAM;
-typedef void (*wput_func)(CPTR,UWORD) REGPARAM;
-typedef void (*bput_func)(CPTR,UBYTE) REGPARAM;
-typedef UBYTE *(*xlate_func)(CPTR) REGPARAM;
-typedef int (*check_func)(CPTR, ULONG) REGPARAM;
-
 typedef struct {
     /* These ones should be self-explanatory... */
-    lget_afunc alget;
-    wget_afunc awget;
-    lget_func lget;
-    wget_func wget;
-    bget_func bget;
-    lput_func lput;
-    wput_func wput;
-    bput_func bput;
-    /* Use xlateaddr to translate an Amiga address to a UWORD * that can
+    mem_get_func alget, awget, lget, wget, bget;
+    mem_put_func lput, wput, bput;
+    /* Use xlateaddr to translate an Amiga address to a UBYTE * that can
      * be used to address memory without calling the wget/wput functions. 
      * This doesn't work for all memory banks, so this function may call
      * abort(). */
@@ -59,17 +59,17 @@ extern addrbank expamem_bank;
 extern addrbank fastmem_bank;
 
 extern void rtarea_init (void);
+extern void rtarea_setup (void);
 extern void expamem_init (void);
 extern void expamem_reset (void);
 
 extern ULONG fastmem_size, chipmem_size, bogomem_size;
 
-
 /* Default memory access functions */
 
 extern int default_check(CPTR addr, ULONG size) REGPARAM;
 extern UBYTE *default_xlate(CPTR addr) REGPARAM;
-extern UWORD default_awget(CPTR addr) REGPARAM;
+extern ULONG default_awget(CPTR addr) REGPARAM;
 extern ULONG default_alget(CPTR addr) REGPARAM;
 
 extern addrbank membanks[65536];
@@ -78,39 +78,6 @@ static __inline__ unsigned int bankindex
     return a>>16;
 }
 
-static __inline__ ULONG alongget(CPTR addr)
-{
-    return membanks[bankindex(addr)].alget(addr);
-}
-static __inline__ UWORD awordget(CPTR addr)
-{
-    return membanks[bankindex(addr)].awget(addr);
-}
-static __inline__ ULONG longget(CPTR addr)
-{
-    return membanks[bankindex(addr)].lget(addr);
-}
-static __inline__ UWORD wordget(CPTR addr)
-{
-    return membanks[bankindex(addr)].wget(addr);
-}
-static __inline__ UBYTE byteget(CPTR addr) 
-{
-    return membanks[bankindex(addr)].bget(addr);
-}
-static __inline__ void longput(CPTR addr, ULONG l)
-{
-    membanks[bankindex(addr)].lput(addr, l);
-}
-static __inline__ void wordput(CPTR addr, UWORD w)
-{
-    membanks[bankindex(addr)].wput(addr, w);
-}
-static __inline__ void byteput(CPTR addr, UBYTE b)
-{
-    membanks[bankindex(addr)].bput(addr, b);
-}
-
 static __inline__ int check_addr(CPTR a)
 {
 #if defined(NO_EXCEPTION_3) || CPU_LEVEL > 1
@@ -123,54 +90,91 @@ extern int buserr;
     
 extern void memory_init(void);    
 extern void map_banks(addrbank *bank, int first, int count);
-    
+
+#ifndef NO_INLINE_MEMORY_ACCESS
+
+#define alongget(addr) (call_mem_get_func(membanks[bankindex(addr)].alget, addr))
+#define awordget(addr) (call_mem_get_func(membanks[bankindex(addr)].awget, addr))
+#define longget(addr) (call_mem_get_func(membanks[bankindex(addr)].lget, addr))
+#define wordget(addr) (call_mem_get_func(membanks[bankindex(addr)].wget, addr))
+#define byteget(addr) (call_mem_get_func(membanks[bankindex(addr)].bget, addr))
+#define longput(addr,l) (call_mem_put_func(membanks[bankindex(addr)].lput, addr, l))
+#define wordput(addr,w) (call_mem_put_func(membanks[bankindex(addr)].wput, addr, w))
+#define byteput(addr,b) (call_mem_put_func(membanks[bankindex(addr)].bput, addr, b))
+
+#else
+
+extern ULONG alongget(CPTR addr);
+extern ULONG awordget(CPTR addr);
+extern ULONG longget(CPTR addr);
+extern ULONG wordget(CPTR addr);
+extern ULONG byteget(CPTR addr);
+extern void longput(CPTR addr, ULONG l);
+extern void wordput(CPTR addr, ULONG w);
+extern void byteput(CPTR addr, ULONG b);
+
+#endif
+
+#ifndef MD_HAVE_MEM_1_FUNCS
+
+#define alongget_1 alongget
+#define awordget_1 awordget
+#define longget_1 longget
+#define wordget_1 wordget
+#define byteget_1 byteget
+#define longput_1 longput
+#define wordput_1 wordput
+#define byteput_1 byteput
+
+#endif
+
 static __inline__ ULONG get_along(CPTR addr) 
 {
     if (check_addr(addr))
-	return longget(addr);
+	return longget_1(addr);
     buserr = 1;
     return 0;
 }
-static __inline__ UWORD get_aword(CPTR addr) 
+static __inline__ ULONG get_aword(CPTR addr)
 {
     if (check_addr(addr))
-	return wordget(addr);
+	return wordget_1(addr);
     buserr = 1;
     return 0;
 }
 static __inline__ ULONG get_long(CPTR addr) 
 {
     if (check_addr(addr))
-	return longget(addr);
+	return longget_1(addr);
     buserr = 1;
     return 0;
 }
-static __inline__ UWORD get_word(CPTR addr) 
+static __inline__ ULONG get_word(CPTR addr) 
 {
     if (check_addr(addr))
-	return wordget(addr);
+	return wordget_1(addr);
     buserr = 1;
     return 0;
 }
-static __inline__ UBYTE get_byte(CPTR addr) 
+static __inline__ ULONG get_byte(CPTR addr) 
 {
-    return byteget(addr); 
+    return byteget_1(addr); 
 }
 static __inline__ void put_long(CPTR addr, ULONG l) 
 {
     if (!check_addr(addr))
 	buserr = 1;
-    longput(addr, l);
+    longput_1(addr, l);
 }
-static __inline__ void put_word(CPTR addr, UWORD w) 
+static __inline__ void put_word(CPTR addr, ULONG w)
 {
     if (!check_addr(addr))
 	buserr = 1;
-    wordput(addr, w);
+    wordput_1(addr, w);
 }
-static __inline__ void put_byte(CPTR addr, UBYTE b) 
+static __inline__ void put_byte(CPTR addr, ULONG b) 
 {
-    byteput(addr, b);
+    byteput_1(addr, b);
 }
 
 static __inline__ UBYTE *get_real_address(CPTR addr)