ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/SheepShaver/src/Unix/sysdeps.h
(Generate patch)

Comparing SheepShaver/src/Unix/sysdeps.h (file contents):
Revision 1.36 by gbeauche, 2005-01-30T21:48:20Z vs.
Revision 1.52 by gbeauche, 2006-05-02T19:33:10Z

# Line 41 | Line 41
41   #include <assert.h>
42   #include <stdio.h>
43   #include <stdlib.h>
44 + #include <stddef.h>
45   #include <string.h>
46   #include <signal.h>
47  
# Line 63 | Line 64
64   # endif
65   #endif
66  
67 + // Fix offsetof() on FreeBSD and GCC >= 3.4
68 + #if defined(__FreeBSD__) && defined(__cplusplus)
69 + #undef offsetof
70 + /* The cast to "char &" below avoids problems with user-defined
71 +   "operator &", which can appear in a POD type.  */
72 + #define offsetof(TYPE, MEMBER)                          \
73 +  (__offsetof__ (reinterpret_cast <size_t>              \
74 +                 (&reinterpret_cast <char &>            \
75 +                  (static_cast<TYPE *> (0)->MEMBER))))
76 + #endif
77 +
78   // Define for external components
79   #define SHEEPSHAVER 1
80  
# Line 70 | Line 82
82   // Otherwise, use Direct Addressing mode if NATMEM_OFFSET is set
83   #if !defined(EMULATED_PPC)
84   #define REAL_ADDRESSING 1
85 < #elif defined(__CYGWIN__)
74 < #define DIRECT_ADDRESSING 1
75 < #define DIRECT_ADDRESSING_HACK 1
76 < /*
77 <  The following address translation functions were empirically
78 <  determined on a Windows XP system running Cygwin 1.5.12-1 so
79 <  that RAM size can be maximized (up to 960 MB) and avoiding
80 <  the use of a TLB. This also takes into account reduced address
81 <  space available when the Cygwin runtime is used.
82 < */
83 < #define DIRECT_ADDRESSING_VIRT2PHYS(ADDR) \
84 <        ((ADDR) + (((ADDR)  < 0x41000000) ? 0x39000000 : 0xcf800000))
85 < #define DIRECT_ADDRESSING_PHYS2VIRT(ADDR) \
86 <        ((ADDR) - (((ADDR) >= 0x39000000) ? 0x39000000 : 0xcf800000))
85 > #include "ppc_asm.tmpl"
86   #elif defined(NATMEM_OFFSET)
87   #define DIRECT_ADDRESSING 1
88   #else
89   #define REAL_ADDRESSING 1
90   #endif
91  
92 + // Always use the complete non-stubs Ethernet driver
93 + #define USE_ETHER_FULL_DRIVER 1
94 +
95   #define POWERPC_ROM 1
96  
97   #if EMULATED_PPC
# Line 109 | Line 111
111   #define PPC_PROFILE_GENERIC_CALLS 0
112   #define KPX_MAX_CPUS 1
113   #if ENABLE_DYNGEN
112 // Don't bother with predecode cache when using JIT
114   #define PPC_ENABLE_JIT 1
114 #undef  PPC_DECODE_CACHE
115   #endif
116   #if defined(__i386__)
117   #define DYNGEN_ASM_OPTS 1
# Line 275 | Line 275 | static inline int testandset(volatile in
275   }
276   #endif
277  
278 < /* FIXME: SheepShaver occasionnally hangs with those locks */
279 < #if 0 && (defined(__i386__) || defined(__x86_64__))
278 > #if defined(__i386__) || defined(__x86_64__)
279   #define HAVE_TEST_AND_SET 1
280   static inline int testandset(volatile int *p)
281   {
# Line 359 | Line 358 | typedef volatile int spinlock_t;
358  
359   static const spinlock_t SPIN_LOCK_UNLOCKED = 0;
360  
361 < #if HAVE_TEST_AND_SET
361 > #if defined(HAVE_TEST_AND_SET) && defined(HAVE_PTHREADS)
362 > // There is nothing to lock if we are not in an multithreaded environment
363   #define HAVE_SPINLOCKS 1
364   static inline void spin_lock(spinlock_t *lock)
365   {
# Line 397 | Line 397 | typedef struct timespec tm_time_t;
397   typedef struct timeval tm_time_t;
398   #endif
399  
400 + /* Define codes for all the float formats that we know of.
401 + * Though we only handle IEEE format.  */
402 + #define UNKNOWN_FLOAT_FORMAT 0
403 + #define IEEE_FLOAT_FORMAT 1
404 + #define VAX_FLOAT_FORMAT 2
405 + #define IBM_FLOAT_FORMAT 3
406 + #define C4X_FLOAT_FORMAT 4
407 +
408 + // High-precision timing
409 + #if defined(HAVE_PTHREADS) && defined(HAVE_CLOCK_NANOSLEEP)
410 + #define PRECISE_TIMING 1
411 + #define PRECISE_TIMING_POSIX 1
412 + #endif
413 +
414   // Timing functions
415   extern uint64 GetTicks_usec(void);
416   extern void Delay_usec(uint32 usec);
417  
418 < #if defined(HAVE_PTHREADS) || (defined(__linux__) && defined(__powerpc__))
418 > #ifdef HAVE_PTHREADS
419   // Setup pthread attributes
420   extern void Set_pthread_attr(pthread_attr_t *attr, int priority);
421   #endif
# Line 415 | Line 429 | typedef struct rgb_color {
429   } rgb_color;
430  
431   // X11 display fast locks
432 < #ifdef HAVE_SPINLOCKS
419 < #define X11_LOCK_TYPE spinlock_t
420 < #define X11_LOCK_INIT SPIN_LOCK_UNLOCKED
421 < #define XDisplayLock() spin_lock(&x_display_lock)
422 < #define XDisplayUnlock() spin_unlock(&x_display_lock)
423 < #elif defined(HAVE_PTHREADS)
432 > #if defined(HAVE_PTHREADS)
433   #define X11_LOCK_TYPE pthread_mutex_t
434   #define X11_LOCK_INIT PTHREAD_MUTEX_INITIALIZER
435   #define XDisplayLock() pthread_mutex_lock(&x_display_lock);
436   #define XDisplayUnlock() pthread_mutex_unlock(&x_display_lock);
437 + #elif defined(HAVE_SPINLOCKS)
438 + #define X11_LOCK_TYPE spinlock_t
439 + #define X11_LOCK_INIT SPIN_LOCK_UNLOCKED
440 + #define XDisplayLock() spin_lock(&x_display_lock)
441 + #define XDisplayUnlock() spin_unlock(&x_display_lock)
442   #else
443   #define XDisplayLock()
444   #define XDisplayUnlock()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines