--- SheepShaver/src/Unix/sysdeps.h	2005/01/30 21:48:20	1.36
+++ SheepShaver/src/Unix/sysdeps.h	2006/05/02 19:33:10	1.52
@@ -41,6 +41,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
 #include <signal.h>
 
@@ -63,6 +64,17 @@
 # endif
 #endif
 
+// Fix offsetof() on FreeBSD and GCC >= 3.4
+#if defined(__FreeBSD__) && defined(__cplusplus)
+#undef offsetof
+/* The cast to "char &" below avoids problems with user-defined
+   "operator &", which can appear in a POD type.  */
+#define offsetof(TYPE, MEMBER)                          \
+  (__offsetof__ (reinterpret_cast <size_t>              \
+                 (&reinterpret_cast <char &>            \
+                  (static_cast<TYPE *> (0)->MEMBER))))
+#endif
+
 // Define for external components
 #define SHEEPSHAVER 1
 
@@ -70,26 +82,16 @@
 // Otherwise, use Direct Addressing mode if NATMEM_OFFSET is set
 #if !defined(EMULATED_PPC)
 #define REAL_ADDRESSING 1
-#elif defined(__CYGWIN__)
-#define DIRECT_ADDRESSING 1
-#define DIRECT_ADDRESSING_HACK 1
-/*
-  The following address translation functions were empirically
-  determined on a Windows XP system running Cygwin 1.5.12-1 so
-  that RAM size can be maximized (up to 960 MB) and avoiding
-  the use of a TLB. This also takes into account reduced address
-  space available when the Cygwin runtime is used.
-*/
-#define DIRECT_ADDRESSING_VIRT2PHYS(ADDR) \
-	((ADDR) + (((ADDR)  < 0x41000000) ? 0x39000000 : 0xcf800000))
-#define DIRECT_ADDRESSING_PHYS2VIRT(ADDR) \
-	((ADDR) - (((ADDR) >= 0x39000000) ? 0x39000000 : 0xcf800000))
+#include "ppc_asm.tmpl"
 #elif defined(NATMEM_OFFSET)
 #define DIRECT_ADDRESSING 1
 #else
 #define REAL_ADDRESSING 1
 #endif
 
+// Always use the complete non-stubs Ethernet driver
+#define USE_ETHER_FULL_DRIVER 1
+
 #define POWERPC_ROM 1
 
 #if EMULATED_PPC
@@ -109,9 +111,7 @@
 #define PPC_PROFILE_GENERIC_CALLS 0
 #define KPX_MAX_CPUS 1
 #if ENABLE_DYNGEN
-// Don't bother with predecode cache when using JIT
 #define PPC_ENABLE_JIT 1
-#undef  PPC_DECODE_CACHE
 #endif
 #if defined(__i386__)
 #define DYNGEN_ASM_OPTS 1
@@ -275,8 +275,7 @@ static inline int testandset(volatile in
 }
 #endif
 
-/* FIXME: SheepShaver occasionnally hangs with those locks */
-#if 0 && (defined(__i386__) || defined(__x86_64__))
+#if defined(__i386__) || defined(__x86_64__)
 #define HAVE_TEST_AND_SET 1
 static inline int testandset(volatile int *p)
 {
@@ -359,7 +358,8 @@ typedef volatile int spinlock_t;
 
 static const spinlock_t SPIN_LOCK_UNLOCKED = 0;
 
-#if HAVE_TEST_AND_SET
+#if defined(HAVE_TEST_AND_SET) && defined(HAVE_PTHREADS)
+// There is nothing to lock if we are not in an multithreaded environment
 #define HAVE_SPINLOCKS 1
 static inline void spin_lock(spinlock_t *lock)
 {
@@ -397,11 +397,25 @@ typedef struct timespec tm_time_t;
 typedef struct timeval tm_time_t;
 #endif
 
+/* Define codes for all the float formats that we know of.
+ * Though we only handle IEEE format.  */
+#define UNKNOWN_FLOAT_FORMAT 0
+#define IEEE_FLOAT_FORMAT 1
+#define VAX_FLOAT_FORMAT 2
+#define IBM_FLOAT_FORMAT 3
+#define C4X_FLOAT_FORMAT 4
+
+// High-precision timing
+#if defined(HAVE_PTHREADS) && defined(HAVE_CLOCK_NANOSLEEP)
+#define PRECISE_TIMING 1
+#define PRECISE_TIMING_POSIX 1
+#endif
+
 // Timing functions
 extern uint64 GetTicks_usec(void);
 extern void Delay_usec(uint32 usec);
 
-#if defined(HAVE_PTHREADS) || (defined(__linux__) && defined(__powerpc__))
+#ifdef HAVE_PTHREADS
 // Setup pthread attributes
 extern void Set_pthread_attr(pthread_attr_t *attr, int priority);
 #endif
@@ -415,16 +429,16 @@ typedef struct rgb_color {
 } rgb_color;
 
 // X11 display fast locks
-#ifdef HAVE_SPINLOCKS
-#define X11_LOCK_TYPE spinlock_t
-#define X11_LOCK_INIT SPIN_LOCK_UNLOCKED
-#define XDisplayLock() spin_lock(&x_display_lock)
-#define XDisplayUnlock() spin_unlock(&x_display_lock)
-#elif defined(HAVE_PTHREADS)
+#if defined(HAVE_PTHREADS)
 #define X11_LOCK_TYPE pthread_mutex_t
 #define X11_LOCK_INIT PTHREAD_MUTEX_INITIALIZER
 #define XDisplayLock() pthread_mutex_lock(&x_display_lock);
 #define XDisplayUnlock() pthread_mutex_unlock(&x_display_lock);
+#elif defined(HAVE_SPINLOCKS)
+#define X11_LOCK_TYPE spinlock_t
+#define X11_LOCK_INIT SPIN_LOCK_UNLOCKED
+#define XDisplayLock() spin_lock(&x_display_lock)
+#define XDisplayUnlock() spin_unlock(&x_display_lock)
 #else
 #define XDisplayLock()
 #define XDisplayUnlock()