--- hatari/src/uae-cpu/readcpu.h	2019/04/01 07:10:25	1.1.1.2
+++ hatari/src/uae-cpu/readcpu.h	2019/04/09 08:53:27	1.1.1.6
@@ -1,6 +1,12 @@
+/*
+ * readcpu.h - UAE CPU core
+ *
+ * This file is distributed under the GNU General Public License, version 2
+ * or at your option any later version. Read the file gpl.txt for details.
+ */
 
-#ifndef UAEREADCPU
-#define UAEREADCPU
+#ifndef UAE_READCPU_H
+#define UAE_READCPU_H
 
 #include "sysdeps.h"
 
@@ -35,10 +41,12 @@ ENUMDECL {
     i_PACK, i_UNPK, i_TAS, i_BKPT, i_CALLM, i_RTM, i_TRAPcc, i_MOVES,
     i_FPP, i_FDBcc, i_FScc, i_FTRAPcc, i_FBcc, i_FSAVE, i_FRESTORE,
     i_CINVL, i_CINVP, i_CINVA, i_CPUSHL, i_CPUSHP, i_CPUSHA, i_MOVE16,
-    i_MMUOP
+    i_MMUOP,
+
+    MAX_OPCODE_FAMILY				/* should always be last of the list */
 } ENUMNAME (instrmnem);
 
-extern struct mnemolookup {
+extern const struct mnemolookup {
     instrmnem mnemo;
     const char *name;
 } lookuptab[];
@@ -48,7 +56,8 @@ ENUMDECL {
 } ENUMNAME (wordsizes);
 
 ENUMDECL {
-    fa_set, fa_unset, fa_zero, fa_one, fa_dontcare, fa_unknown, fa_isjmp
+    fa_set, fa_unset, fa_zero, fa_one, fa_dontcare, fa_unknown, fa_isjmp,
+    fa_isbranch
 } ENUMNAME (flagaffect);
 
 ENUMDECL {
@@ -57,7 +66,7 @@ ENUMDECL {
 
 ENUMDECL {
     bit0, bit1, bitc, bitC, bitf, biti, bitI, bitj, bitJ, bitk, bitK,
-    bits, bitS, bitd, bitD, bitr, bitR, bitz, lastbit
+    bits, bitS, bitd, bitD, bitr, bitR, bitz, bitp, lastbit
 } ENUMNAME (bitvals);
 
 struct instr_def {
@@ -75,7 +84,7 @@ struct instr_def {
     const char *opcstr;
 };
 
-extern struct instr_def defs68k[];
+extern const struct instr_def defs68k[];
 extern int n_defs68k;
 
 extern struct instr {
@@ -97,7 +106,8 @@ extern struct instr {
     unsigned int duse:1;
     unsigned int unused1:1;
     unsigned int clev:3;
-    unsigned int unused2:5;
+    unsigned int isjmp:1;
+    unsigned int unused2:4;
 } *table68k;
 
 extern void read_table68k (void);
@@ -105,4 +115,4 @@ extern void do_merges (void);
 extern int get_no_mismatches (void);
 extern int nr_cpuop_funcs;
 
-#endif /* ifndef UAEREADCPU */
+#endif /* ifndef UAE_READCPU_H */