--- SheepShaver/src/Unix/sysdeps.h 2004/06/15 21:37:22 1.33 +++ SheepShaver/src/Unix/sysdeps.h 2007/02/17 09:01:30 1.56 @@ -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 #include #include +#include #include #include @@ -63,11 +64,33 @@ # 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 \ + (&reinterpret_cast \ + (static_cast (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(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 @@ -85,14 +108,13 @@ #define PPC_DECODE_CACHE 1 #define PPC_FLIGHT_RECORDER 1 #define PPC_PROFILE_COMPILE_TIME 0 -#define PPC_PROFILE_GENERIC_CALLS 0 +#define PPC_PROFILE_GENERIC_CALLS 1 +#define PPC_PROFILE_REGS_USE 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__) +#if defined(__i386__) || defined(__x86_64__) #define DYNGEN_ASM_OPTS 1 #endif #else @@ -145,6 +167,12 @@ typedef int64 intptr; #error "Unsupported size of pointer" #endif +// Define if the host processor supports fast unaligned load/stores +#if defined __i386__ || defined __x86_64__ +#define UNALIGNED_PROFITABLE 1 +#endif + + /** * Helper functions to byteswap data **/ @@ -254,8 +282,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) { @@ -338,7 +365,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) { @@ -376,11 +404,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 @@ -394,16 +436,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() @@ -413,14 +455,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" {