--- SheepShaver/src/Unix/sysdeps.h 2003/12/01 13:51:35 1.17 +++ SheepShaver/src/Unix/sysdeps.h 2005/02/13 18:18:59 1.37 @@ -1,7 +1,7 @@ /* * sysdeps.h - System dependent definitions for Linux * - * SheepShaver (C) 1997-2002 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,9 +41,14 @@ #include #include #include +#include #include #include +#ifdef HAVE_PTHREADS +# include +#endif + #ifdef HAVE_FCNTL_H # include #endif @@ -59,17 +64,47 @@ # 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 +#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 #if EMULATED_PPC -// Handle interrupts asynchronously? -#define ASYNC_IRQ 0 // Mac ROM is write protected when banked memory is used #if REAL_ADDRESSING || DIRECT_ADDRESSING # define ROM_IS_WRITE_PROTECTED 0 @@ -78,12 +113,21 @@ # define ROM_IS_WRITE_PROTECTED 1 #endif // Configure PowerPC emulator -#define PPC_CHECK_INTERRUPTS (ASYNC_IRQ ? 0 : 1) +#define PPC_REENTRANT_JIT 1 +#define PPC_CHECK_INTERRUPTS 1 #define PPC_DECODE_CACHE 1 #define PPC_FLIGHT_RECORDER 1 #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 #else // Mac ROM is write protected #define ROM_IS_WRITE_PROTECTED 1 @@ -139,7 +183,7 @@ typedef int64 intptr; **/ #if defined(__GNUC__) -#if defined(__x86_64__) +#if defined(__x86_64__) || defined(__i386__) // Linux/AMD64 currently has no asm optimized bswap_32() in #define opt_bswap_32 do_opt_bswap_32 static inline uint32 do_opt_bswap_32(uint32 x) @@ -184,6 +228,14 @@ static inline uint32 generic_bswap_32(ui ((x & 0x000000ff) << 24) ); } +#if defined(__i386__) +#define opt_bswap_64 do_opt_bswap_64 +static inline uint64 do_opt_bswap_64(uint64 x) +{ + return (bswap_32(x >> 32) | (((uint64)bswap_32((uint32)x)) << 32)); +} +#endif + #ifdef opt_bswap_64 #undef bswap_64 #define bswap_64 opt_bswap_64 @@ -217,16 +269,16 @@ static inline uint64 tswap64(uint64 x) { // spin locks #ifdef __GNUC__ -#ifdef __powerpc__ +#if defined(__powerpc__) || defined(__ppc__) #define HAVE_TEST_AND_SET 1 -static inline int testandset(int *p) +static inline int testandset(volatile int *p) { int ret; - __asm__ __volatile__("0: lwarx %0,0,%1 ;" - " xor. %0,%3,%0;" - " bne 1f;" - " stwcx. %2,0,%1;" - " bne- 0b;" + __asm__ __volatile__("0: lwarx %0,0,%1\n" + " xor. %0,%3,%0\n" + " bne 1f\n" + " stwcx. %2,0,%1\n" + " bne- 0b\n" "1: " : "=&r" (ret) : "r" (p), "r" (1), "r" (0) @@ -235,16 +287,16 @@ static inline int testandset(int *p) } #endif -#ifdef __i386__ +/* FIXME: SheepShaver occasionnally hangs with those locks */ +#if 0 && (defined(__i386__) || defined(__x86_64__)) #define HAVE_TEST_AND_SET 1 -static inline int testandset(int *p) +static inline int testandset(volatile int *p) { - char ret; - long int readval; - - __asm__ __volatile__("lock; cmpxchgl %3, %1; sete %0" - : "=q" (ret), "=m" (*p), "=a" (readval) - : "r" (1), "m" (*p), "a" (0) + long int ret; + /* Note: the "xchg" instruction does not need a "lock" prefix */ + __asm__ __volatile__("xchgl %k0, %1" + : "=r" (ret), "=m" (*p) + : "0" (1), "m" (*p) : "memory"); return ret; } @@ -252,7 +304,7 @@ static inline int testandset(int *p) #ifdef __s390__ #define HAVE_TEST_AND_SET 1 -static inline int testandset(int *p) +static inline int testandset(volatile int *p) { int ret; @@ -267,7 +319,7 @@ static inline int testandset(int *p) #ifdef __alpha__ #define HAVE_TEST_AND_SET 1 -static inline int testandset(int *p) +static inline int testandset(volatile int *p) { int ret; unsigned long one; @@ -287,7 +339,7 @@ static inline int testandset(int *p) #ifdef __sparc__ #define HAVE_TEST_AND_SET 1 -static inline int testandset(int *p) +static inline int testandset(volatile int *p) { int ret; @@ -302,7 +354,7 @@ static inline int testandset(int *p) #ifdef __arm__ #define HAVE_TEST_AND_SET 1 -static inline int testandset(int *p) +static inline int testandset(volatile int *p) { register unsigned int ret; __asm__ __volatile__("swp %0, %1, [%2]" @@ -315,12 +367,12 @@ static inline int testandset(int *p) #endif /* __GNUC__ */ -#if HAVE_TEST_AND_SET -#define HAVE_SPINLOCKS 1 -typedef int spinlock_t; +typedef volatile int spinlock_t; static const spinlock_t SPIN_LOCK_UNLOCKED = 0; +#if HAVE_TEST_AND_SET +#define HAVE_SPINLOCKS 1 static inline void spin_lock(spinlock_t *lock) { while (testandset(lock)); @@ -335,6 +387,19 @@ static inline int spin_trylock(spinlock_ { return !testandset(lock); } +#else +static inline void spin_lock(spinlock_t *lock) +{ +} + +static inline void spin_unlock(spinlock_t *lock) +{ +} + +static inline int spin_trylock(spinlock_t *lock) +{ + return 1; +} #endif // Time data type for Time Manager emulation @@ -344,8 +409,14 @@ typedef struct timespec tm_time_t; typedef struct timeval tm_time_t; #endif +// Timing functions +extern uint64 GetTicks_usec(void); +extern void Delay_usec(uint32 usec); + +#if defined(HAVE_PTHREADS) || (defined(__linux__) && defined(__powerpc__)) // Setup pthread attributes extern void Set_pthread_attr(pthread_attr_t *attr, int priority); +#endif // Various definitions typedef struct rgb_color { @@ -355,15 +426,34 @@ typedef struct rgb_color { uint8 alpha; } 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) +#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); +#else +#define XDisplayLock() +#define XDisplayUnlock() +#endif +#ifdef X11_LOCK_TYPE +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" {