--- hatari/src/includes/stMemory.h	2019/04/01 07:11:30	1.1.1.3
+++ hatari/src/includes/stMemory.h	2019/04/09 08:48:40	1.1.1.10
@@ -8,85 +8,163 @@
 #ifndef HATARI_STMEMORY_H
 #define HATARI_STMEMORY_H
 
+#include "main.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];
+#define RomMem STRam
+#endif  /* ENABLE_SMALL_MEM */
+
 extern Uint32 STRamEnd;
 
+/* TODO: when Hatari will support TT/fast-RAM, take it into account
+ * in STRAM_ADDR() and STMemory_ValidArea().
+ */
 
 /* Offset ST address to PC pointer: */
-#define STRAM_ADDR(Var)  ((unsigned long)STRam+((Uint32)(Var) & 0x00ffffff))
+#if ENABLE_SMALL_MEM
+# define STRAM_ADDR(Var) \
+	(((Var)>= 0xe00000) \
+		 ? ((unsigned long)RomMem+((Uint32)(Var) & 0x00ffffff)) \
+		 : ((unsigned long)STRam+((Uint32)(Var) & 0x00ffffff)))
+#else
+# define STRAM_ADDR(Var)  ((unsigned long)STRam+((Uint32)(Var) & 0x00ffffff))
+#endif
 
 
-/*-----------------------------------------------------------------------*/
-/*
-  Write 32-bit word into ST memory space.
-  NOTE - value will be convert to 68000 endian
-*/
+/**
+ * Check whether given memory address and size are within
+ * valid ST memory area (i.e. read/write from/to there doesn't
+ * overwrite Hatari's own memory & cause potential segfaults)
+ * and that the size is positive.
+ * 
+ * If they are; return true, otherwise false.
+ */
+static inline bool STMemory_ValidArea(Uint32 addr, int size)
+{
+	if (size >= 0 && addr+size < 0xff0000 &&
+	    (addr+size < STRamEnd || addr >= 0xe00000))
+	{
+		return true;
+	}
+	return false;
+}
+
+
+/**
+ * Write 32-bit word into ST memory space.
+ * NOTE - value will be convert to 68000 endian
+ */
 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
 }
 
-/*-----------------------------------------------------------------------*/
-/*
-  Write 16-bit word into ST memory space.
-  NOTE - value will be convert to 68000 endian.
-*/
+
+/**
+ * Write 16-bit word into ST memory space.
+ * NOTE - value will be convert to 68000 endian.
+ */
 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
 }
 
-/*-----------------------------------------------------------------------*/
-/*
-  Write 8-bit byte into ST memory space.
-*/
+
+/**
+ * Write 8-bit byte into ST memory space.
+ */
 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
 }
 
 
-/*-----------------------------------------------------------------------*/
-/*
-  Read 32-bit word from ST memory space.
-  NOTE - value will be converted to PC endian.
-*/
+/**
+ * Read 32-bit word from ST memory space.
+ * NOTE - value will be converted to PC endian.
+ */
 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
 }
 
-/*-----------------------------------------------------------------------*/
-/*
-  Read 16-bit word from ST memory space.
-  NOTE - value will be converted to PC endian.
-*/
+
+/**
+ * Read 16-bit word from ST memory space.
+ * NOTE - value will be converted to PC endian.
+ */
 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
 }
 
-/*-----------------------------------------------------------------------*/
-/*
-  Read 8-bit byte from ST memory space
-*/
+
+/**
+ * Read 8-bit byte from ST memory space
+ */
 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_MemorySnapShot_Capture(bool bSave);
+extern void STMemory_SetDefaultConfig(void);
 
 #endif