--- previous/src/ioMem.c	2018/04/24 19:27:38	1.1.1.3
+++ previous/src/ioMem.c	2018/04/24 19:31:26	1.1.1.5
@@ -12,9 +12,9 @@ const char IoMem_fileid[] = "Hatari ioMe
 #include "configuration.h"
 #include "ioMem.h"
 #include "ioMemTables.h"
-#include "memorySnapShot.h"
 #include "m68000.h"
 #include "sysdeps.h"
+#include "shortcut.h"
 
 #define IO_SEG_MASK 0x0001FFFF
 #define IO_MASK 0x0001FFFF
@@ -66,7 +66,11 @@ void IoMem_Init(void)
 	/* Set default IO access handler (-> bus error) */
 	IoMem_SetBusErrorRegion(0x02000000, 0x0201FFFF);
 
-	pInterceptAccessFuncs=IoMemTable_NEXT;
+	if (ConfigureParams.System.bTurbo) {
+		pInterceptAccessFuncs = IoMemTable_Turbo;
+	} else {
+		pInterceptAccessFuncs = IoMemTable_NEXT;
+	}
 
 	/* Now set the correct handlers */
 	for (addr=0x02000000; addr <= 0x0201FFFF; addr++)
@@ -493,3 +497,10 @@ void IoMem_WriteWithoutInterceptionButTr
 {
 	Log_Printf(LOG_WARN,"IO write at $%08x val=%02x PC=$%08x\n", IoAccessCurrentAddress,IoMem[IoAccessCurrentAddress & IO_SEG_MASK],regs.pc);
 }
+
+/*-------------------------------------------------------------------------*/
+/* Jump into debugger upon access
+ */
+void IoMem_Debug(void) {
+    ShortCut_Debug_M68K();
+}