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.44 by gbeauche, 2005-06-25T11:39:47Z

# 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 + #include "ppc_asm.tmpl"
86   #elif defined(__CYGWIN__)
87   #define DIRECT_ADDRESSING 1
88   #define DIRECT_ADDRESSING_HACK 1
# Line 359 | Line 372 | typedef volatile int spinlock_t;
372  
373   static const spinlock_t SPIN_LOCK_UNLOCKED = 0;
374  
375 < #if HAVE_TEST_AND_SET
375 > #if defined(HAVE_TEST_AND_SET) && defined(HAVE_PTHREADS)
376 > // There is nothing to lock if we are not in an multithreaded environment
377   #define HAVE_SPINLOCKS 1
378   static inline void spin_lock(spinlock_t *lock)
379   {
# Line 397 | Line 411 | typedef struct timespec tm_time_t;
411   typedef struct timeval tm_time_t;
412   #endif
413  
414 + /* Define codes for all the float formats that we know of.
415 + * Though we only handle IEEE format.  */
416 + #define UNKNOWN_FLOAT_FORMAT 0
417 + #define IEEE_FLOAT_FORMAT 1
418 + #define VAX_FLOAT_FORMAT 2
419 + #define IBM_FLOAT_FORMAT 3
420 + #define C4X_FLOAT_FORMAT 4
421 +
422 + // High-precision timing
423 + #if defined(HAVE_PTHREADS) && defined(HAVE_CLOCK_NANOSLEEP) && 0
424 + #define PRECISE_TIMING 1
425 + #define PRECISE_TIMING_POSIX 1
426 + #endif
427 +
428   // Timing functions
429   extern uint64 GetTicks_usec(void);
430   extern void Delay_usec(uint32 usec);
431  
432 < #if defined(HAVE_PTHREADS) || (defined(__linux__) && defined(__powerpc__))
432 > #ifdef HAVE_PTHREADS
433   // Setup pthread attributes
434   extern void Set_pthread_attr(pthread_attr_t *attr, int priority);
435   #endif
# Line 415 | Line 443 | typedef struct rgb_color {
443   } rgb_color;
444  
445   // X11 display fast locks
446 < #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)
446 > #if defined(HAVE_PTHREADS)
447   #define X11_LOCK_TYPE pthread_mutex_t
448   #define X11_LOCK_INIT PTHREAD_MUTEX_INITIALIZER
449   #define XDisplayLock() pthread_mutex_lock(&x_display_lock);
450   #define XDisplayUnlock() pthread_mutex_unlock(&x_display_lock);
451 + #elif defined(HAVE_SPINLOCKS)
452 + #define X11_LOCK_TYPE spinlock_t
453 + #define X11_LOCK_INIT SPIN_LOCK_UNLOCKED
454 + #define XDisplayLock() spin_lock(&x_display_lock)
455 + #define XDisplayUnlock() spin_unlock(&x_display_lock)
456   #else
457   #define XDisplayLock()
458   #define XDisplayUnlock()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines