--- BasiliskII/src/Unix/sysdeps.h	2000/04/10 18:53:08	1.10
+++ BasiliskII/src/Unix/sysdeps.h	2001/01/28 14:03:19	1.16
@@ -42,7 +42,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <pthread.h>
 
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
@@ -60,18 +59,51 @@
 #endif
 
 
-/* Are the Mac and the host address space the same? */
+#ifdef ENABLE_NATIVE_M68K
+
+/* Mac and host address space are the same */
+#define REAL_ADDRESSING 1
+
+/* Using 68k natively */
+#define EMULATED_68K 0
+
+/* Mac ROM is not write protected */
+#define ROM_IS_WRITE_PROTECTED 0
+#define USE_SCRATCHMEM_SUBTERFUGE 1
+
+#else
+
+/* Mac and host address space are distinct */
+#ifndef REAL_ADDRESSING
 #define REAL_ADDRESSING 0
+#endif
 
-/* Are we using a 68k emulator or the real thing? */
+/* Using 68k emulator */
 #define EMULATED_68K 1
 
-/* Is the Mac ROM write protected? */
-#define ROM_IS_WRITE_PROTECTED 1
+/* The m68k emulator uses a prefetch buffer ? */
+#define USE_PREFETCH_BUFFER 0
+
+/* Mac ROM is write protected when banked memory is used */
+#if REAL_ADDRESSING || DIRECT_ADDRESSING
+# define ROM_IS_WRITE_PROTECTED 0
+# define USE_SCRATCHMEM_SUBTERFUGE 1
+#else
+# define ROM_IS_WRITE_PROTECTED 1
+#endif
+
+#endif
+
+/* Direct Addressing requires Video on SEGV signals */
+#if DIRECT_ADDRESSING && !ENABLE_VOSF
+# undef  ENABLE_VOSF
+# define ENABLE_VOSF 1
+#endif
 
 /* ExtFS is supported */
 #define SUPPORTS_EXTFS 1
 
+
 /* Data types */
 typedef unsigned char uint8;
 typedef signed char int8;
@@ -106,6 +138,15 @@ typedef long long int64;
 #else
 #error "No 8 byte type, you lose."
 #endif
+#if SIZEOF_VOID_P == 4
+typedef uint32 uintptr;
+typedef int32 intptr;
+#elif SIZEOF_VOID_P == 8
+typedef uint64 uintptr;
+typedef int64 intptr;
+#else
+#error "Unsupported size of pointer"
+#endif
 
 /* Time data type for Time Manager emulation */
 #ifdef HAVE_CLOCK_GETTIME
@@ -133,6 +174,10 @@ typedef uae_u32 uaecptr;
 # define CPU_CAN_ACCESS_UNALIGNED
 #endif
 
+/* Timing functions */
+extern uint64 GetTicks_usec(void);
+extern void Delay_usec(uint32 usec);
+
 /* UAE CPU defines */
 #ifdef WORDS_BIGENDIAN
 
@@ -191,6 +236,15 @@ static inline void do_put_mem_word(uae_u
 #else
 static inline void do_put_mem_word(uae_u16 *a, uae_u32 v) {__asm__ ("rolw $8,%0" : "=r" (v) : "0" (v) : "cc"); *a = v;}
 #endif
+#define HAVE_OPTIMIZED_BYTESWAP_32
+/* bswap doesn't affect condition codes */
+static inline uae_u32 do_byteswap_32(uae_u32 v) {__asm__ ("bswap %0" : "=r" (v) : "0" (v)); return v;}
+#define HAVE_OPTIMIZED_BYTESWAP_16
+#ifdef X86_PPRO_OPT
+static inline uae_u32 do_byteswap_16(uae_u32 v) {__asm__ ("bswapl %0" : "=&r" (v) : "0" (v << 16) : "cc"); return v;}
+#else
+static inline uae_u32 do_byteswap_16(uae_u32 v) {__asm__ ("rolw $8,%0" : "=r" (v) : "0" (v) : "cc"); return v;}
+#endif
 
 #elif defined(CPU_CAN_ACCESS_UNALIGNED)
 
@@ -212,6 +266,16 @@ static inline void do_put_mem_word(uae_u
 
 #endif /* WORDS_BIGENDIAN */
 
+#ifndef HAVE_OPTIMIZED_BYTESWAP_32
+static inline uae_u32 do_byteswap_32(uae_u32 v)
+	{ return (((v >> 24) & 0xff) | ((v >> 8) & 0xff00) | ((v & 0xff) << 24) | ((v & 0xff00) << 8)); }
+#endif
+
+#ifndef HAVE_OPTIMIZED_BYTESWAP_16
+static inline uae_u32 do_byteswap_16(uae_u32 v)
+	{ return (((v >> 8) & 0xff) | ((v & 0xff) << 8)); }
+#endif
+
 #define do_get_mem_byte(a) ((uae_u32)*((uae_u8 *)(a)))
 #define do_put_mem_byte(a, v) (*(uae_u8 *)(a) = (v))
 
@@ -224,16 +288,8 @@ static inline void do_put_mem_word(uae_u
 #define ENUMDECL typedef enum
 #define ENUMNAME(name) name
 #define write_log printf
-
-#ifdef USE_COMPILER
-#define USE_MAPPED_MEMORY
-#define CAN_MAP_MEMORY
-#define NO_EXCEPTION_3
-#define NO_PREFETCH_BUFFER
-#else
 #undef USE_MAPPED_MEMORY
 #undef CAN_MAP_MEMORY
-#endif
 
 #ifdef X86_ASSEMBLY
 #define ASM_SYM_FOR_FUNC(a) __asm__(a)