--- uae/src/memory.c 2018/04/24 16:38:39 1.1 +++ uae/src/memory.c 2018/04/24 17:05:45 1.1.1.11 @@ -11,435 +11,626 @@ #include "config.h" #include "options.h" +#include "uae.h" #include "memory.h" -#include "custom.h" -#include "cia.h" #include "ersatz.h" #include "zfile.h" +#include "custom.h" #include "events.h" #include "newcpu.h" -#include "compiler.h" +#include "autoconf.h" +#include "savestate.h" -#ifdef USE_COMPILER +#ifdef USE_MAPPED_MEMORY #include #endif +/* Set by each memory handler that does not simply access real memory. */ +int special_mem; + int ersatzkickfile = 0; -int buserr; -addrbank membanks[65536]; +uae_u32 allocated_chipmem; +uae_u32 allocated_fastmem; +uae_u32 allocated_bogomem; +uae_u32 allocated_gfxmem; +uae_u32 allocated_z3fastmem; +uae_u32 allocated_a3000mem; -/* Default memory access functions */ +static long chip_filepos; +static long bogo_filepos; +static long rom_filepos; + +addrbank *mem_banks[65536]; + +/* This has two functions. It either holds a host address that, when added + to the 68k address, gives the host address corresponding to that 68k + address (in which case the value in this array is even), OR it holds the + same value as mem_banks, for those banks that have baseaddr==0. In that + case, bit 0 is set (the memory access routines will take care of it). */ + +uae_u8 *baseaddr[65536]; -int default_check(CPTR a, ULONG b) +#ifdef NO_INLINE_MEMORY_ACCESS +__inline__ uae_u32 longget (uaecptr addr) { - return 0; + return call_mem_get_func (get_mem_bank (addr).lget, addr); } - -UBYTE *default_xlate(CPTR a) +__inline__ uae_u32 wordget (uaecptr addr) { - fprintf(stderr, "Your Amiga program just did something terribly stupid\n"); - return 0; + return call_mem_get_func (get_mem_bank (addr).wget, addr); } - -UWORD default_awget(CPTR addr) +__inline__ uae_u32 byteget (uaecptr addr) { - default_xlate(addr); - return 0; + return call_mem_get_func (get_mem_bank (addr).bget, addr); } - -ULONG default_alget(CPTR addr) +__inline__ void longput (uaecptr addr, uae_u32 l) { - default_xlate(addr); - return 0; + call_mem_put_func (get_mem_bank (addr).lput, addr, l); } +__inline__ void wordput (uaecptr addr, uae_u32 w) +{ + call_mem_put_func (get_mem_bank (addr).wput, addr, w); +} +__inline__ void byteput (uaecptr addr, uae_u32 b) +{ + call_mem_put_func (get_mem_bank (addr).bput, addr, b); +} +#endif + +uae_u32 chipmem_mask, kickmem_mask, bogomem_mask, a3000mem_mask; +static int illegal_count; /* A dummy bank that only contains zeros */ -static ULONG dummy_lget(CPTR) REGPARAM; -static UWORD dummy_wget(CPTR) REGPARAM; -static UBYTE dummy_bget(CPTR) REGPARAM; -static void dummy_lput(CPTR, ULONG) REGPARAM; -static void dummy_wput(CPTR, UWORD) REGPARAM; -static void dummy_bput(CPTR, UBYTE) REGPARAM; -static int dummy_check(CPTR addr, ULONG size) REGPARAM; +static uae_u32 dummy_lget (uaecptr) REGPARAM; +static uae_u32 dummy_wget (uaecptr) REGPARAM; +static uae_u32 dummy_bget (uaecptr) REGPARAM; +static void dummy_lput (uaecptr, uae_u32) REGPARAM; +static void dummy_wput (uaecptr, uae_u32) REGPARAM; +static void dummy_bput (uaecptr, uae_u32) REGPARAM; +static int dummy_check (uaecptr addr, uae_u32 size) REGPARAM; + +uae_u32 REGPARAM2 dummy_lget (uaecptr addr) +{ + special_mem |= S_READ; + if (currprefs.illegal_mem) { + if (illegal_count < 20) { + illegal_count++; + write_log ("Illegal lget at %08lx\n", addr); + } + } -ULONG dummy_lget(CPTR addr) -{ - if (illegal_mem) printf("Illegal lget at %08lx pc=%08lx\n",addr,m68k_getpc()); - return 0; + return 0xFFFFFFFF; } -UWORD dummy_wget(CPTR addr) +uae_u32 REGPARAM2 dummy_wget (uaecptr addr) { - if (illegal_mem) printf("Illegal wget at %08lx pc=%08lx\n",addr,m68k_getpc()); - return 0; + special_mem |= S_READ; + if (currprefs.illegal_mem) { + if (illegal_count < 20) { + illegal_count++; + write_log ("Illegal wget at %08lx\n", addr); + } + } + + return 0xFFFF; } -UBYTE dummy_bget(CPTR addr) +uae_u32 REGPARAM2 dummy_bget (uaecptr addr) { - if (illegal_mem) printf("Illegal bget at %08lx pc=%08lx\n",addr,m68k_getpc()); - return 0; + special_mem |= S_READ; + if (currprefs.illegal_mem) { + if (illegal_count < 20) { + illegal_count++; + write_log ("Illegal bget at %08lx\n", addr); + } + } + + return 0xFF; } -void dummy_lput(CPTR addr, ULONG l) +void REGPARAM2 dummy_lput (uaecptr addr, uae_u32 l) { - if (illegal_mem) printf("Illegal lput at %08lx pc=%08lx\n",addr,m68k_getpc()); + special_mem |= S_WRITE; + if (currprefs.illegal_mem) { + if (illegal_count < 20) { + illegal_count++; + write_log ("Illegal lput at %08lx\n", addr); + } + } } -void dummy_wput(CPTR addr, UWORD w) +void REGPARAM2 dummy_wput (uaecptr addr, uae_u32 w) { - if (illegal_mem) printf("Illegal wput at %08lx pc=%08lx\n",addr,m68k_getpc()); + special_mem |= S_WRITE; + if (currprefs.illegal_mem) { + if (illegal_count < 20) { + illegal_count++; + write_log ("Illegal wput at %08lx\n", addr); + } + } } -void dummy_bput(CPTR addr, UBYTE b) +void REGPARAM2 dummy_bput (uaecptr addr, uae_u32 b) { - if (illegal_mem) printf("Illegal bput at %08lx pc=%08lx\n",addr,m68k_getpc()); + special_mem |= S_WRITE; + if (currprefs.illegal_mem) { + if (illegal_count < 20) { + illegal_count++; + write_log ("Illegal bput at %08lx\n", addr); + } + } } -int dummy_check(CPTR addr, ULONG size) +int REGPARAM2 dummy_check (uaecptr addr, uae_u32 size) { - if (illegal_mem) printf("Illegal check at %08lx pc=%08lx\n",addr,m68k_getpc()); + special_mem |= S_READ; + if (currprefs.illegal_mem) { + if (illegal_count < 20) { + illegal_count++; + write_log ("Illegal check at %08lx\n", addr); + } + } + return 0; } -/* Chip memory */ +/* A3000 "motherboard resources" bank. */ +static uae_u32 mbres_lget (uaecptr) REGPARAM; +static uae_u32 mbres_wget (uaecptr) REGPARAM; +static uae_u32 mbres_bget (uaecptr) REGPARAM; +static void mbres_lput (uaecptr, uae_u32) REGPARAM; +static void mbres_wput (uaecptr, uae_u32) REGPARAM; +static void mbres_bput (uaecptr, uae_u32) REGPARAM; +static int mbres_check (uaecptr addr, uae_u32 size) REGPARAM; + +static int mbres_val = 0; + +uae_u32 REGPARAM2 mbres_lget (uaecptr addr) +{ + special_mem |= S_READ; + if (currprefs.illegal_mem) + write_log ("Illegal lget at %08lx\n", addr); -ULONG chipmem_mask,kickmem_mask,bogomem_mask; + return 0; +} -UBYTE *chipmemory; +uae_u32 REGPARAM2 mbres_wget (uaecptr addr) +{ + special_mem |= S_READ; + if (currprefs.illegal_mem) + write_log ("Illegal wget at %08lx\n", addr); -static ULONG chipmem_alget(CPTR) REGPARAM; -static UWORD chipmem_awget(CPTR) REGPARAM; + return 0; +} -static ULONG chipmem_lget(CPTR) REGPARAM; -static UWORD chipmem_wget(CPTR) REGPARAM; -static UBYTE chipmem_bget(CPTR) REGPARAM; -static void chipmem_lput(CPTR, ULONG) REGPARAM; -static void chipmem_wput(CPTR, UWORD) REGPARAM; -static void chipmem_bput(CPTR, UBYTE) REGPARAM; +uae_u32 REGPARAM2 mbres_bget (uaecptr addr) +{ + special_mem |= S_READ; + if (currprefs.illegal_mem) + write_log ("Illegal bget at %08lx\n", addr); -static int chipmem_check(CPTR addr, ULONG size) REGPARAM; -static UBYTE *chipmem_xlate(CPTR addr) REGPARAM; + return (addr & 0xFFFF) == 3 ? mbres_val : 0; +} -ULONG chipmem_alget(CPTR addr) +void REGPARAM2 mbres_lput (uaecptr addr, uae_u32 l) { - UBYTE *m; - addr -= chipmem_start & chipmem_mask; - addr &= chipmem_size-1; - m = chipmemory + addr; - return (((ULONG)m[0] << 24) + ((ULONG)m[1] << 16) - + ((ULONG)m[2] << 8) + ((ULONG)m[3])); + special_mem |= S_WRITE; + if (currprefs.illegal_mem) + write_log ("Illegal lput at %08lx\n", addr); +} +void REGPARAM2 mbres_wput (uaecptr addr, uae_u32 w) +{ + special_mem |= S_WRITE; + if (currprefs.illegal_mem) + write_log ("Illegal wput at %08lx\n", addr); +} +void REGPARAM2 mbres_bput (uaecptr addr, uae_u32 b) +{ + special_mem |= S_WRITE; + if (currprefs.illegal_mem) + write_log ("Illegal bput at %08lx\n", addr); + + if ((addr & 0xFFFF) == 3) + mbres_val = b; } -UWORD chipmem_awget(CPTR addr) +int REGPARAM2 mbres_check (uaecptr addr, uae_u32 size) { - UBYTE *m; - addr -= chipmem_start & chipmem_mask; - addr &= chipmem_size-1; - m = chipmemory + addr; - return ((UWORD)m[0] << 8) + m[1]; + if (currprefs.illegal_mem) + write_log ("Illegal check at %08lx\n", addr); + + return 0; } -ULONG chipmem_lget(CPTR addr) +/* Chip memory */ + +uae_u8 *chipmemory; + +static int chipmem_check (uaecptr addr, uae_u32 size) REGPARAM; +static uae_u8 *chipmem_xlate (uaecptr addr) REGPARAM; + +uae_u32 REGPARAM2 chipmem_lget (uaecptr addr) { - UBYTE *m; + uae_u32 *m; + addr -= chipmem_start & chipmem_mask; - addr &= chipmem_size-1; - m = chipmemory + addr; - return (((ULONG)m[0] << 24) + ((ULONG)m[1] << 16) - + ((ULONG)m[2] << 8) + ((ULONG)m[3])); + addr &= chipmem_mask; + m = (uae_u32 *)(chipmemory + addr); + return do_get_mem_long (m); } -UWORD chipmem_wget(CPTR addr) +uae_u32 REGPARAM2 chipmem_wget (uaecptr addr) { - UBYTE *m; + uae_u16 *m; + addr -= chipmem_start & chipmem_mask; - addr &= chipmem_size-1; - m = chipmemory + addr; - return ((UWORD)m[0] << 8) + m[1]; + addr &= chipmem_mask; + m = (uae_u16 *)(chipmemory + addr); + return do_get_mem_word (m); } -UBYTE chipmem_bget(CPTR addr) +uae_u32 REGPARAM2 chipmem_bget (uaecptr addr) { addr -= chipmem_start & chipmem_mask; - addr &= chipmem_size-1; + addr &= chipmem_mask; return chipmemory[addr]; } -void chipmem_lput(CPTR addr, ULONG l) +void REGPARAM2 chipmem_lput (uaecptr addr, uae_u32 l) { - UBYTE *m; + uae_u32 *m; + addr -= chipmem_start & chipmem_mask; - addr &= chipmem_size-1; - m = chipmemory + addr; - m[0] = l >> 24; - m[1] = l >> 16; - m[2] = l >> 8; - m[3] = l; + addr &= chipmem_mask; + m = (uae_u32 *)(chipmemory + addr); + do_put_mem_long (m, l); } -void chipmem_wput(CPTR addr, UWORD w) +void REGPARAM2 chipmem_wput (uaecptr addr, uae_u32 w) { - UBYTE *m; + uae_u16 *m; + addr -= chipmem_start & chipmem_mask; - addr &= chipmem_size-1; - m = chipmemory + addr; - m[0] = w >> 8; - m[1] = w; + addr &= chipmem_mask; + m = (uae_u16 *)(chipmemory + addr); + do_put_mem_word (m, w); } -void chipmem_bput(CPTR addr, UBYTE b) +void REGPARAM2 chipmem_bput (uaecptr addr, uae_u32 b) { addr -= chipmem_start & chipmem_mask; - addr &= chipmem_size-1; + addr &= chipmem_mask; chipmemory[addr] = b; } -int chipmem_check(CPTR addr, ULONG size) +int REGPARAM2 chipmem_check (uaecptr addr, uae_u32 size) { addr -= chipmem_start & chipmem_mask; - addr &= chipmem_size-1; - return (addr + size) < chipmem_size; + addr &= chipmem_mask; + return (addr + size) <= allocated_chipmem; } -UBYTE *chipmem_xlate(CPTR addr) +uae_u8 REGPARAM2 *chipmem_xlate (uaecptr addr) { addr -= chipmem_start & chipmem_mask; - addr &= chipmem_size-1; + addr &= chipmem_mask; return chipmemory + addr; } /* Slow memory */ -static UBYTE *bogomemory; +static uae_u8 *bogomemory; -static ULONG bogomem_alget(CPTR) REGPARAM; -static UWORD bogomem_awget(CPTR) REGPARAM; -static ULONG bogomem_lget(CPTR) REGPARAM; -static UWORD bogomem_wget(CPTR) REGPARAM; -static UBYTE bogomem_bget(CPTR) REGPARAM; -static void bogomem_lput(CPTR, ULONG) REGPARAM; -static void bogomem_wput(CPTR, UWORD) REGPARAM; -static void bogomem_bput(CPTR, UBYTE) REGPARAM; -static int bogomem_check(CPTR addr, ULONG size) REGPARAM; -static UBYTE *bogomem_xlate(CPTR addr) REGPARAM; +static uae_u32 bogomem_lget (uaecptr) REGPARAM; +static uae_u32 bogomem_wget (uaecptr) REGPARAM; +static uae_u32 bogomem_bget (uaecptr) REGPARAM; +static void bogomem_lput (uaecptr, uae_u32) REGPARAM; +static void bogomem_wput (uaecptr, uae_u32) REGPARAM; +static void bogomem_bput (uaecptr, uae_u32) REGPARAM; +static int bogomem_check (uaecptr addr, uae_u32 size) REGPARAM; +static uae_u8 *bogomem_xlate (uaecptr addr) REGPARAM; -ULONG bogomem_alget(CPTR addr) +uae_u32 REGPARAM2 bogomem_lget (uaecptr addr) { - UBYTE *m; + uae_u32 *m; addr -= bogomem_start & bogomem_mask; - addr &= bogomem_size-1; - m = bogomemory + addr; - return (((ULONG)m[0] << 24) + ((ULONG)m[1] << 16) - + ((ULONG)m[2] << 8) + ((ULONG)m[3])); + addr &= bogomem_mask; + m = (uae_u32 *)(bogomemory + addr); + return do_get_mem_long (m); } -UWORD bogomem_awget(CPTR addr) +uae_u32 REGPARAM2 bogomem_wget (uaecptr addr) { - UBYTE *m; + uae_u16 *m; addr -= bogomem_start & bogomem_mask; - addr &= bogomem_size-1; - m = bogomemory + addr; - return ((UWORD)m[0] << 8) + m[1]; + addr &= bogomem_mask; + m = (uae_u16 *)(bogomemory + addr); + return do_get_mem_word (m); } -ULONG bogomem_lget(CPTR addr) +uae_u32 REGPARAM2 bogomem_bget (uaecptr addr) { - UBYTE *m; addr -= bogomem_start & bogomem_mask; - addr &= bogomem_size-1; - m = bogomemory + addr; - return (((ULONG)m[0] << 24) + ((ULONG)m[1] << 16) - + ((ULONG)m[2] << 8) + ((ULONG)m[3])); + addr &= bogomem_mask; + return bogomemory[addr]; } -UWORD bogomem_wget(CPTR addr) +void REGPARAM2 bogomem_lput (uaecptr addr, uae_u32 l) { - UBYTE *m; + uae_u32 *m; addr -= bogomem_start & bogomem_mask; - addr &= bogomem_size-1; - m = bogomemory + addr; - return ((UWORD)m[0] << 8) + m[1]; + addr &= bogomem_mask; + m = (uae_u32 *)(bogomemory + addr); + do_put_mem_long (m, l); } -UBYTE bogomem_bget(CPTR addr) +void REGPARAM2 bogomem_wput (uaecptr addr, uae_u32 w) { + uae_u16 *m; addr -= bogomem_start & bogomem_mask; - addr &= bogomem_size-1; - return bogomemory[addr]; + addr &= bogomem_mask; + m = (uae_u16 *)(bogomemory + addr); + do_put_mem_word (m, w); } -void bogomem_lput(CPTR addr, ULONG l) +void REGPARAM2 bogomem_bput (uaecptr addr, uae_u32 b) { - UBYTE *m; addr -= bogomem_start & bogomem_mask; - addr &= bogomem_size-1; - m = bogomemory + addr; - m[0] = l >> 24; - m[1] = l >> 16; - m[2] = l >> 8; - m[3] = l; + addr &= bogomem_mask; + bogomemory[addr] = b; } -void bogomem_wput(CPTR addr, UWORD w) +int REGPARAM2 bogomem_check (uaecptr addr, uae_u32 size) { - UBYTE *m; addr -= bogomem_start & bogomem_mask; - addr &= bogomem_size-1; - m = bogomemory + addr; - m[0] = w >> 8; - m[1] = w; + addr &= bogomem_mask; + return (addr + size) <= allocated_bogomem; } -void bogomem_bput(CPTR addr, UBYTE b) +uae_u8 REGPARAM2 *bogomem_xlate (uaecptr addr) { addr -= bogomem_start & bogomem_mask; - addr &= bogomem_size-1; - bogomemory[addr] = b; + addr &= bogomem_mask; + return bogomemory + addr; +} + +/* A3000 motherboard fast memory */ + +static uae_u8 *a3000memory; + +static uae_u32 a3000mem_lget (uaecptr) REGPARAM; +static uae_u32 a3000mem_wget (uaecptr) REGPARAM; +static uae_u32 a3000mem_bget (uaecptr) REGPARAM; +static void a3000mem_lput (uaecptr, uae_u32) REGPARAM; +static void a3000mem_wput (uaecptr, uae_u32) REGPARAM; +static void a3000mem_bput (uaecptr, uae_u32) REGPARAM; +static int a3000mem_check (uaecptr addr, uae_u32 size) REGPARAM; +static uae_u8 *a3000mem_xlate (uaecptr addr) REGPARAM; + +uae_u32 REGPARAM2 a3000mem_lget (uaecptr addr) +{ + uae_u32 *m; + addr -= a3000mem_start & a3000mem_mask; + addr &= a3000mem_mask; + m = (uae_u32 *)(a3000memory + addr); + return do_get_mem_long (m); } -int bogomem_check(CPTR addr, ULONG size) +uae_u32 REGPARAM2 a3000mem_wget (uaecptr addr) { - addr -= bogomem_start & (bogomem_size-1); - addr &= bogomem_size-1; - return (addr + size) < bogomem_size; + uae_u16 *m; + addr -= a3000mem_start & a3000mem_mask; + addr &= a3000mem_mask; + m = (uae_u16 *)(a3000memory + addr); + return do_get_mem_word (m); } -UBYTE *bogomem_xlate(CPTR addr) +uae_u32 REGPARAM2 a3000mem_bget (uaecptr addr) { - addr -= bogomem_start & (bogomem_size-1); - addr &= bogomem_size-1; - return bogomemory + addr; + addr -= a3000mem_start & a3000mem_mask; + addr &= a3000mem_mask; + return a3000memory[addr]; } -/* Kick memory */ +void REGPARAM2 a3000mem_lput (uaecptr addr, uae_u32 l) +{ + uae_u32 *m; + addr -= a3000mem_start & a3000mem_mask; + addr &= a3000mem_mask; + m = (uae_u32 *)(a3000memory + addr); + do_put_mem_long (m, l); +} -static int zkickfile = 0; -UBYTE *kickmemory; +void REGPARAM2 a3000mem_wput (uaecptr addr, uae_u32 w) +{ + uae_u16 *m; + addr -= a3000mem_start & a3000mem_mask; + addr &= a3000mem_mask; + m = (uae_u16 *)(a3000memory + addr); + do_put_mem_word (m, w); +} -static ULONG kickmem_alget(CPTR) REGPARAM; -static UWORD kickmem_awget(CPTR) REGPARAM; -static ULONG kickmem_lget(CPTR) REGPARAM; -static UWORD kickmem_wget(CPTR) REGPARAM; -static UBYTE kickmem_bget(CPTR) REGPARAM; -static void kickmem_lput(CPTR, ULONG) REGPARAM; -static void kickmem_wput(CPTR, UWORD) REGPARAM; -static void kickmem_bput(CPTR, UBYTE) REGPARAM; -static int kickmem_check(CPTR addr, ULONG size) REGPARAM; -static UBYTE *kickmem_xlate(CPTR addr) REGPARAM; +void REGPARAM2 a3000mem_bput (uaecptr addr, uae_u32 b) +{ + addr -= a3000mem_start & a3000mem_mask; + addr &= a3000mem_mask; + a3000memory[addr] = b; +} -ULONG kickmem_alget(CPTR addr) +int REGPARAM2 a3000mem_check (uaecptr addr, uae_u32 size) { - UBYTE *m; - addr -= kickmem_start & kickmem_mask; - addr &= kickmem_size-1; - m = kickmemory + addr; - return (((ULONG)m[0] << 24) + ((ULONG)m[1] << 16) - + ((ULONG)m[2] << 8) + ((ULONG)m[3])); + addr -= a3000mem_start & a3000mem_mask; + addr &= a3000mem_mask; + return (addr + size) <= allocated_a3000mem; } -UWORD kickmem_awget(CPTR addr) +uae_u8 REGPARAM2 *a3000mem_xlate(uaecptr addr) { - UBYTE *m; - addr -= kickmem_start & kickmem_mask; - addr &= kickmem_size-1; - m = kickmemory + addr; - return ((UWORD)m[0] << 8) + m[1]; + addr -= a3000mem_start & a3000mem_mask; + addr &= a3000mem_mask; + return a3000memory + addr; } -ULONG kickmem_lget(CPTR addr) +/* Kick memory */ + +uae_u8 *kickmemory; + +static uae_u32 kickmem_lget (uaecptr) REGPARAM; +static uae_u32 kickmem_wget (uaecptr) REGPARAM; +static uae_u32 kickmem_bget (uaecptr) REGPARAM; +static void kickmem_lput (uaecptr, uae_u32) REGPARAM; +static void kickmem_wput (uaecptr, uae_u32) REGPARAM; +static void kickmem_bput (uaecptr, uae_u32) REGPARAM; +static int kickmem_check (uaecptr addr, uae_u32 size) REGPARAM; +static uae_u8 *kickmem_xlate (uaecptr addr) REGPARAM; + +uae_u32 REGPARAM2 kickmem_lget (uaecptr addr) { - UBYTE *m; + uae_u32 *m; addr -= kickmem_start & kickmem_mask; - addr &= kickmem_size-1; - m = kickmemory + addr; - return (((ULONG)m[0] << 24) + ((ULONG)m[1] << 16) - + ((ULONG)m[2] << 8) + ((ULONG)m[3])); + addr &= kickmem_mask; + m = (uae_u32 *)(kickmemory + addr); + return do_get_mem_long (m); } -UWORD kickmem_wget(CPTR addr) +uae_u32 REGPARAM2 kickmem_wget (uaecptr addr) { - UBYTE *m; + uae_u16 *m; addr -= kickmem_start & kickmem_mask; - addr &= kickmem_size-1; - m = kickmemory + addr; - return ((UWORD)m[0] << 8) + m[1]; + addr &= kickmem_mask; + m = (uae_u16 *)(kickmemory + addr); + return do_get_mem_word (m); } -UBYTE kickmem_bget(CPTR addr) +uae_u32 REGPARAM2 kickmem_bget (uaecptr addr) { addr -= kickmem_start & kickmem_mask; - addr &= kickmem_size-1; + addr &= kickmem_mask; return kickmemory[addr]; } -void kickmem_lput(CPTR addr, ULONG b) +void REGPARAM2 kickmem_lput (uaecptr addr, uae_u32 b) { - if (illegal_mem) printf("Illegal kickmem lput at %08lx pc=%08lx\n",addr,m68k_getpc()); + if (currprefs.illegal_mem) + write_log ("Illegal kickmem lput at %08lx\n", addr); } -void kickmem_wput(CPTR addr, UWORD b) +void REGPARAM2 kickmem_wput (uaecptr addr, uae_u32 b) { - if (illegal_mem) printf("Illegal kickmem wput at %08lx pc=%08lx\n",addr,m68k_getpc()); + if (currprefs.illegal_mem) + write_log ("Illegal kickmem wput at %08lx\n", addr); } -void kickmem_bput(CPTR addr, UBYTE b) +void REGPARAM2 kickmem_bput (uaecptr addr, uae_u32 b) { - if (illegal_mem) printf("Illegal kickmem lput at %08lx pc=%08lx\n",addr,m68k_getpc()); + if (currprefs.illegal_mem) + write_log ("Illegal kickmem lput at %08lx\n", addr); } -int kickmem_check(CPTR addr, ULONG size) +int REGPARAM2 kickmem_check (uaecptr addr, uae_u32 size) { - addr -= kickmem_start & (kickmem_size-1); - addr &= kickmem_size-1; - return (addr + size) < kickmem_size; + addr -= kickmem_start & kickmem_mask; + addr &= kickmem_mask; + return (addr + size) <= kickmem_size; } -UBYTE *kickmem_xlate(CPTR addr) +uae_u8 REGPARAM2 *kickmem_xlate (uaecptr addr) { - addr -= kickmem_start & (kickmem_size-1); - addr &= kickmem_size-1; + addr -= kickmem_start & kickmem_mask; + addr &= kickmem_mask; return kickmemory + addr; } -static int load_kickstart(void) +/* Default memory access functions */ + +int REGPARAM2 default_check (uaecptr a, uae_u32 b) +{ + return 0; +} + +uae_u8 REGPARAM2 *default_xlate (uaecptr a) +{ + write_log ("Your Amiga program just did something terribly stupid\n"); + uae_reset(); + return kickmem_xlate (get_long (0xF80000)); /* So we don't crash. */ +} + +static int load_kickstart (void) { int i; - ULONG cksum = 0, prevck = 0; - unsigned char buffer[8]; - - FILE *f = zfile_open(romfile, "rb"); - - if (f == NULL) { - fprintf(stderr, "No Kickstart ROM found.\n"); + uae_u32 cksum = 0, prevck = 0; + unsigned char buffer[20]; + + FILE *f = zfile_open (currprefs.romfile, "rb"); + + if (f == NULL) { + write_log ("No Kickstart ROM found.\n"); +#if defined AMIGA || defined __POS__ +#define USE_UAE_ERSATZ "USE_UAE_ERSATZ" + if (!getenv (USE_UAE_ERSATZ)) { + write_log ("Using current ROM. (create ENV:%s to " + "use uae's ROM replacement)\n", USE_UAE_ERSATZ); + memcpy (kickmemory, (char*)0x1000000 - kickmem_size, kickmem_size); + goto chk_sum; + } +#endif return 0; } - - fread(buffer, 1, 8, f); - if (buffer[4] == 0 && buffer[5] == 8 && buffer[6] == 0 && buffer[7] == 0) { - fprintf(stderr, "You seem to have a ZKick file there... You probably lose.\n"); - zkickfile = 1; - } else - fseek(f, 0, SEEK_SET); - - i = fread(kickmemory, 1, kickmem_size, f); + + i = fread (buffer, 1, 11, f); + if (strncmp ((char *)buffer, "AMIROMTYPE1", 11) != 0) + fseek (f, 0, SEEK_SET); + + i = fread (kickmemory, 1, kickmem_size, f); if (i == kickmem_size/2) { - fprintf(stderr, "Warning: Kickstart is only 256K.\n"); memcpy (kickmemory + kickmem_size/2, kickmemory, kickmem_size/2); } else if (i != kickmem_size) { - fprintf(stderr, "Error while reading Kickstart.\n"); + write_log ("Error while reading Kickstart.\n"); return 0; } zfile_close (f); - + + cloanto_rom = 0; + if (strncmp ((char *)buffer, "AMIROMTYPE1", 11) == 0) { + FILE *keyf; + uae_u8 *p; + long size, cnt, t; + + cloanto_rom = 1; + write_log ("ROM image is an encrypted \"Amiga Forever\" ROM file.\n"); + if (strlen (currprefs.keyfile) == 0) { + write_log ("No filename given for ROM key file.\n"); + return 0; + } + keyf = zfile_open (currprefs.keyfile, "rb"); + if (keyf == 0) { + write_log ("Could not find ROM key file.\n"); + return 0; + } + p = (uae_u8 *)xmalloc (524288); + size = fread (p, 1, 524288, keyf); + + for (t = cnt = 0; cnt < kickmem_size; cnt++, t = (t + 1) % size) { + kickmemory[cnt] ^= p[t]; + if (i == cnt+1) + t = size-1; + } + fclose (keyf); + free (p); + } +#if defined(AMIGA) + chk_sum: +#endif + for (i = 0; i < kickmem_size; i+=4) { - ULONG data = kickmemory[i]*65536*256 + kickmemory[i+1]*65536 + kickmemory[i+2]*256 + kickmemory[i+3]; + uae_u32 data = kickmemory[i]*65536*256 + kickmemory[i+1]*65536 + kickmemory[i+2]*256 + kickmemory[i+3]; cksum += data; if (cksum < prevck) cksum++; prevck = cksum; } - if (cksum != 0xFFFFFFFF) { - fprintf(stderr, "Warning: Kickstart checksum incorrect. You probably have a corrupted ROM image.\n"); + if (cksum != 0xFFFFFFFFul) { + write_log ("Kickstart checksum incorrect. You probably have a corrupted ROM image.\n"); } return 1; } @@ -447,106 +638,519 @@ static int load_kickstart(void) /* Address banks */ addrbank dummy_bank = { - default_alget, default_awget, dummy_lget, dummy_wget, dummy_bget, dummy_lput, dummy_wput, dummy_bput, - default_xlate, dummy_check + default_xlate, dummy_check, NULL +}; + +addrbank mbres_bank = { + mbres_lget, mbres_wget, mbres_bget, + mbres_lput, mbres_wput, mbres_bput, + default_xlate, mbres_check, NULL }; addrbank chipmem_bank = { - chipmem_alget, chipmem_awget, chipmem_lget, chipmem_wget, chipmem_bget, chipmem_lput, chipmem_wput, chipmem_bput, - chipmem_xlate, chipmem_check + chipmem_xlate, chipmem_check, NULL }; addrbank bogomem_bank = { - bogomem_alget, bogomem_awget, bogomem_lget, bogomem_wget, bogomem_bget, bogomem_lput, bogomem_wput, bogomem_bput, - bogomem_xlate, bogomem_check + bogomem_xlate, bogomem_check, NULL +}; + +addrbank a3000mem_bank = { + a3000mem_lget, a3000mem_wget, a3000mem_bget, + a3000mem_lput, a3000mem_wput, a3000mem_bput, + a3000mem_xlate, a3000mem_check, NULL }; addrbank kickmem_bank = { - kickmem_alget, kickmem_awget, kickmem_lget, kickmem_wget, kickmem_bget, kickmem_lput, kickmem_wput, kickmem_bput, - kickmem_xlate, kickmem_check + kickmem_xlate, kickmem_check, NULL }; char *address_space, *good_address_map; int good_address_fd; -void memory_init(void) +#ifndef NATMEM_OFFSET + +uae_u8 *mapped_malloc (size_t s, char* file) { - char buffer[4096]; - char *nam; - int i, fd; - buserr = 0; + return malloc (s); +} - chipmem_mask = chipmem_size - 1; - kickmem_mask = kickmem_size - 1; - bogomem_mask = bogomem_size - 1; - -#ifdef USE_COMPILER - fd = open("/dev/zero", O_RDWR); - good_address_map = mmap(NULL, 1 << 24, PROT_READ, MAP_PRIVATE, fd, 0); - address_space = mmap(NULL, 1 << 24, PROT_READ, MAP_PRIVATE, fd, 0); - chipmemory = mmap(address_space, 0x200000, PROT_READ|PROT_WRITE, MAP_PRIVATE | MAP_FIXED, fd, 0); - kickmemory = mmap(address_space + 0xF80000, 0x80000, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED, fd, 0); - - close(fd); - - good_address_fd = open(nam = tmpnam(NULL), O_CREAT|O_RDWR, 0600); - memset(buffer,1,sizeof(buffer)); - write(good_address_fd, buffer,sizeof(buffer)); - unlink(nam); - - for (i = 0; i < chipmem_size; i += 4096) - mmap(good_address_map + i, 4096, PROT_READ, MAP_FIXED | MAP_PRIVATE, - good_address_fd, 0); - for (i = 0; i < kickmem_size; i += 4096) - mmap(good_address_map + i + 0x1000000 - kickmem_size, 4096, PROT_READ, - MAP_FIXED | MAP_PRIVATE, good_address_fd, 0); +void mapped_free (uae_u8 *p) +{ + free (p); +} #else - chipmemory = (UBYTE *)malloc(chipmem_size); - kickmemory = (UBYTE *)malloc(kickmem_size); + +#include +#include +#include +#include + +shmpiece *shm_start=NULL; +int canbang=1; + +static void dumplist(void) +{ + shmpiece *x=shm_start; + printf ("Start Dump:\n"); + while (x) { + printf (" this=%p, Native %p, id %d, prev=%p, next=%p, size=0x%08x\n", + x, x->native_address, x->id, x->prev, x->next,x->size); + x = x->next; + } + printf ("End Dump:\n"); +} + +static shmpiece *find_shmpiece (uae_u8 *base) +{ + shmpiece *x = shm_start; + + while (x && x->native_address != base) + x = x->next; + if (!x) { + printf("NATMEM: Failure to find mapping at %p\n",base); + dumplist(); + canbang = 0; + return 0; + } + return x; +} + +static void delete_shmmaps (uae_u32 start, uae_u32 size) +{ + if (!canbang) + return; + + while (size) { + uae_u8 *base = mem_banks[bankindex(start)]->baseaddr; + if (base) { + shmpiece *x; + base = ((uae_u8*)NATMEM_OFFSET)+start; + + x = find_shmpiece (base); + if (! x) + return; + + if (x->size > size) { + printf("NATMEM: Failure to delete mapping at %08x(size %08x, delsize %08x)\n",start,x->size,size); + dumplist(); + canbang = 0; + return; + } + shmdt (x->native_address); + size -= x->size; + start += x->size; + if (x->next) + x->next->prev = x->prev; /* remove this one from the list */ + if (x->prev) + x->prev->next = x->next; + else + shm_start = x->next; + free(x); + } else { + size -= 0x10000; + start += 0x10000; + } + } +} + +static void add_shmmaps (uae_u32 start, addrbank *what) +{ + shmpiece *x = shm_start; + shmpiece *y; + uae_u8 *base = what->baseaddr; + + if (!canbang) + return; + if (!base) + return; + + x = find_shmpiece (base); + if (! x) + return; + y = malloc (sizeof (shmpiece)); + *y = *x; + base = ((uae_u8*)NATMEM_OFFSET) + start; + y->native_address = shmat (y->id,base,0); + if (y->native_address == (void*)-1) { + printf("NATMEM: Failure to map existing at %08x(%p)\n",start,base); + perror("shmat"); + dumplist(); + canbang = 0; + return; + } + y->next = shm_start; + y->prev = NULL; + if (y->next) + y->next->prev = y; + shm_start = y; +} + +uae_u8 *mapped_malloc (size_t s, char *file) +{ + int id; + void *answer; + shmpiece *x; + + if (!canbang) + return malloc (s); + + id = shmget (IPC_PRIVATE, s, 0x1ff); + if (id == 1) { + canbang = 0; + return mapped_malloc (s, file); + } + answer = shmat (id,0,0); + shmctl (id,IPC_RMID,NULL); + if (answer != (void*)-1) { + x = malloc (sizeof(shmpiece)); + x->native_address = answer; + x->id = id; + x->size = s; + x->next = shm_start; + x->prev = NULL; + if (x->next) + x->next->prev = x; + shm_start = x; + + return answer; + } + canbang = 0; + return mapped_malloc (s, file); +} + +void mapped_free (uae_u8 *base) +{ + shmpiece *x = find_shmpiece (base); + if (! x) + abort (); + shmdt (x->native_address); +} + #endif - for(i = 0; i < 65536; i++) - membanks[i] = dummy_bank; - - /* Map the chipmem into all of the lower 16MB */ - map_banks(&chipmem_bank, 0x00, 256); - map_banks(&custom_bank, 0xC0, 0x20); - map_banks(&cia_bank, 0xA0, 32); - map_banks(&clock_bank, 0xDC, 1); - - if (bogomem_size > 0) { - bogomemory = (UBYTE *)malloc(bogomem_size); - map_banks(&bogomem_bank, 0xC0, bogomem_size >> 16); +static void init_mem_banks (void) +{ + int i; + for (i = 0; i < 65536; i++) + put_mem_bank (i << 16, &dummy_bank, 0); +} + +static void allocate_memory (void) +{ + if (allocated_chipmem != currprefs.chipmem_size) { + if (chipmemory) + mapped_free (chipmemory); + chipmemory = 0; + + allocated_chipmem = currprefs.chipmem_size; + chipmem_mask = allocated_chipmem - 1; + + chipmemory = mapped_malloc (allocated_chipmem, "chip"); + if (chipmemory == 0) { + write_log ("Fatal error: out of memory for chipmem.\n"); + allocated_chipmem = 0; + } else + do_put_mem_long ((uae_u32 *)(chipmemory + 4), 0); + } + + if (allocated_bogomem != currprefs.bogomem_size) { + if (bogomemory) + mapped_free (bogomemory); + bogomemory = 0; + + allocated_bogomem = currprefs.bogomem_size; + bogomem_mask = allocated_bogomem - 1; + + if (allocated_bogomem) { + bogomemory = mapped_malloc (allocated_bogomem, "bogo"); + if (bogomemory == 0) { + write_log ("Out of memory for bogomem.\n"); + allocated_bogomem = 0; + } + } + } + if (allocated_a3000mem != currprefs.a3000mem_size) { + if (a3000memory) + mapped_free (a3000memory); + a3000memory = 0; + + allocated_a3000mem = currprefs.a3000mem_size; + a3000mem_mask = allocated_a3000mem - 1; + + if (allocated_a3000mem) { + a3000memory = mapped_malloc (allocated_a3000mem, "a3000"); + if (a3000memory == 0) { + write_log ("Out of memory for a3000mem.\n"); + allocated_a3000mem = 0; + } + } } - map_banks(&rtarea_bank, 0xF0, 1); - if (!load_kickstart()) { - init_ersatz_rom(kickmemory); + if (savestate_state == STATE_RESTORE) { + fseek (savestate_file, chip_filepos, SEEK_SET); + fread (chipmemory, 1, allocated_chipmem, savestate_file); + if (allocated_bogomem > 0) { + fseek (savestate_file, bogo_filepos, SEEK_SET); + fread (bogomemory, 1, allocated_bogomem, savestate_file); + } + } + chipmem_bank.baseaddr = chipmemory; + bogomem_bank.baseaddr = bogomemory; +} + +void memory_reset (void) +{ + int i, custom_start; + +#ifdef NATMEM_OFFSET + delete_shmmaps (0, 0xFFFF0000); +#endif + init_mem_banks (); + + currprefs.chipmem_size = changed_prefs.chipmem_size; + currprefs.bogomem_size = changed_prefs.bogomem_size; + currprefs.a3000mem_size = changed_prefs.a3000mem_size; + + allocate_memory (); + + if (strcmp (currprefs.romfile, changed_prefs.romfile) != 0 + || strcmp (currprefs.keyfile, changed_prefs.keyfile) != 0) + { + ersatzkickfile = 0; + memcpy (currprefs.romfile, changed_prefs.romfile, sizeof currprefs.romfile); + memcpy (currprefs.keyfile, changed_prefs.keyfile, sizeof currprefs.keyfile); + /* Clear out whatever data remains across a reset. */ + memset (chipmemory, 0, allocated_chipmem); + if (! load_kickstart ()) { + init_ersatz_rom (kickmemory); + ersatzkickfile = 1; + } + } + /* Map the chipmem into all of the lower 8MB */ + i = allocated_chipmem > 0x200000 ? (allocated_chipmem >> 16) : 32; + map_banks (&chipmem_bank, 0x00, i, allocated_chipmem); + + custom_start = 0xC0; + + map_banks (&custom_bank, custom_start, 0xE0 - custom_start, 0); + map_banks (&cia_bank, 0xA0, 32, 0); + map_banks (&clock_bank, 0xDC, 1, 0); + + /* @@@ Does anyone have a clue what should be in the 0x200000 - 0xA00000 + * range on an Amiga without expansion memory? */ + custom_start = allocated_chipmem >> 16; + if (custom_start < 0x20) + custom_start = 0x20; + map_banks (&dummy_bank, custom_start, 0xA0 - custom_start, 0); + /*map_banks (&mbres_bank, 0xDE, 1);*/ + + if (bogomemory != 0) { + int t = allocated_bogomem >> 16; + if (t > 0x1C) + t = 0x1C; + map_banks (&bogomem_bank, 0xC0, t, allocated_bogomem); + } + if (a3000memory != 0) + map_banks (&a3000mem_bank, a3000mem_start >> 16, allocated_a3000mem >> 16, + allocated_a3000mem); + + map_banks (&rtarea_bank, RTAREA_BASE >> 16, 1, 0); + + map_banks (&kickmem_bank, 0xF8, 8, 0); + map_banks (&expamem_bank, 0xE8, 1, 0); + + if (cloanto_rom) + map_banks (&kickmem_bank, 0xE0, 8, 0); +} + +void memory_init (void) +{ + allocated_chipmem = 0; + allocated_bogomem = 0; + allocated_a3000mem = 0; + kickmemory = 0; + chipmemory = 0; + a3000memory = 0; + bogomemory = 0; + + kickmemory = mapped_malloc (kickmem_size, "kick"); + kickmem_bank.baseaddr = kickmemory; + + if (! load_kickstart ()) { + init_ersatz_rom (kickmemory); ersatzkickfile = 1; } - if (zkickfile) - map_banks(&kickmem_bank, 0x20, 8); - - map_banks(&kickmem_bank, 0xF8, 8); - if (!zkickfile) - map_banks(&expamem_bank, 0xE8, 1); + + init_mem_banks (); + memory_reset (); + + kickmem_mask = kickmem_size - 1; } -void map_banks(addrbank *bank, int start, int size) +void memory_cleanup( void ) +{ + if (a3000memory) + mapped_free (a3000memory); + if (bogomemory) + mapped_free (bogomemory); + if (kickmemory) + mapped_free (kickmemory); + if (chipmemory) + mapped_free (chipmemory); + + a3000memory = 0; + bogomemory = 0; + kickmemory = 0; + chipmemory = 0; +} + +void map_banks (addrbank *bank, int start, int size, int realsize) { int bnr; - int hioffs = 0; -#if 0 && CPU_LEVEL < 2 - for (hioffs = 0; hioffs < 256; hioffs++) + unsigned long int hioffs = 0, endhioffs = 0x100; + addrbank* orgbank = bank; + uae_u32 realstart = start; + + flush_icache(1); /* Sure don't want to keep any old mappings around! */ +#ifdef NATMEM_OFFSET + delete_shmmaps (start << 16, size << 16); +#endif + + if (!realsize) + realsize = size << 16; + + if ((size << 16) < realsize) { + write_log ("Please report to bmeyer@cs.monash.edu.au, and mention:\n"); + write_log ("Broken mapping, size=%x, realsize=%x\n",size,realsize); + write_log ("Start is %x\n",start); + write_log ("Reducing memory sizes, especially chipmem, may fix this problem\n"); + abort (); + } + + if (start >= 0x100) { + int real_left = 0; + for (bnr = start; bnr < start + size; bnr++) { + if (!real_left) { + realstart = bnr; + real_left = realsize>>16; +#ifdef NATMEM_OFFSET + add_shmmaps (realstart << 16, bank); +#endif + } + put_mem_bank (bnr << 16, bank, realstart<<16); + real_left--; + } + return; + } + if (currprefs.address_space_24) + endhioffs = 0x10000; + for (hioffs = 0; hioffs < endhioffs; hioffs += 0x100) { + int real_left = 0; + for (bnr = start; bnr < start+size; bnr++) { + if (!real_left) { + realstart = bnr + hioffs; + real_left = realsize >> 16; +#ifdef NATMEM_OFFSET + add_shmmaps (realstart << 16, bank); #endif - for (bnr = start; bnr < start+size; bnr++) - membanks[bnr + hioffs * 256] = *bank; + } + put_mem_bank((bnr + hioffs) << 16, bank,realstart<<16); + real_left--; + } + } +} + + +/* memory save/restore code */ + +uae_u8 *save_cram (int *len) +{ + *len = allocated_chipmem; + return chipmemory; +} + +uae_u8 *save_bram (int *len) +{ + *len = allocated_bogomem; + return bogomemory; +} + +void restore_cram (int len, long filepos) +{ + chip_filepos = filepos; + changed_prefs.chipmem_size = len; +} + +void restore_bram (int len, long filepos) +{ + bogo_filepos = filepos; + changed_prefs.bogomem_size = len; +} + +uae_u8 *restore_rom (uae_u8 *src) +{ + restore_u32 (); + restore_u32 (); + restore_u32 (); + restore_u32 (); + restore_u32 (); + + return src; +} + +uae_u8 *save_rom (int first, int *len) +{ + static int count; + uae_u8 *dst, *dstbak; + uae_u8 *mem_real_start; + int mem_start, mem_size, mem_type, i, saverom; + + saverom = 0; + if (first) count = 0; + for (;;) { + mem_type = count; + switch (count) + { + case 0: /* Kickstart ROM */ + mem_start = 0xf80000; + mem_real_start = kickmemory; + mem_size = kickmem_size; + /* 256KB or 512KB ROM? */ + for(i = 0; i < mem_size / 2 - 4; i++) { + if(longget (i + mem_start) != longget(i + mem_start + mem_size / 2)) break; + } + if(i == mem_size / 2 - 4) { + mem_size /= 2; + mem_start += 262144; + } + mem_type = 0; + break; + default: + return 0; + } + count++; + if (mem_size) break; + } + dstbak = dst = malloc (4 + 4 + 4 + 4 + 4 + mem_size); + save_u32 (mem_start); + save_u32 (mem_size); + save_u32 (mem_type); + save_u32 (longget (mem_start + 12)); /* version+revision */ + save_u32 (0); + sprintf (dst, "Kickstart %d.%d", wordget(mem_start + 12), wordget(mem_start + 14)); + dst += strlen (dst) + 1; + if (saverom) { + for(i = 0; i < mem_size; i++) *dst++ = byteget(mem_start + i); + } + *len = dst - dstbak; + return dstbak; }