--- uae/src/readcpu.c	2018/04/24 16:59:56	1.1.1.6
+++ uae/src/readcpu.c	2018/04/24 17:18:13	1.1.1.10
@@ -10,8 +10,6 @@
 #include "sysdeps.h"
 #include <ctype.h>
 
-#include "config.h"
-#include "options.h"
 #include "readcpu.h"
 
 int nr_cpuop_funcs;
@@ -139,13 +137,15 @@ struct mnemolookup lookuptab[] = {
     { i_CPUSHA, "CPUSHA" },
     { i_MOVE16, "MOVE16" },
 
+    { i_MMUOP30A, "MMUOP30A" },
+    { i_MMUOP30B, "MMUOP30B" },
     { i_MMUOP, "MMUOP" },
     { i_ILLG, "" },
 };
 
 struct instr *table68k;
 
-STATIC_INLINE amodes mode_from_str (const char *str)
+static amodes mode_from_str (const char *str)
 {
     if (strncmp (str, "Dreg", 4) == 0) return Dreg;
     if (strncmp (str, "Areg", 4) == 0) return Areg;
@@ -535,7 +535,7 @@ static void build_insn (int insn)
 	    case 'R': destreg = bitval[bitR]; dstgather = 1; dstpos = bitpos[bitR]; break;
 	    default: abort();
 	    }
-            if (dstpos < 0 || dstpos >= 32)
+	    if (dstpos < 0 || dstpos >= 32)
 		abort ();
 	    break;
 	case 'A':
@@ -546,7 +546,7 @@ static void build_insn (int insn)
 	    case 'x': destreg = 0; dstgather = 0; dstpos = 0; break;
 	    default: abort();
 	    }
-            if (dstpos < 0 || dstpos >= 32)
+	    if (dstpos < 0 || dstpos >= 32)
 		abort ();
 	    switch (opcstr[pos]) {
 	    case 'p': destmode = Apdi; pos++; break;
@@ -687,14 +687,17 @@ static void build_insn (int insn)
       endofline:
 	/* now, we have a match */
 	if (table68k[opc].mnemo != i_ILLG)
-	    fprintf(stderr, "Double match: %x: %s\n", opc, opcstr);
+	    write_log ("Double match: %x: %s\n", opc, opcstr);
 	if (find == -1) {
 	    for (find = 0;; find++) {
 		if (strcmp(mnemonic, lookuptab[find].name) == 0) {
 		    table68k[opc].mnemo = lookuptab[find].mnemo;
 		    break;
 		}
-		if (strlen(lookuptab[find].name) == 0) abort();
+		if (strlen(lookuptab[find].name) == 0) {
+		    write_log ("Can't find mnemonic \"%s\"\n", mnemonic);
+		    abort();
+		}
 	    }
 	}
 	else {