--- uae/src/build68k.c	2018/04/24 16:40:03	1.1.1.3
+++ uae/src/build68k.c	2018/04/24 17:18:29	1.1.1.7
@@ -12,8 +12,6 @@
 #include <assert.h>
 #include <ctype.h>
 
-#include "config.h"
-#include "options.h"
 #include "readcpu.h"
 
 static FILE *tablef;
@@ -60,8 +58,6 @@ int main(int argc, char **argv)
 
     printf ("#include \"sysconfig.h\"\n");
     printf ("#include \"sysdeps.h\"\n");
-    printf ("#include \"config.h\"\n");
-    printf ("#include \"options.h\"\n");
     printf ("#include \"readcpu.h\"\n");
     printf ("struct instr_def defs68k[] = {\n");
 #if 0
@@ -113,6 +109,7 @@ int main(int argc, char **argv)
 	     case 'r': currbit = bitr; break;
 	     case 'R': currbit = bitR; break;
 	     case 'z': currbit = bitz; break;
+	     case 'p': currbit = bitp; break;
 	     default: abort();
 	    }
 	    if (!(bitmask & 1)) {
@@ -137,6 +134,8 @@ int main(int argc, char **argv)
 	 case '2': cpulevel = 2; break;
 	 case '3': cpulevel = 3; break;
 	 case '4': cpulevel = 4; break;
+	 case '5': cpulevel = 5; break;
+	 case '6': cpulevel = 6; break;
 	 default: abort();
 	}
 	getnextch();
@@ -161,6 +160,7 @@ int main(int argc, char **argv)
 	    switch(nextch){
 	     case '-': flagset[i] = fa_unset; break;
 	     case '/': flagset[i] = fa_isjmp; break;
+	     case '+': flagset[i] = fa_isbranch; break;
 	     case '0': flagset[i] = fa_zero; break;
 	     case '1': flagset[i] = fa_one; break;
 	     case 'x': flagset[i] = fa_dontcare; break;
@@ -242,6 +242,5 @@ int main(int argc, char **argv)
 	}
     }
     printf("};\nint n_defs68k = %d;\n", no_insns);
-    fclose(tablef);
     return 0;
 }