--- hatari/src/includes/stMemory.h	2019/04/01 07:11:30	1.1.1.3
+++ hatari/src/includes/stMemory.h	2019/04/01 07:13:41	1.1.1.7
@@ -8,14 +8,21 @@
 #ifndef HATARI_STMEMORY_H
 #define HATARI_STMEMORY_H
 
+#include "config.h"
 #include "sysdeps.h"
 #include "maccess.h"
 #include "main.h"
 
-
+#if ENABLE_SMALL_MEM
+extern Uint8 *STRam;
+extern uae_u8 *ROMmemory;
+# define RomMem (ROMmemory-0xe00000)
+#else
 extern Uint8 STRam[16*1024*1024];
-extern Uint32 STRamEnd;
+#define RomMem STRam
+#endif  /* ENABLE_SMALL_MEM */
 
+extern Uint32 STRamEnd;
 
 /* Offset ST address to PC pointer: */
 #define STRAM_ADDR(Var)  ((unsigned long)STRam+((Uint32)(Var) & 0x00ffffff))
@@ -28,8 +35,15 @@ extern Uint32 STRamEnd;
 */
 static inline void STMemory_WriteLong(Uint32 Address, Uint32 Var)
 {
-  Address &= 0xffffff;
-  do_put_mem_long((uae_u32 *)((Uint32)STRam+Address), Var);
+	Address &= 0xffffff;
+#if ENABLE_SMALL_MEM
+	if (Address >= 0xe00000)
+		do_put_mem_long(&ROMmemory[Address-0xe00000], Var);
+	else
+		do_put_mem_long(&STRam[Address], Var);
+#else
+	do_put_mem_long(&STRam[Address], Var);
+#endif
 }
 
 /*-----------------------------------------------------------------------*/
@@ -39,8 +53,15 @@ static inline void STMemory_WriteLong(Ui
 */
 static inline void STMemory_WriteWord(Uint32 Address, Uint16 Var)
 {
-  Address &= 0xffffff;
-  do_put_mem_word((uae_u16 *)((Uint32)STRam+Address), Var);
+	Address &= 0xffffff;
+#if ENABLE_SMALL_MEM
+	if (Address >= 0xe00000)
+		do_put_mem_word(&ROMmemory[Address-0xe00000], Var);
+	else
+		do_put_mem_word(&STRam[Address], Var);
+#else
+	do_put_mem_word(&STRam[Address], Var);
+#endif
 }
 
 /*-----------------------------------------------------------------------*/
@@ -49,8 +70,15 @@ static inline void STMemory_WriteWord(Ui
 */
 static inline void STMemory_WriteByte(Uint32 Address, Uint8 Var)
 {
-  Address &= 0xffffff;
-  *(Uint8 *)((Uint32)STRam+Address) = Var;
+	Address &= 0xffffff;
+#if ENABLE_SMALL_MEM
+	if (Address >= 0xe00000)
+		ROMmemory[Address-0xe00000] = Var;
+	else
+		STRam[Address] = Var;
+#else
+	STRam[Address] = Var;
+#endif
 }
 
 
@@ -61,8 +89,15 @@ static inline void STMemory_WriteByte(Ui
 */
 static inline Uint32 STMemory_ReadLong(Uint32 Address)
 {
-  Address &= 0xffffff;
-  return do_get_mem_long((uae_u32 *)((Uint32)STRam+Address));
+	Address &= 0xffffff;
+#if ENABLE_SMALL_MEM
+	if (Address >= 0xe00000)
+		return do_get_mem_long(&ROMmemory[Address-0xe00000]);
+	else
+		return do_get_mem_long(&STRam[Address]);
+#else
+	return do_get_mem_long(&STRam[Address]);
+#endif
 }
 
 /*-----------------------------------------------------------------------*/
@@ -72,8 +107,15 @@ static inline Uint32 STMemory_ReadLong(U
 */
 static inline Uint16 STMemory_ReadWord(Uint32 Address)
 {
-  Address &= 0xffffff;
-  return do_get_mem_word((uae_u16 *)((Uint32)STRam+Address));
+	Address &= 0xffffff;
+#if ENABLE_SMALL_MEM
+	if (Address >= 0xe00000)
+		return do_get_mem_word(&ROMmemory[Address-0xe00000]);
+	else
+		return do_get_mem_word(&STRam[Address]);
+#else
+	return do_get_mem_word(&STRam[Address]);
+#endif
 }
 
 /*-----------------------------------------------------------------------*/
@@ -82,11 +124,19 @@ static inline Uint16 STMemory_ReadWord(U
 */
 static inline Uint8 STMemory_ReadByte(Uint32 Address)
 {
-  Address &= 0xffffff;
-  return *(Uint8 *)((Uint32)STRam+Address);
+	Address &= 0xffffff;
+#if ENABLE_SMALL_MEM
+	if (Address >= 0xe00000)
+		return ROMmemory[Address-0xe00000];
+	else
+		return STRam[Address];
+#else
+	return STRam[Address];
+#endif
 }
 
 
-extern void STMemory_Clear(unsigned long StartAddress, unsigned long EndAddress);
+extern void STMemory_Clear(Uint32 StartAddress, Uint32 EndAddress);
+extern void STMemory_SetDefaultConfig(void);
 
 #endif