--- hatari/src/uae-cpu/memory.c	2019/04/01 07:10:06	1.1.1.2
+++ hatari/src/uae-cpu/memory.c	2019/04/01 07:10:42	1.1.1.4
@@ -1,30 +1,30 @@
  /*
-  * UAE - The Un*x Amiga Emulator
+  * UAE - The Un*x Amiga Emulator - CPU core
   *
   * Memory management
   *
   * (c) 1995 Bernd Schmidt
   *
   * Adaptation to Hatari by Thomas Huth
+  *
+  * 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.
   */
+static char rcsid[] = "Hatari $Id: memory.c,v 1.1.1.4 2019/04/01 07:10:42 root Exp $";
 
-/*#include "sysconfig.h"*/
 #include "sysdeps.h"
 #include "hatari-glue.h"
 #include "maccess.h"
 #include "memory.h"
+#include "../includes/main.h"
 #include "../includes/tos.h"
-/*
-#include "config.h"
-#include "options.h"
-#include "uae.h"
-*/
+#include "../includes/intercept.h"
+#include "../includes/reset.h"
+
 #ifdef USE_MAPPED_MEMORY
 #include <sys/mman.h>
 #endif
 
-#include "../includes/intercept.h"
-
 
 extern   unsigned char STRam[16*1024*1024];  /* See hatari.c */
 
@@ -86,7 +86,7 @@ uae_u32 REGPARAM2 dummy_lget (uaecptr ad
 {
     special_mem |= S_READ;
     if (illegal_mem)
-	write_log ("Illegal lget at %08lx\n", addr);
+	write_log ("Illegal lget at %08lx\n", (long)addr);
 
     return 0;
 }
@@ -95,7 +95,7 @@ uae_u32 REGPARAM2 dummy_wget (uaecptr ad
 {
     special_mem |= S_READ;
     if (illegal_mem)
-	write_log ("Illegal wget at %08lx\n", addr);
+	write_log ("Illegal wget at %08lx\n", (long)addr);
 
     return 0;
 }
@@ -104,7 +104,7 @@ uae_u32 REGPARAM2 dummy_bget (uaecptr ad
 {
     special_mem |= S_READ;
     if (illegal_mem)
-	write_log ("Illegal bget at %08lx\n", addr);
+	write_log ("Illegal bget at %08lx\n", (long)addr);
 
     return 0;
 }
@@ -113,25 +113,25 @@ void REGPARAM2 dummy_lput (uaecptr addr,
 {
     special_mem |= S_WRITE;
     if (illegal_mem)
-	write_log ("Illegal lput at %08lx\n", addr);
+	write_log ("Illegal lput at %08lx\n", (long)addr);
 }
 void REGPARAM2 dummy_wput (uaecptr addr, uae_u32 w)
 {
     special_mem |= S_WRITE;
     if (illegal_mem)
-	write_log ("Illegal wput at %08lx\n", addr);
+	write_log ("Illegal wput at %08lx\n", (long)addr);
 }
 void REGPARAM2 dummy_bput (uaecptr addr, uae_u32 b)
 {
     special_mem |= S_WRITE;
     if (illegal_mem)
-	write_log ("Illegal bput at %08lx\n", addr);
+	write_log ("Illegal bput at %08lx\n", (long)addr);
 }
 
 int REGPARAM2 dummy_check (uaecptr addr, uae_u32 size)
 {
     if (illegal_mem)
-	write_log ("Illegal check at %08lx\n", addr);
+	write_log ("Illegal check at %08lx\n", (long)addr);
 
     return 0;
 }
@@ -331,19 +331,19 @@ uae_u32 REGPARAM2 ROMmem_bget (uaecptr a
 void REGPARAM2 ROMmem_lput (uaecptr addr, uae_u32 b)
 {
     if (illegal_mem)
-	write_log ("Illegal ROMmem lput at %08lx\n", addr);
+	write_log ("Illegal ROMmem lput at %08lx\n", (long)addr);
 }
 
 void REGPARAM2 ROMmem_wput (uaecptr addr, uae_u32 b)
 {
     if (illegal_mem)
-	write_log ("Illegal ROMmem wput at %08lx\n", addr);
+	write_log ("Illegal ROMmem wput at %08lx\n", (long)addr);
 }
 
 void REGPARAM2 ROMmem_bput (uaecptr addr, uae_u32 b)
 {
     if (illegal_mem)
-	write_log ("Illegal ROMmem lput at %08lx\n", addr);
+	write_log ("Illegal ROMmem lput at %08lx\n", (long)addr);
 }
 
 int REGPARAM2 ROMmem_check (uaecptr addr, uae_u32 size)
@@ -446,9 +446,11 @@ static void init_mem_banks (void)
 #define MAKE_USER_PROGRAMS_BEHAVE 1
 void memory_init (void)
 {
+/*
     char buffer[4096];
     char *nam;
     int i, fd;
+*/
 
     allocated_STmem = STmem_size;
     allocated_TTmem = TTmem_size;