--- hatari/src/uae-cpu/newcpu.h	2019/04/01 07:12:20	1.1.1.8
+++ hatari/src/uae-cpu/newcpu.h	2019/04/09 08:53:26	1.1.1.14
@@ -7,8 +7,8 @@
   *
   * Adaptation to Hatari by Thomas Huth
   *
-  * 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.
+  * 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 UAE_NEWCPU_H
@@ -16,9 +16,18 @@
 
 #include "readcpu.h"
 #include "m68k.h"
+#include "memory.h"
+
+
+/* Possible exceptions sources for M68000_Exception() and Exception() */
+#define M68000_EXC_SRC_CPU	    1  /* Direct CPU exception */
+#define M68000_EXC_SRC_AUTOVEC  2  /* Auto-vector exception (e.g. VBL) */
+#define M68000_EXC_SRC_INT_MFP	3  /* MFP interrupt exception */
+#define M68000_EXC_SRC_INT_DSP  4  /* DSP interrupt exception */
 
 
 /* Special flags */
+#define SPCFLAG_DEBUGGER 1
 #define SPCFLAG_STOP 2
 #define SPCFLAG_BUSERROR 4
 #define SPCFLAG_INT 8
@@ -30,6 +39,7 @@
 #define SPCFLAG_MFP 0x200
 #define SPCFLAG_EXEC 0x400
 #define SPCFLAG_MODE_CHANGE 0x800
+#define SPCFLAG_DSP 0x1000
 
 
 #ifndef SET_CFLG
@@ -56,8 +66,8 @@
 #define COPY_CARRY (SET_XFLG (GET_CFLG))
 #endif
 
-extern int areg_byteinc[];
-extern int imm8_table[];
+extern const int areg_byteinc[];
+extern const int imm8_table[];
 
 extern int movem_index1[256];
 extern int movem_index2[256];
@@ -287,7 +297,7 @@ extern uae_s32 ShowEA (FILE *, int reg,
 
 extern void MakeSR (void);
 extern void MakeFromSR (void);
-extern void Exception (int, uaecptr);
+extern void Exception (int, uaecptr, int);
 extern void dump_counts (void);
 extern int m68k_move2c (int, uae_u32 *);
 extern int m68k_movec2 (int, uae_u32 *);
@@ -310,6 +320,8 @@ extern void fbcc_opp (uae_u32, uaecptr,
 extern void fsave_opp (uae_u32);
 extern void frestore_opp (uae_u32);
 
+extern int getDivu68kCycles (uae_u32 dividend, uae_u16 divisor);
+extern int getDivs68kCycles (uae_s32 dividend, uae_s16 divisor);
 
 /* Opcode of faulting instruction */
 extern uae_u16 last_op_for_exception_3;
@@ -321,20 +333,27 @@ extern uaecptr last_fault_for_exception_
 #define CPU_OP_NAME(a) op ## a
 
 /* 68040 */
-extern struct cputbl op_smalltbl_0_ff[];
+extern const struct cputbl op_smalltbl_0_ff[];
 /* 68020 + 68881 */
-extern struct cputbl op_smalltbl_1_ff[];
+extern const struct cputbl op_smalltbl_1_ff[];
 /* 68020 */
-extern struct cputbl op_smalltbl_2_ff[];
+extern const struct cputbl op_smalltbl_2_ff[];
 /* 68010 */
-extern struct cputbl op_smalltbl_3_ff[];
+extern const struct cputbl op_smalltbl_3_ff[];
 /* 68000 */
-extern struct cputbl op_smalltbl_4_ff[];
+extern const struct cputbl op_smalltbl_4_ff[];
 /* 68000 slow but compatible.  */
-extern struct cputbl op_smalltbl_5_ff[];
+extern const struct cputbl op_smalltbl_5_ff[];
 
 extern cpuop_func *cpufunctbl[65536];
 
-extern uae_u32 reg_caar, reg_cacr;
+extern uae_u32 caar, cacr;
+
+/* Family of the latest instruction executed (to check for pairing) */
+extern int OpcodeFamily;			/* see instrmnem in readcpu.h */
+
+/* How many cycles to add to the current instruction in case a "misaligned" bus acces is made */
+/* (used when addressing mode is d8(an,ix)) */
+extern int BusCyclePenalty;
 
 #endif	/* UAE_NEWCPU_H */