--- hatari/src/uae-cpu/readcpu.h	2019/04/01 07:09:16	1.1.1.1
+++ hatari/src/uae-cpu/readcpu.h	2019/04/01 07:13:14	1.1.1.4
@@ -1,10 +1,15 @@
+/*
+ * readcpu.h - UAE CPU core
+ *
+ * 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.
+ */
 
-#ifndef UAEREADCPU
-#define UAEREADCPU
+#ifndef UAE_READCPU_H
+#define UAE_READCPU_H
 
-#ifndef UAESYSDEPS
 #include "sysdeps.h"
-#endif
+
 
 ENUMDECL {
   Dreg, Areg, Aind, Aipi, Apdi, Ad16, Ad8r,
@@ -39,7 +44,7 @@ ENUMDECL {
     i_MMUOP
 } ENUMNAME (instrmnem);
 
-extern struct mnemolookup {
+extern const struct mnemolookup {
     instrmnem mnemo;
     const char *name;
 } lookuptab[];
@@ -49,7 +54,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 {
@@ -58,7 +64,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 {
@@ -76,7 +82,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 {
@@ -98,7 +104,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);
@@ -106,4 +113,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 */