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.34 by gbeauche, 2004-11-13T14:09:16Z vs.
Revision 1.47 by gbeauche, 2005-07-03T13:39:06Z

# Line 1 | Line 1
1   /*
2   *  sysdeps.h - System dependent definitions for Linux
3   *
4 < *  SheepShaver (C) 1997-2004 Christian Bauer and Marc Hellwig
4 > *  SheepShaver (C) 1997-2005 Christian Bauer and Marc Hellwig
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# 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  
81   // Always use Real Addressing mode on native architectures
82   // Otherwise, use Direct Addressing mode if NATMEM_OFFSET is set
83 < #if NATMEM_OFFSET == 0 || EMULATED_PPC == 0
83 > #if !defined(EMULATED_PPC)
84   #define REAL_ADDRESSING 1
85 < #else
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   #define POWERPC_ROM 1
# Line 259 | Line 274 | static inline int testandset(volatile in
274   }
275   #endif
276  
277 < /* FIXME: SheepShaver occasionnally hangs with those locks */
263 < #if 0 && (defined(__i386__) || defined(__x86_64__))
277 > #if defined(__i386__) || defined(__x86_64__)
278   #define HAVE_TEST_AND_SET 1
279   static inline int testandset(volatile int *p)
280   {
# Line 343 | Line 357 | typedef volatile int spinlock_t;
357  
358   static const spinlock_t SPIN_LOCK_UNLOCKED = 0;
359  
360 < #if HAVE_TEST_AND_SET
360 > #if defined(HAVE_TEST_AND_SET) && defined(HAVE_PTHREADS)
361 > // There is nothing to lock if we are not in an multithreaded environment
362   #define HAVE_SPINLOCKS 1
363   static inline void spin_lock(spinlock_t *lock)
364   {
# Line 381 | Line 396 | typedef struct timespec tm_time_t;
396   typedef struct timeval tm_time_t;
397   #endif
398  
399 + /* Define codes for all the float formats that we know of.
400 + * Though we only handle IEEE format.  */
401 + #define UNKNOWN_FLOAT_FORMAT 0
402 + #define IEEE_FLOAT_FORMAT 1
403 + #define VAX_FLOAT_FORMAT 2
404 + #define IBM_FLOAT_FORMAT 3
405 + #define C4X_FLOAT_FORMAT 4
406 +
407 + // High-precision timing
408 + #if defined(HAVE_PTHREADS) && defined(HAVE_CLOCK_NANOSLEEP)
409 + #define PRECISE_TIMING 1
410 + #define PRECISE_TIMING_POSIX 1
411 + #endif
412 +
413   // Timing functions
414   extern uint64 GetTicks_usec(void);
415   extern void Delay_usec(uint32 usec);
416  
417 < #if defined(HAVE_PTHREADS) || (defined(__linux__) && defined(__powerpc__))
417 > #ifdef HAVE_PTHREADS
418   // Setup pthread attributes
419   extern void Set_pthread_attr(pthread_attr_t *attr, int priority);
420   #endif
# Line 399 | Line 428 | typedef struct rgb_color {
428   } rgb_color;
429  
430   // X11 display fast locks
431 < #ifdef HAVE_SPINLOCKS
403 < #define X11_LOCK_TYPE spinlock_t
404 < #define X11_LOCK_INIT SPIN_LOCK_UNLOCKED
405 < #define XDisplayLock() spin_lock(&x_display_lock)
406 < #define XDisplayUnlock() spin_unlock(&x_display_lock)
407 < #elif defined(HAVE_PTHREADS)
431 > #if defined(HAVE_PTHREADS)
432   #define X11_LOCK_TYPE pthread_mutex_t
433   #define X11_LOCK_INIT PTHREAD_MUTEX_INITIALIZER
434   #define XDisplayLock() pthread_mutex_lock(&x_display_lock);
435   #define XDisplayUnlock() pthread_mutex_unlock(&x_display_lock);
436 + #elif defined(HAVE_SPINLOCKS)
437 + #define X11_LOCK_TYPE spinlock_t
438 + #define X11_LOCK_INIT SPIN_LOCK_UNLOCKED
439 + #define XDisplayLock() spin_lock(&x_display_lock)
440 + #define XDisplayUnlock() spin_unlock(&x_display_lock)
441   #else
442   #define XDisplayLock()
443   #define XDisplayUnlock()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines