--- SheepShaver/src/Unix/sysdeps.h	2004/06/02 16:11:49	1.32
+++ SheepShaver/src/Unix/sysdeps.h	2005/02/27 21:52:06	1.39
@@ -1,7 +1,7 @@
 /*
  *  sysdeps.h - System dependent definitions for Linux
  *
- *  SheepShaver (C) 1997-2004 Christian Bauer and Marc Hellwig
+ *  SheepShaver (C) 1997-2005 Christian Bauer and Marc Hellwig
  *
  *  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
@@ -41,6 +41,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
 #include <signal.h>
 
@@ -63,11 +64,44 @@
 # 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
 
-// Mac and host address space are the same
+// Always use Real Addressing mode on native architectures
+// Otherwise, use Direct Addressing mode if NATMEM_OFFSET is set
+#if !defined(EMULATED_PPC)
 #define REAL_ADDRESSING 1
+#include "ppc_asm.tmpl"
+#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))
+#elif defined(NATMEM_OFFSET)
+#define DIRECT_ADDRESSING 1
+#else
+#define REAL_ADDRESSING 1
+#endif
 
 #define POWERPC_ROM 1
 
@@ -87,6 +121,11 @@
 #define PPC_PROFILE_COMPILE_TIME 0
 #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
 #endif
@@ -375,7 +414,7 @@ typedef struct timeval tm_time_t;
 extern uint64 GetTicks_usec(void);
 extern void Delay_usec(uint32 usec);
 
-#if defined(HAVE_PTHREADS) || (defined(__linux__) && defined(__powerpc__))
+#if defined(HAVE_PTHREADS) || ((defined(__linux__) || defined(__NetBSD__)) && defined(__powerpc__))
 // Setup pthread attributes
 extern void Set_pthread_attr(pthread_attr_t *attr, int priority);
 #endif
@@ -408,14 +447,14 @@ extern X11_LOCK_TYPE x_display_lock;
 #endif
 
 // Macro for calling MacOS routines
-#define CallMacOS(type, tvect) call_macos((uint32)tvect)
-#define CallMacOS1(type, tvect, arg1) call_macos1((uint32)tvect, (uint32)arg1)
-#define CallMacOS2(type, tvect, arg1, arg2) call_macos2((uint32)tvect, (uint32)arg1, (uint32)arg2)
-#define CallMacOS3(type, tvect, arg1, arg2, arg3) call_macos3((uint32)tvect, (uint32)arg1, (uint32)arg2, (uint32)arg3)
-#define CallMacOS4(type, tvect, arg1, arg2, arg3, arg4) call_macos4((uint32)tvect, (uint32)arg1, (uint32)arg2, (uint32)arg3, (uint32)arg4)
-#define CallMacOS5(type, tvect, arg1, arg2, arg3, arg4, arg5) call_macos5((uint32)tvect, (uint32)arg1, (uint32)arg2, (uint32)arg3, (uint32)arg4, (uint32)arg5)
-#define CallMacOS6(type, tvect, arg1, arg2, arg3, arg4, arg5, arg6) call_macos6((uint32)tvect, (uint32)arg1, (uint32)arg2, (uint32)arg3, (uint32)arg4, (uint32)arg5, (uint32)arg6)
-#define CallMacOS7(type, tvect, arg1, arg2, arg3, arg4, arg5, arg6, arg7) call_macos7((uint32)tvect, (uint32)arg1, (uint32)arg2, (uint32)arg3, (uint32)arg4, (uint32)arg5, (uint32)arg6, (uint32)arg7)
+#define CallMacOS(type, tvect) call_macos((uintptr)tvect)
+#define CallMacOS1(type, tvect, arg1) call_macos1((uintptr)tvect, (uintptr)arg1)
+#define CallMacOS2(type, tvect, arg1, arg2) call_macos2((uintptr)tvect, (uintptr)arg1, (uintptr)arg2)
+#define CallMacOS3(type, tvect, arg1, arg2, arg3) call_macos3((uintptr)tvect, (uintptr)arg1, (uintptr)arg2, (uintptr)arg3)
+#define CallMacOS4(type, tvect, arg1, arg2, arg3, arg4) call_macos4((uintptr)tvect, (uintptr)arg1, (uintptr)arg2, (uintptr)arg3, (uintptr)arg4)
+#define CallMacOS5(type, tvect, arg1, arg2, arg3, arg4, arg5) call_macos5((uintptr)tvect, (uintptr)arg1, (uintptr)arg2, (uintptr)arg3, (uintptr)arg4, (uintptr)arg5)
+#define CallMacOS6(type, tvect, arg1, arg2, arg3, arg4, arg5, arg6) call_macos6((uintptr)tvect, (uintptr)arg1, (uintptr)arg2, (uintptr)arg3, (uintptr)arg4, (uintptr)arg5, (uintptr)arg6)
+#define CallMacOS7(type, tvect, arg1, arg2, arg3, arg4, arg5, arg6, arg7) call_macos7((uintptr)tvect, (uintptr)arg1, (uintptr)arg2, (uintptr)arg3, (uintptr)arg4, (uintptr)arg5, (uintptr)arg6, (uintptr)arg7)
 
 #ifdef __cplusplus
 extern "C" {