--- hatari/src/uae-cpu/memory.c 2019/04/01 07:12:46 1.1.1.8 +++ hatari/src/uae-cpu/memory.c 2019/04/01 07:13:13 1.1.1.9 @@ -10,7 +10,7 @@ * This file is distributed under the GNU Public License, version 2 or at * your option any later version. Read the file gpl.txt for details. */ -char Memory_rcsid[] = "Hatari $Id: memory.c,v 1.1.1.8 2019/04/01 07:12:46 root Exp $"; +const char Memory_rcsid[] = "Hatari $Id: memory.c,v 1.1.1.9 2019/04/01 07:13:13 root Exp $"; #include "sysdeps.h" #include "hatari-glue.h" @@ -214,7 +214,8 @@ static uae_u8 *BusErrMem_xlate (uaecptr /* **** ST RAM memory **** */ -static uae_u8 *STmemory; +/*static uae_u8 *STmemory;*/ +#define STmemory STRam static uae_u32 STmem_lget(uaecptr addr) { @@ -638,9 +639,12 @@ void memory_init(uae_u32 nNewSTMemSize, /*write_log("memory_init: STmem_size=$%x, TTmem_size=$%x, ROM-Start=$%x,\n", STmem_size, TTmem_size, nNewRomMemStart);*/ +/* // STmemory is currently directly defined to STRam for speed reasons! STmemory = STRam; +*/ ROMmemory = STRam + ROMmem_start; IOmemory = STRam + IOmem_start; + /* while (! STmemory && STmem_size > 512*1024) { STmem_size >>= 1;