--- uae/src/memory.c 2018/04/24 16:38:39 1.1.1.1 +++ uae/src/memory.c 2018/04/24 16:40:05 1.1.1.3 @@ -11,435 +11,580 @@ #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 "events.h" -#include "newcpu.h" -#include "compiler.h" -#ifdef USE_COMPILER +#ifdef USE_MAPPED_MEMORY #include #endif int ersatzkickfile = 0; -int buserr; -addrbank membanks[65536]; - -/* Default memory access functions */ +#ifdef SAVE_MEMORY_BANKS +addrbank *mem_banks[65536]; +#else +addrbank mem_banks[65536]; +#endif -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 -/* A dummy bank that only contains zeros */ +uae_u32 chipmem_mask, kickmem_mask, bogomem_mask, a3000mem_mask; -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; +/* A dummy bank that only contains zeros */ -ULONG dummy_lget(CPTR addr) -{ - if (illegal_mem) printf("Illegal lget at %08lx pc=%08lx\n",addr,m68k_getpc()); +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) +{ + if (currprefs.illegal_mem) { + sprintf (warning_buffer, "Illegal lget at %08lx\n", addr); + write_log (warning_buffer); + } return 0; } -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()); + if (currprefs.illegal_mem) { + sprintf (warning_buffer, "Illegal wget at %08lx\n", addr); + write_log (warning_buffer); + } return 0; } -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()); + if (currprefs.illegal_mem) { + sprintf (warning_buffer, "Illegal bget at %08lx\n", addr); + write_log (warning_buffer); + } return 0; } -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()); + if (currprefs.illegal_mem) { + sprintf (warning_buffer, "Illegal lput at %08lx\n", addr); + write_log (warning_buffer); + } } -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()); + if (currprefs.illegal_mem) { + sprintf (warning_buffer, "Illegal wput at %08lx\n", addr); + write_log (warning_buffer); + } } -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()); + if (currprefs.illegal_mem) { + sprintf (warning_buffer, "Illegal bput at %08lx\n", addr); + write_log (warning_buffer); + } } -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()); + if (currprefs.illegal_mem) { + sprintf (warning_buffer, "Illegal check at %08lx\n", addr); + write_log (warning_buffer); + } return 0; } -/* Chip memory */ - -ULONG chipmem_mask,kickmem_mask,bogomem_mask; - -UBYTE *chipmemory; - -static ULONG chipmem_alget(CPTR) REGPARAM; -static UWORD chipmem_awget(CPTR) REGPARAM; +/* 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) +{ + if (currprefs.illegal_mem) { + sprintf (warning_buffer, "Illegal lget at %08lx\n", addr); + write_log (warning_buffer); + } + 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_wget(uaecptr addr) +{ + if (currprefs.illegal_mem) { + sprintf (warning_buffer, "Illegal wget at %08lx\n", addr); + write_log (warning_buffer); + } + return 0; +} -static int chipmem_check(CPTR addr, ULONG size) REGPARAM; -static UBYTE *chipmem_xlate(CPTR addr) REGPARAM; +uae_u32 REGPARAM2 mbres_bget(uaecptr addr) +{ + if (currprefs.illegal_mem) { + sprintf (warning_buffer, "Illegal bget at %08lx\n", addr); + write_log (warning_buffer); + } + 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])); + if (currprefs.illegal_mem) { + sprintf (warning_buffer, "Illegal lput at %08lx\n", addr); + write_log (warning_buffer); + } +} +void REGPARAM2 mbres_wput(uaecptr addr, uae_u32 w) +{ + if (currprefs.illegal_mem) { + sprintf (warning_buffer, "Illegal wput at %08lx\n", addr); + write_log (warning_buffer); + } +} +void REGPARAM2 mbres_bput(uaecptr addr, uae_u32 b) +{ + if (currprefs.illegal_mem) { + sprintf (warning_buffer, "Illegal bput at %08lx\n", addr); + write_log (warning_buffer); + } + 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) { + sprintf (warning_buffer, "Illegal check at %08lx\n", addr); + write_log (warning_buffer); + } + return 0; } -ULONG chipmem_lget(CPTR addr) +/* Chip memory */ + +uae_u8 *chipmemory; + +static uae_u32 chipmem_lget(uaecptr) REGPARAM; +static uae_u32 chipmem_wget(uaecptr) REGPARAM; +static uae_u32 chipmem_bget(uaecptr) REGPARAM; +static void chipmem_lput(uaecptr, uae_u32) REGPARAM; +static void chipmem_wput(uaecptr, uae_u32) REGPARAM; +static void chipmem_bput(uaecptr, uae_u32) REGPARAM; + +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; + addr &= chipmem_mask; return (addr + size) < chipmem_size; } -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) < bogomem_size; } -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; } -int bogomem_check(CPTR addr, ULONG size) +/* 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) { - addr -= bogomem_start & (bogomem_size-1); - addr &= bogomem_size-1; - return (addr + size) < bogomem_size; + uae_u32 *m; + addr -= a3000mem_start & a3000mem_mask; + addr &= a3000mem_mask; + m = (uae_u32 *)(a3000memory + addr); + return do_get_mem_long(m); } -UBYTE *bogomem_xlate(CPTR addr) +uae_u32 REGPARAM2 a3000mem_wget(uaecptr addr) { - addr -= bogomem_start & (bogomem_size-1); - addr &= bogomem_size-1; - return bogomemory + addr; + uae_u16 *m; + addr -= a3000mem_start & a3000mem_mask; + addr &= a3000mem_mask; + m = (uae_u16 *)(a3000memory + addr); + return do_get_mem_word(m); } -/* Kick memory */ +uae_u32 REGPARAM2 a3000mem_bget(uaecptr addr) +{ + addr -= a3000mem_start & a3000mem_mask; + addr &= a3000mem_mask; + return a3000memory[addr]; +} -static int zkickfile = 0; -UBYTE *kickmemory; +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 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_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); +} -ULONG kickmem_alget(CPTR addr) +void REGPARAM2 a3000mem_bput(uaecptr addr, uae_u32 b) { - 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; + a3000memory[addr] = b; } -UWORD kickmem_awget(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 ((UWORD)m[0] << 8) + m[1]; + addr -= a3000mem_start & a3000mem_mask; + addr &= a3000mem_mask; + return (addr + size) < a3000mem_size; } -ULONG kickmem_lget(CPTR addr) +uae_u8 REGPARAM2 *a3000mem_xlate(uaecptr addr) { - UBYTE *m; + addr -= a3000mem_start & a3000mem_mask; + addr &= a3000mem_mask; + return a3000memory + 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) +{ + 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) sprintf (warning_buffer, "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) sprintf (warning_buffer, "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) sprintf (warning_buffer, "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; + 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; } +/* 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]; - + uae_u32 cksum = 0, prevck = 0; + unsigned char buffer[20]; + FILE *f = zfile_open(romfile, "rb"); - - if (f == NULL) { - fprintf(stderr, "No Kickstart ROM found.\n"); + + 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)) { + fprintf (stderr, "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 (keyfile) == 0) { + write_log ("No filename given for ROM key file.\n"); + return 0; + } + keyf = zfile_open (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,28 +592,36 @@ 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 }; +addrbank mbres_bank = { + mbres_lget, mbres_wget, mbres_bget, + mbres_lput, mbres_wput, mbres_bput, + default_xlate, mbres_check +}; + addrbank chipmem_bank = { - chipmem_alget, chipmem_awget, chipmem_lget, chipmem_wget, chipmem_bget, chipmem_lput, chipmem_wput, chipmem_bput, chipmem_xlate, chipmem_check }; addrbank bogomem_bank = { - bogomem_alget, bogomem_awget, bogomem_lget, bogomem_wget, bogomem_bget, bogomem_lput, bogomem_wput, bogomem_bput, bogomem_xlate, bogomem_check }; +addrbank a3000mem_bank = { + a3000mem_lget, a3000mem_wget, a3000mem_bget, + a3000mem_lput, a3000mem_wput, a3000mem_bput, + a3000mem_xlate, a3000mem_check +}; + addrbank kickmem_bank = { - kickmem_alget, kickmem_awget, kickmem_lget, kickmem_wget, kickmem_bget, kickmem_lput, kickmem_wput, kickmem_bput, kickmem_xlate, kickmem_check @@ -476,31 +629,45 @@ addrbank kickmem_bank = { char *address_space, *good_address_map; int good_address_fd; - +#define MAKE_USER_PROGRAMS_BEHAVE 1 void memory_init(void) { char buffer[4096]; char *nam; int i, fd; - buserr = 0; + int custom_start; chipmem_mask = chipmem_size - 1; kickmem_mask = kickmem_size - 1; bogomem_mask = bogomem_size - 1; - -#ifdef USE_COMPILER + a3000mem_mask = a3000mem_size - 1; + +#ifdef USE_MAPPED_MEMORY 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); + /* Don't believe USER_PROGRAMS_BEHAVE. Otherwise, we'd segfault as soon + * as a decrunch routine tries to do color register hacks. */ + address_space = mmap(NULL, 1 << 24, PROT_READ | (USER_PROGRAMS_BEHAVE || MAKE_USER_PROGRAMS_BEHAVE? PROT_WRITE : 0), MAP_PRIVATE, fd, 0); + if ((int)address_space < 0 || (int)good_address_map < 0) { + write_log ("Your system does not have enough virtual memory - increase swap.\n"); + abort(); + } +#ifdef MAKE_USER_PROGRAMS_BEHAVE + memset(address_space + 0xDFF180, 0xFF, 32*2); +#else + /* Likewise. This is mostly for mouse button checks. */ + if (USER_PROGRAMS_BEHAVE) + memset(address_space + 0xA00000, 0xFF, 0xF00000 - 0xA00000); +#endif 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); + 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, @@ -509,44 +676,77 @@ void memory_init(void) mmap(good_address_map + i + 0x1000000 - kickmem_size, 4096, PROT_READ, MAP_FIXED | MAP_PRIVATE, good_address_fd, 0); #else - chipmemory = (UBYTE *)malloc(chipmem_size); - kickmemory = (UBYTE *)malloc(kickmem_size); + kickmemory = (uae_u8 *)xmalloc(kickmem_size); + chipmemory = (uae_u8 *)malloc(chipmem_size); + + while (!chipmemory && chipmem_size > 512*1024) { + chipmem_size >>= 1; + chipmem_mask = chipmem_size - 1; + chipmemory = (uae_u8 *)malloc(chipmem_size); + if (chipmemory) + fprintf (stderr, "Reducing chipmem size to %dkb\n", chipmem_size>>10); + } + if (!chipmemory) { + write_log ("virtual memory exhausted (chipmemory)!\n"); + abort(); + } #endif for(i = 0; i < 65536; i++) - membanks[i] = dummy_bank; - + put_mem_bank (i<<16, &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); - } + map_banks (&chipmem_bank, 0x00, 256); + custom_start = 0xC0; - map_banks(&rtarea_bank, 0xF0, 1); - if (!load_kickstart()) { - init_ersatz_rom(kickmemory); + map_banks (&custom_bank, custom_start, 0xE0-custom_start); + map_banks (&cia_bank, 0xA0, 32); + map_banks (&clock_bank, 0xDC, 1); + + /* @@@ Does anyone have a clue what should be in the 0x200000 - 0xA00000 + * range on an Amiga without expansion memory? */ + custom_start = chipmem_size >> 16; + if (custom_start < 0x20) + custom_start = 0x20; + map_banks (&dummy_bank, custom_start, 0xA0 - custom_start); + /*map_banks (&mbres_bank, 0xDE, 1);*/ + + if (bogomem_size > 0) + bogomemory = (uae_u8 *)xmalloc (bogomem_size); + if (bogomem_size > 0) + map_banks(&bogomem_bank, 0xC0, bogomem_size >> 16); + + if (a3000mem_size > 0) + a3000memory = (uae_u8 *)xmalloc (a3000mem_size); + if (a3000mem_size > 0) + map_banks(&a3000mem_bank, a3000mem_start >> 16, a3000mem_size >> 16); + + map_banks (&rtarea_bank, 0xF0, 1); + 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); + map_banks (&kickmem_bank, 0xF8, 8); + map_banks (&expamem_bank, 0xE8, 1); + + if (cloanto_rom) + map_banks (&kickmem_bank, 0xE0, 8); } void map_banks(addrbank *bank, int start, int size) { int bnr; - int hioffs = 0; -#if 0 && CPU_LEVEL < 2 - for (hioffs = 0; hioffs < 256; hioffs++) -#endif - for (bnr = start; bnr < start+size; bnr++) - membanks[bnr + hioffs * 256] = *bank; + unsigned long int hioffs = 0, endhioffs = 0x100; + + if (start >= 0x100) { + for (bnr = start; bnr < start + size; bnr++) + put_mem_bank (bnr << 16, bank); + return; + } + /* Some '020 Kickstarts apparently require a 24 bit address space... */ + if (currprefs.address_space_24) + endhioffs = 0x10000; + for (hioffs = 0; hioffs < endhioffs; hioffs += 0x100) + for (bnr = start; bnr < start+size; bnr++) + put_mem_bank((bnr + hioffs) << 16, bank); }