--- BasiliskII/src/Unix/sysdeps.h	2000/07/13 13:47:11	1.11
+++ BasiliskII/src/Unix/sysdeps.h	2002/01/15 14:58:37	1.21
@@ -1,7 +1,7 @@
 /*
  *  sysdeps.h - System dependent definitions for Unix
  *
- *  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
@@ -69,23 +69,43 @@
 
 /* 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
 
 /* Using 68k emulator */
 #define EMULATED_68K 1
 
-/* Mac ROM is 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
 
+/* BSD socket API supported */
+#define SUPPORTS_UDP_TUNNEL 1
+
 
 /* Data types */
 typedef unsigned char uint8;
@@ -121,6 +141,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
@@ -129,9 +158,6 @@ typedef struct timespec tm_time_t;
 typedef struct timeval tm_time_t;
 #endif
 
-/* Offset Mac->Unix time in seconds */
-#define TIME_OFFSET 0x7c25b080
-
 /* UAE CPU data types */
 #define uae_s8 int8
 #define uae_u8 uint8
@@ -148,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
 
@@ -206,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)
 
@@ -227,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))
 
@@ -240,16 +289,6 @@ static inline void do_put_mem_word(uae_u
 #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)
 #else