--- uae/src/include/memory.h	2018/04/24 16:38:39	1.1
+++ uae/src/include/memory.h	2018/04/24 16:48:59	1.1.1.5
@@ -1,54 +1,73 @@
- /* 
+ /*
   * UAE - The Un*x Amiga Emulator
-  * 
+  *
   * memory management
-  * 
+  *
   * Copyright 1995 Bernd Schmidt
   */
 
-#define kickmem_size 0x080000
+/* Enabling this adds one additional native memory reference per 68k memory
+ * access, but saves one shift (on the x86). Enabling this is probably
+ * better for the cache. My favourite benchmark (PP2) doesn't show a
+ * difference, so I leave this enabled. */
 
-#define chipmem_start 0x000000
-#define bogomem_start 0xC00000 
-#define kickmem_start 0xF80000
+#if 1 || defined SAVE_MEMORY
+#define SAVE_MEMORY_BANKS
+#endif
 
-extern int ersatzkickfile;
+typedef uae_u32 (*mem_get_func)(uaecptr) REGPARAM;
+typedef void (*mem_put_func)(uaecptr, uae_u32) REGPARAM;
+typedef uae_u8 *(*xlate_func)(uaecptr) REGPARAM;
+typedef int (*check_func)(uaecptr, uae_u32) REGPARAM;
 
 extern char *address_space, *good_address_map;
+extern uae_u8 *chipmemory;
+
+extern uae_u32 allocated_chipmem;
+extern uae_u32 allocated_fastmem;
+extern uae_u32 allocated_bogomem;
+extern uae_u32 allocated_gfxmem;
+extern uae_u32 allocated_z3fastmem;
+extern uae_u32 allocated_a3000mem;
+
+#undef DIRECT_MEMFUNCS_SUCCESSFUL
+#include "machdep/maccess.h"
+
+#ifndef CAN_MAP_MEMORY
+#undef USE_COMPILER
+#endif
 
-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;
+#if defined(USE_COMPILER) && !defined(USE_MAPPED_MEMORY)
+#define USE_MAPPED_MEMORY
+#endif
+
+#define kickmem_size 0x080000
+
+#define chipmem_start 0x00000000
+#define bogomem_start 0x00C00000
+#define a3000mem_start 0x07000000
+#define kickmem_start 0x00F80000
+
+extern int ersatzkickfile;
 
 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
-     * be used to address memory without calling the wget/wput functions. 
+    mem_get_func lget, wget, bget;
+    mem_put_func lput, wput, bput;
+    /* Use xlateaddr to translate an Amiga address to a uae_u8 * 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(). */
     xlate_func xlateaddr;
     /* To prevent calls to abort(), use check before calling xlateaddr.
      * It checks not only that the memory bank can do xlateaddr, but also
-     * that the pointer points to an area of at least the specified size. 
+     * that the pointer points to an area of at least the specified size.
      * This is used for example to translate bitplane pointers in custom.c */
     check_func check;
 } addrbank;
 
+extern uae_u8 filesysory[65536];
+
 extern addrbank chipmem_bank;
 extern addrbank kickmem_bank;
 extern addrbank custom_bank;
@@ -57,128 +76,102 @@ extern addrbank cia_bank;
 extern addrbank rtarea_bank;
 extern addrbank expamem_bank;
 extern addrbank fastmem_bank;
+extern addrbank gfxmem_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;
-
+extern uae_u32 gfxmem_start;
+extern uae_u8 *gfxmemory;
+extern uae_u32 gfxmem_mask;
+extern int address_space_24;
 
 /* 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_alget(CPTR addr) REGPARAM;
+extern int default_check(uaecptr addr, uae_u32 size) REGPARAM;
+extern uae_u8 *default_xlate(uaecptr addr) REGPARAM;
 
-extern addrbank membanks[65536];
-static __inline__ unsigned int bankindex(CPTR a)
-{
-    return a>>16;
-}
+#define bankindex(addr) (((uaecptr)(addr)) >> 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
-    return 1;
+#ifdef SAVE_MEMORY_BANKS
+extern addrbank *mem_banks[65536];
+#define get_mem_bank(addr) (*mem_banks[bankindex(addr)])
+#define put_mem_bank(addr, b) (mem_banks[bankindex(addr)] = (b))
 #else
-    return (a & 1) == 0;
+extern addrbank mem_banks[65536];
+#define get_mem_bank(addr) (mem_banks[bankindex(addr)])
+#define put_mem_bank(addr, b) (mem_banks[bankindex(addr)] = *(b))
 #endif
-}
-extern int buserr;
-    
-extern void memory_init(void);    
+
+extern void memory_init(void);
 extern void map_banks(addrbank *bank, int first, int count);
-    
-static __inline__ ULONG get_along(CPTR addr) 
-{
-    if (check_addr(addr))
-	return longget(addr);
-    buserr = 1;
-    return 0;
-}
-static __inline__ UWORD get_aword(CPTR addr) 
-{
-    if (check_addr(addr))
-	return wordget(addr);
-    buserr = 1;
-    return 0;
-}
-static __inline__ ULONG get_long(CPTR addr) 
+
+#ifndef NO_INLINE_MEMORY_ACCESS
+
+#define longget(addr) (call_mem_get_func(get_mem_bank(addr).lget, addr))
+#define wordget(addr) (call_mem_get_func(get_mem_bank(addr).wget, addr))
+#define byteget(addr) (call_mem_get_func(get_mem_bank(addr).bget, addr))
+#define longput(addr,l) (call_mem_put_func(get_mem_bank(addr).lput, addr, l))
+#define wordput(addr,w) (call_mem_put_func(get_mem_bank(addr).wput, addr, w))
+#define byteput(addr,b) (call_mem_put_func(get_mem_bank(addr).bput, addr, b))
+
+#else
+
+extern uae_u32 alongget(uaecptr addr);
+extern uae_u32 awordget(uaecptr addr);
+extern uae_u32 longget(uaecptr addr);
+extern uae_u32 wordget(uaecptr addr);
+extern uae_u32 byteget(uaecptr addr);
+extern void longput(uaecptr addr, uae_u32 l);
+extern void wordput(uaecptr addr, uae_u32 w);
+extern void byteput(uaecptr addr, uae_u32 b);
+
+#endif
+
+#ifndef MD_HAVE_MEM_1_FUNCS
+
+#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 uae_u32 get_long(uaecptr addr)
 {
-    if (check_addr(addr))
-	return longget(addr);
-    buserr = 1;
-    return 0;
+    return longget_1(addr);
 }
-static __inline__ UWORD get_word(CPTR addr) 
+STATIC_INLINE uae_u32 get_word(uaecptr addr)
 {
-    if (check_addr(addr))
-	return wordget(addr);
-    buserr = 1;
-    return 0;
+    return wordget_1(addr);
 }
-static __inline__ UBYTE get_byte(CPTR addr) 
+STATIC_INLINE uae_u32 get_byte(uaecptr addr)
 {
-    return byteget(addr); 
+    return byteget_1(addr);
 }
-static __inline__ void put_long(CPTR addr, ULONG l) 
+STATIC_INLINE void put_long(uaecptr addr, uae_u32 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(uaecptr addr, uae_u32 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(uaecptr addr, uae_u32 b)
 {
-    byteput(addr, b);
+    byteput_1(addr, b);
 }
 
-static __inline__ UBYTE *get_real_address(CPTR addr)
+STATIC_INLINE uae_u8 *get_real_address(uaecptr addr)
 {
-    return membanks[bankindex(addr)].xlateaddr(addr);
+    return get_mem_bank(addr).xlateaddr(addr);
 }
 
-static __inline__ int valid_address(CPTR addr, ULONG size)
+STATIC_INLINE int valid_address(uaecptr addr, uae_u32 size)
 {
-    return membanks[bankindex(addr)].check(addr, size);
+    return get_mem_bank(addr).check(addr, size);
 }