--- uae/src/ersatz.c	2018/04/24 16:39:55	1.1.1.3
+++ uae/src/ersatz.c	2018/04/24 17:16:27	1.1.1.11
@@ -10,11 +10,10 @@
 #include "sysconfig.h"
 #include "sysdeps.h"
 
-#include "config.h"
 #include "options.h"
+#include "uae.h"
 #include "memory.h"
 #include "custom.h"
-#include "readcpu.h"
 #include "newcpu.h"
 #include "cia.h"
 #include "disk.h"
@@ -28,10 +27,13 @@
 #define EOP_AVAILMEM 5
 #define EOP_ALLOCMEM 6
 #define EOP_ALLOCABS 7
+#define EOP_LOOP 8
+
+static int already_failed = 0;
 
 void init_ersatz_rom (uae_u8 *data)
 {
-    fprintf(stderr, "Trying to use Kickstart replacement.\n");
+    write_log ("Trying to use Kickstart replacement.\n");
     *data++ = 0x00; *data++ = 0x08; /* initial SP */
     *data++ = 0x00; *data++ = 0x00;
     *data++ = 0x00; *data++ = 0xF8; /* initial PC */
@@ -43,25 +45,40 @@ void init_ersatz_rom (uae_u8 *data)
     *data++ = 0x00; *data++ = EOP_NIMP;
 
     *data++ = 0xFF; *data++ = 0x0D;
+    *data++ = 0x00; *data++ = EOP_LOOP;
+    *data++ = 0xFF; *data++ = 0x0D;
     *data++ = 0x00; *data++ = EOP_DOIO;
+
     *data++ = 0x4E; *data++ = 0x75;
     *data++ = 0xFF; *data++ = 0x0D;
-
     *data++ = 0x00; *data++ = EOP_SERVEINT;
     *data++ = 0x4E; *data++ = 0x73;
+
     *data++ = 0xFF; *data++ = 0x0D;
     *data++ = 0x00; *data++ = EOP_AVAILMEM;
-
     *data++ = 0x4E; *data++ = 0x75;
     *data++ = 0xFF; *data++ = 0x0D;
+
     *data++ = 0x00; *data++ = EOP_ALLOCMEM;
     *data++ = 0x4E; *data++ = 0x75;
-
     *data++ = 0xFF; *data++ = 0x0D;
     *data++ = 0x00; *data++ = EOP_ALLOCABS;
+
     *data++ = 0x4E; *data++ = 0x75;
 }
 
+static void ersatz_failed (void)
+{
+    if (already_failed)
+	return;
+    already_failed = 1;
+#if 0
+    notify_user (NUMSG_KICKREPNO);
+    uae_restart (-1, NULL);
+#endif
+    uae_quit ();
+}
+
 static void ersatz_doio (void)
 {
     uaecptr request = m68k_areg(regs, 1);
@@ -71,8 +88,8 @@ static void ersatz_doio (void)
 	break;
 
      default:
-	fprintf(stderr, "Only CMD_READ supported in DoIO()\n");
-	abort();
+	write_log ("Only CMD_READ supported in DoIO()\n");
+	ersatz_failed ();
     }
     {
 	uaecptr dest = get_long (request + 0x28);
@@ -95,10 +112,17 @@ static void ersatz_init (void)
     uaecptr request;
     uaecptr a;
 
+    if (disk_empty (0)) {
+	write_log ("You need to have a diskfile in DF0 to use the Kickstart replacement!\n");
+	uae_quit ();
+	m68k_setpc (0xF80010);
+	return;
+    }
+
     regs.s = 0;
     /* Set some interrupt vectors */
     for (a = 8; a < 0xC0; a += 4) {
-	put_long (a, 0xF80016);
+	put_long (a, 0xF8001A);
     }
     regs.isp = regs.msp = regs.usp = 0x800;
     m68k_areg(regs, 7) = 0x80000;
@@ -112,11 +136,11 @@ static void ersatz_init (void)
 	put_long (0x676 - 6*f + 2, 0xF8000C);
     }
     /* Some "supported" functions */
-    put_long (0x676 - 456 + 2, 0xF80010);
-    put_long (0x676 - 216 + 2, 0xF8001C);
-    put_long (0x676 - 198 + 2, 0xF80022);
-    put_long (0x676 - 204 + 2, 0xF80028);
-    put_long (0x676 - 210 + 2, 0xF80026);
+    put_long (0x676 - 456 + 2, 0xF80014);
+    put_long (0x676 - 216 + 2, 0xF80020);
+    put_long (0x676 - 198 + 2, 0xF80026);
+    put_long (0x676 - 204 + 2, 0xF8002c);
+    put_long (0x676 - 210 + 2, 0xF8002a);
 
     /* Build an IORequest */
     request = 0x800;
@@ -126,8 +150,41 @@ static void ersatz_init (void)
     put_long (request + 0x24, 0x200 * 4);
     m68k_areg(regs, 1) = request;
     ersatz_doio ();
+    /* kickstart disk loader */
+    if (get_long(0x4000) == 0x4b49434b) {
+	/* a kickstart disk was found in drive 0! */
+	write_log ("Loading Kickstart rom image from Kickstart disk\n");
+	/* print some notes... */
+	write_log ("NOTE: if UAE crashes set CPU to 68000 and/or chipmem size to 512KB!\n");
+
+	/* read rom image from kickstart disk */
+	put_word (request + 0x1C, 2);
+	put_long (request + 0x28, 0xF80000);
+	put_long (request + 0x2C, 0x200);
+	put_long (request + 0x24, 0x200 * 512);
+	m68k_areg(regs, 1) = request;
+	ersatz_doio ();
+
+	/* read rom image once again to mirror address space.
+	   not elegant, but it works... */
+	put_word (request + 0x1C, 2);
+	put_long (request + 0x28, 0xFC0000);
+	put_long (request + 0x2C, 0x200);
+	put_long (request + 0x24, 0x200 * 512);
+	m68k_areg(regs, 1) = request;
+	ersatz_doio ();
+
+	disk_eject (0);
+
+	m68k_setpc (0xFC0002);
+	fill_prefetch_slow ();
+	uae_reset (0);
+	ersatzkickfile = 0;
+	return;
+    }
+
     m68k_setpc (0x400C);
-    fill_prefetch_0 ();
+    fill_prefetch_slow ();
 
     /* Init the hardware */
     put_long (0x3000, 0xFFFFFFFEul);
@@ -180,11 +237,19 @@ void ersatz_perform (uae_u16 what)
 	break;
 
      case EOP_NIMP:
-	fprintf(stderr, "Unimplemented Kickstart function called\n");
-	abort ();
+	write_log ("Unimplemented Kickstart function called\n");
+	ersatz_failed ();
+	break;
+
+	/* fall through */
+     case EOP_LOOP:
+	m68k_setpc (0xF80010);
+	break;
+
      case EOP_OPENLIB:
      default:
-	fprintf(stderr, "Internal error. Giving up.\n");
-	abort ();
+	write_log ("Internal error. Giving up.\n");
+	ersatz_failed ();
+	break;
     }
 }