--- BasiliskII/src/uae_cpu/basilisk_glue.cpp	2000/07/14 21:29:15	1.4
+++ BasiliskII/src/uae_cpu/basilisk_glue.cpp	2002/01/15 14:58:43	1.12
@@ -1,7 +1,7 @@
 /*
  *  basilisk_glue.cpp - Glue UAE CPU to Basilisk II CPU engine interface
  *
- *  Basilisk II (C) 1997-2000 Christian Bauer
+ *  Basilisk II (C) 1997-2002 Christian Bauer
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -28,11 +28,10 @@
 #include "memory.h"
 #include "readcpu.h"
 #include "newcpu.h"
-#include "compiler.h"
 
 
 // RAM and ROM pointers
-uint32 RAMBaseMac;			// RAM base (Mac address space)
+uint32 RAMBaseMac = 0;		// RAM base (Mac address space) gb-- init is important
 uint8 *RAMBaseHost;			// RAM base (host address space)
 uint32 RAMSize;				// Size of RAM
 uint32 ROMBaseMac;			// ROM base (Mac address space)
@@ -46,6 +45,10 @@ uint32 MacFrameSize;		// Size of frame b
 int MacFrameLayout;			// Frame buffer layout
 #endif
 
+#if DIRECT_ADDRESSING
+uintptr MEMBaseDiff;		// Global offset between a Mac address and its Host equivalent
+#endif
+
 // From newcpu.cpp
 extern int quit_program;
 
@@ -60,6 +63,11 @@ bool Init680x0(void)
 	// Mac address space = host address space
 	RAMBaseMac = (uint32)RAMBaseHost;
 	ROMBaseMac = (uint32)ROMBaseHost;
+#elif DIRECT_ADDRESSING
+	// Mac address space = host address space minus constant offset (MEMBaseDiff)
+	// NOTE: MEMBaseDiff is set in main_unix.cpp/main()
+	RAMBaseMac = 0;
+	ROMBaseMac = Host2MacAddr(ROMBaseHost);
 #else
 	// Initialize UAE memory banks
 	RAMBaseMac = 0;
@@ -82,9 +90,6 @@ bool Init680x0(void)
 #endif
 
 	init_m68k();
-#ifdef USE_COMPILER
-	compiler_init();
-#endif
 	return true;
 }
 
@@ -95,10 +100,22 @@ bool Init680x0(void)
 
 void Exit680x0(void)
 {
+	exit_m68k();
 }
 
 
 /*
+ *  Initialize memory mapping of frame buffer (called upon video mode change)
+ */
+
+void InitFrameBufferMapping(void)
+{
+#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
+	memory_init();
+#endif
+}
+
+/*
  *  Reset and start 680x0 emulation (doesn't return)
  */
 
@@ -118,6 +135,11 @@ void TriggerInterrupt(void)
 	regs.spcflags |= SPCFLAG_INT;
 }
 
+void TriggerNMI(void)
+{
+	//!! not implemented yet
+}
+
 
 /*
  *  Get 68k interrupt level