--- uae/include/memory.h	2018/04/24 16:37:54	1.1
+++ uae/include/memory.h	2018/04/24 16:38:26	1.1.1.2
@@ -6,24 +6,16 @@
   * (c) 1995 Bernd Schmidt
   */
 
-#ifdef DUALCPU
-extern bool allowmem;
-extern bool incpu;
-extern bool customacc;
-extern ULONG mempattern;
-extern int memlogptr;
-#endif
-
 #define chipmem_size 0x200000
-#define fastmem_size 0
-#define bogomem_size 0x80000 /* C00000 crap mem */
-#define kickmem_size 0x80000
+#define bogomem_size 0x100000 /* C00000 crap mem */
+#define kickmem_size 0x080000
 
-#define chipmem_start 0
-#define fastmem_start 0x200000
+#define chipmem_start 0x000000
 #define bogomem_start 0xC00000 
 #define kickmem_start 0xF80000
 
+extern int ersatzkickfile;
+
 typedef ULONG (*lget_func)(CPTR) REGPARAM;
 typedef UWORD (*wget_func)(CPTR) REGPARAM;
 typedef UBYTE (*bget_func)(CPTR) REGPARAM;
@@ -31,7 +23,7 @@ typedef void (*lput_func)(CPTR,ULONG) RE
 typedef void (*wput_func)(CPTR,UWORD) REGPARAM;
 typedef void (*bput_func)(CPTR,UBYTE) REGPARAM;
 typedef UWORD *(*xlate_func)(CPTR) REGPARAM;
-typedef bool (*check_func)(CPTR, ULONG) REGPARAM;
+typedef int (*check_func)(CPTR, ULONG) REGPARAM;
 
 typedef struct {
     lget_func lget;
@@ -50,90 +42,77 @@ extern addrbank custom_bank;
 extern addrbank clock_bank;
 extern addrbank cia_bank;
 extern addrbank rtarea_bank;
+extern addrbank expamem_bank;
+extern addrbank fastmem_bank;
 
 extern void rtarea_init (void);
+extern void expamem_init (void);
+extern void expamem_reset (void);
+
+extern ULONG fastmem_size;
+
 
 /* Default memory access functions */
 
-extern bool default_check(CPTR addr, ULONG size) REGPARAM;
+extern int default_check(CPTR addr, ULONG size) REGPARAM;
 extern UWORD *default_xlate(CPTR addr) REGPARAM;
 
-extern lget_func do_lget[256];
-extern wget_func do_wget[256];
-extern bget_func do_bget[256];
-extern lput_func do_lput[256];
-extern wput_func do_wput[256];
-extern bput_func do_bput[256];
-extern xlate_func do_xlateaddr[256];
-extern check_func do_check[256];
-
-static __inline__ int bankindex(CPTR a)
+extern addrbank membanks[65536];
+static __inline__ unsigned int bankindex(CPTR a)
 {
-#ifdef HAVE_BROKEN_SOFTWARE
-    return (a>>16) & 0xFF;
-#else
     return a>>16;
-#endif
 }
 
 static __inline__ ULONG longget(CPTR addr)
 {
-    return do_lget[bankindex(addr)](addr);
+    return membanks[bankindex(addr)].lget(addr);
 }
 static __inline__ UWORD wordget(CPTR addr)
 {
-    return do_wget[bankindex(addr)](addr);
+    return membanks[bankindex(addr)].wget(addr);
 }
 static __inline__ UBYTE byteget(CPTR addr) 
 {
-    return do_bget[bankindex(addr)](addr);
+    return membanks[bankindex(addr)].bget(addr);
 }
 static __inline__ void longput(CPTR addr, ULONG l)
 {
-    do_lput[bankindex(addr)](addr, l);
+    membanks[bankindex(addr)].lput(addr, l);
 }
 static __inline__ void wordput(CPTR addr, UWORD w)
 {
-    do_wput[bankindex(addr)](addr, w);
+    membanks[bankindex(addr)].wput(addr, w);
 }
 static __inline__ void byteput(CPTR addr, UBYTE b)
 {
-    do_bput[bankindex(addr)](addr, b);
+    membanks[bankindex(addr)].bput(addr, b);
 }
 
-static __inline__ bool check_addr(CPTR a)
+static __inline__ int check_addr(CPTR a)
 {
 #ifdef NO_EXCEPTION_3
-    return true;
+    return 1;
 #else
     return (a & 1) == 0;
 #endif
 }
-extern bool buserr;
+extern int buserr;
     
 extern void memory_init(void);    
 extern void map_banks(addrbank bank, int first, int count);
     
-#ifdef DUALCPU    
-extern ULONG get_long(CPTR addr);
-extern UWORD get_word(CPTR addr);
-extern UBYTE get_byte(CPTR addr);
-extern void put_long(CPTR a,ULONG l);
-extern void put_word(CPTR a,UWORD w);
-extern void put_byte(CPTR a,UBYTE b);
-#else
 static __inline__ ULONG get_long(CPTR addr) 
 {
     if (check_addr(addr))
 	return longget(addr);
-    buserr = true;
+    buserr = 1;
     return 0;
 }
 static __inline__ UWORD get_word(CPTR addr) 
 {
     if (check_addr(addr))
 	return wordget(addr);
-    buserr = true;
+    buserr = 1;
     return 0;
 }
 static __inline__ UBYTE get_byte(CPTR addr) 
@@ -143,31 +122,30 @@ static __inline__ UBYTE get_byte(CPTR ad
 static __inline__ void put_long(CPTR addr, ULONG l) 
 {
     if (!check_addr(addr))
-	buserr = true;
+	buserr = 1;
     longput(addr, l);
 }
 static __inline__ void put_word(CPTR addr, UWORD w) 
 {
     if (!check_addr(addr))
-	buserr = true;
+	buserr = 1;
     wordput(addr, w);
 }
 static __inline__ void put_byte(CPTR addr, UBYTE b) 
 {
     byteput(addr, b);
 }
-#endif
 
 static __inline__ UWORD *get_real_address(CPTR addr)
 {
     if (!check_addr(addr))
-	buserr = true;
-    return do_xlateaddr[bankindex(addr)](addr);
+	buserr = 1;
+    return membanks[bankindex(addr)].xlateaddr(addr);
 }
 
-static __inline__ bool valid_address(CPTR addr, ULONG size)
+static __inline__ int valid_address(CPTR addr, ULONG size)
 {
     if (!check_addr(addr))
-	buserr = true;
-    return do_check[bankindex(addr)](addr, size);
+	buserr = 1;
+    return membanks[bankindex(addr)].check(addr, size);
 }