--- hatari/src/includes/stMemory.h	2019/04/01 07:09:16	1.1.1.1
+++ hatari/src/includes/stMemory.h	2019/04/09 08:53:11	1.1.1.12
@@ -1,17 +1,170 @@
 /*
-  Hatari
+  Hatari - stMemory.h
+
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 
-extern void STMemory_Clear(unsigned long StartAddress, unsigned long EndAddress);
-extern unsigned short int STMemory_Swap68000Int(unsigned short int var);
-extern unsigned long STMemory_Swap68000Long(unsigned long var);
-extern void STMemory_WriteLong(unsigned long Address,unsigned long Var);
-extern void STMemory_WriteWord(unsigned long Address,unsigned short int Var);
-extern void STMemory_WriteByte(unsigned long Address,unsigned char Var);
-extern unsigned long STMemory_ReadLong(unsigned long Address);
-extern unsigned short int STMemory_ReadWord(unsigned long Address);
-extern unsigned char STMemory_ReadByte(unsigned long Address);
-extern void STMemory_WriteLong_PCSpace(void *pAddress,unsigned long Var);
-extern void STMemory_WriteWord_PCSpace(void *pAddress,unsigned short int Var);
-extern unsigned long STMemory_ReadLong_PCSpace(void *pAddress);
-extern unsigned short int STMemory_ReadWord_PCSpace(void *pAddress);
+#ifndef HATARI_STMEMORY_H
+#define HATARI_STMEMORY_H
+
+#include "main.h"
+#include "sysdeps.h"
+#include "maccess.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: */
+#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
+
+
+/**
+ * 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;
+#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.
+ */
+static inline void STMemory_WriteWord(Uint32 Address, Uint16 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.
+ */
+static inline void STMemory_WriteByte(Uint32 Address, Uint8 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.
+ */
+static inline Uint32 STMemory_ReadLong(Uint32 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.
+ */
+static inline Uint16 STMemory_ReadWord(Uint32 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
+ */
+static inline Uint8 STMemory_ReadByte(Uint32 Address)
+{
+	Address &= 0xffffff;
+#if ENABLE_SMALL_MEM
+	if (Address >= 0xe00000)
+		return ROMmemory[Address-0xe00000];
+	else
+		return STRam[Address];
+#else
+	return STRam[Address];
+#endif
+}
+
+
+extern bool STMemory_SafeCopy(Uint32 addr, Uint8 *src, unsigned int len, const char *name);
+extern void STMemory_MemorySnapShot_Capture(bool bSave);
+extern void STMemory_SetDefaultConfig(void);
+
+#endif