--- hatari/src/includes/m68000.h	2019/04/01 07:09:16	1.1
+++ hatari/src/includes/m68000.h	2019/04/01 07:13:06	1.1.1.9
@@ -1,18 +1,52 @@
 /*
-  Hatari
+  Hatari - m68000.h
+
+  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 HATARI_M68000_H
+#define HATARI_M68000_H
+
+#include "cycles.h"     /* for nCyclesMainCounter */
+#include "sysdeps.h"
+#include "memory.h"
+#include "newcpu.h"     /* for regs */
+
+#define Regs regs.regs  /* Ugly hack to glue the WinSTon sources to the UAE CPU core. */
+#define SR regs.sr      /* Don't forget to call MakeFromSR() and MakeSR() */
+
+
+/* bus error mode */
+#define BUS_ERROR_WRITE 0
+#define BUS_ERROR_READ 1
+
+extern void (*PendingInterruptFunction)(void);
+extern short int PendingInterruptCount;
+
+extern Uint32 BusErrorAddress;
+extern Uint32 BusErrorPC;
+extern BOOL bBusErrorReadWrite;
+extern int nCpuFreqShift;
+extern int nWaitStateCycles;
+
+
+/*-----------------------------------------------------------------------*/
+/*
+  Add CPU cycles.
+  NOTE: All times are rounded up to nearest 4 cycles.
+*/
+static inline void M68000_AddCycles(int cycles)
+{
+	cycles = ((cycles + 3) & ~3) >> nCpuFreqShift;
+	PendingInterruptCount -= cycles;
+	nCyclesMainCounter += cycles;
+}
+
 extern void M68000_Reset(BOOL bCold);
 extern void M68000_MemorySnapShot_Capture(BOOL bSave);
-extern void M68000_Decode_MemorySnapShot_Capture(BOOL bSave);
-extern void M68000_IllegalInstruction(void);
-extern void M68000_BusError(unsigned long addr);
-extern void M68000_AddressError(unsigned long addr);
-extern void M68000_CheckUserSuperToggle(void);
-extern void M68000_TraceModeTriggered(void);
-extern void M68000_Exception(void);
-extern void M68000_Line_A_OpCode(void);
-extern void M68000_Line_A_Trap(void);
-extern void M68000_Line_F_OpCode(void);
-extern int M68000_FindLastInstructionCycles(void);
-extern void M68000_OutputHistory();
+extern void M68000_BusError(Uint32 addr, BOOL bReadWrite);
+extern void M68000_Exception(Uint32 ExceptionVector);
+extern void M68000_WaitState(int nCycles);
+
+#endif