--- hatari/src/uae-cpu/newcpu.h	2019/04/01 07:09:16	1.1.1.1
+++ hatari/src/uae-cpu/newcpu.h	2019/04/01 07:10:24	1.1.1.4
@@ -1,13 +1,16 @@
  /*
-  * UAE - The Un*x Amiga Emulator
-  *
+  * UAE - The Un*x Amiga Emulator - CPU core
+  * 
   * MC68000 emulation
   *
   * Copyright 1995 Bernd Schmidt
+  *
+  * Adaptation to Hatari by Thomas Huth
+  *
   */
 
-#ifndef UAENEWCPU
-#define UAENEWCPU
+#ifndef UAE_NEWCPU_H
+#define UAE_NEWCPU_H
 
 #include "readcpu.h"
 #include "m68k.h"
@@ -99,7 +102,6 @@ extern struct regstruct
     uae_u32 fpcr,fpsr,fpiar;
 
     uae_u32 spcflags;
-    uae_u32 kick_mask;
 
     /* Fellow sources say this is 4 longwords. That's impossible. It needs
      * to be at least a longword. The HRM has some cryptic comment about two
@@ -248,6 +250,7 @@ extern int m68k_move2c (int, uae_u32 *);
 extern int m68k_movec2 (int, uae_u32 *);
 extern void m68k_divl (uae_u32, uae_u32, uae_u16, uaecptr);
 extern void m68k_mull (uae_u32, uae_u32, uae_u16);
+extern void build_cpufunctbl(void);
 extern void init_m68k (void);
 extern void m68k_go (int);
 extern void m68k_dumpstate (FILE *, uaecptr *);
@@ -264,6 +267,8 @@ extern void fbcc_opp (uae_u32, uaecptr,
 extern void fsave_opp (uae_u32);
 extern void frestore_opp (uae_u32);
 
+extern int lastInstructionCycles;
+
 /* Opcode of faulting instruction */
 extern uae_u16 last_op_for_exception_3;
 /* PC at fault time */
@@ -286,6 +291,6 @@ extern struct cputbl op_smalltbl_4_ff[];
 /* 68000 slow but compatible.  */
 extern struct cputbl op_smalltbl_5_ff[];
 
-extern cpuop_func *cpufunctbl[65536] ASM_SYM_FOR_FUNC ("cpufunctbl");
+extern cpuop_func *cpufunctbl[65536];
 
-#endif	/* ifndef UAENEWCPU */
+#endif	/* UAE_NEWCPU_H */