--- hatari/src/includes/stMemory.h	2019/04/01 07:11:30	1.1.1.3
+++ hatari/src/includes/stMemory.h	2019/04/01 07:12:14	1.1.1.4
@@ -28,8 +28,8 @@ 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;
+	do_put_mem_long(&STRam[Address], Var);
 }
 
 /*-----------------------------------------------------------------------*/
@@ -39,8 +39,8 @@ 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;
+	do_put_mem_word(&STRam[Address], Var);
 }
 
 /*-----------------------------------------------------------------------*/
@@ -49,8 +49,8 @@ static inline void STMemory_WriteWord(Ui
 */
 static inline void STMemory_WriteByte(Uint32 Address, Uint8 Var)
 {
-  Address &= 0xffffff;
-  *(Uint8 *)((Uint32)STRam+Address) = Var;
+	Address &= 0xffffff;
+	STRam[Address] = Var;
 }
 
 
@@ -61,8 +61,8 @@ 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;
+	return do_get_mem_long(&STRam[Address]);
 }
 
 /*-----------------------------------------------------------------------*/
@@ -72,8 +72,8 @@ 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;
+	return do_get_mem_word(&STRam[Address]);
 }
 
 /*-----------------------------------------------------------------------*/
@@ -82,8 +82,8 @@ static inline Uint16 STMemory_ReadWord(U
 */
 static inline Uint8 STMemory_ReadByte(Uint32 Address)
 {
-  Address &= 0xffffff;
-  return *(Uint8 *)((Uint32)STRam+Address);
+	Address &= 0xffffff;
+	return STRam[Address];
 }