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.49 by gbeauche, 2005-11-27T16:20:17Z

# 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 + // Always use the complete non-stubs Ethernet driver
93 + #if DIRECT_ADDRESSING
94 + #define USE_ETHER_FULL_DRIVER 1
95   #endif
96  
97   #define POWERPC_ROM 1
# Line 93 | Line 113
113   #define PPC_PROFILE_GENERIC_CALLS 0
114   #define KPX_MAX_CPUS 1
115   #if ENABLE_DYNGEN
96 // Don't bother with predecode cache when using JIT
116   #define PPC_ENABLE_JIT 1
98 #undef  PPC_DECODE_CACHE
117   #endif
118   #if defined(__i386__)
119   #define DYNGEN_ASM_OPTS 1
# Line 259 | Line 277 | static inline int testandset(volatile in
277   }
278   #endif
279  
280 < /* FIXME: SheepShaver occasionnally hangs with those locks */
263 < #if 0 && (defined(__i386__) || defined(__x86_64__))
280 > #if defined(__i386__) || defined(__x86_64__)
281   #define HAVE_TEST_AND_SET 1
282   static inline int testandset(volatile int *p)
283   {
# Line 343 | Line 360 | typedef volatile int spinlock_t;
360  
361   static const spinlock_t SPIN_LOCK_UNLOCKED = 0;
362  
363 < #if HAVE_TEST_AND_SET
363 > #if defined(HAVE_TEST_AND_SET) && defined(HAVE_PTHREADS)
364 > // There is nothing to lock if we are not in an multithreaded environment
365   #define HAVE_SPINLOCKS 1
366   static inline void spin_lock(spinlock_t *lock)
367   {
# Line 381 | Line 399 | typedef struct timespec tm_time_t;
399   typedef struct timeval tm_time_t;
400   #endif
401  
402 + /* Define codes for all the float formats that we know of.
403 + * Though we only handle IEEE format.  */
404 + #define UNKNOWN_FLOAT_FORMAT 0
405 + #define IEEE_FLOAT_FORMAT 1
406 + #define VAX_FLOAT_FORMAT 2
407 + #define IBM_FLOAT_FORMAT 3
408 + #define C4X_FLOAT_FORMAT 4
409 +
410 + // High-precision timing
411 + #if defined(HAVE_PTHREADS) && defined(HAVE_CLOCK_NANOSLEEP)
412 + #define PRECISE_TIMING 1
413 + #define PRECISE_TIMING_POSIX 1
414 + #endif
415 +
416   // Timing functions
417   extern uint64 GetTicks_usec(void);
418   extern void Delay_usec(uint32 usec);
419  
420 < #if defined(HAVE_PTHREADS) || (defined(__linux__) && defined(__powerpc__))
420 > #ifdef HAVE_PTHREADS
421   // Setup pthread attributes
422   extern void Set_pthread_attr(pthread_attr_t *attr, int priority);
423   #endif
# Line 399 | Line 431 | typedef struct rgb_color {
431   } rgb_color;
432  
433   // X11 display fast locks
434 < #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)
434 > #if defined(HAVE_PTHREADS)
435   #define X11_LOCK_TYPE pthread_mutex_t
436   #define X11_LOCK_INIT PTHREAD_MUTEX_INITIALIZER
437   #define XDisplayLock() pthread_mutex_lock(&x_display_lock);
438   #define XDisplayUnlock() pthread_mutex_unlock(&x_display_lock);
439 + #elif defined(HAVE_SPINLOCKS)
440 + #define X11_LOCK_TYPE spinlock_t
441 + #define X11_LOCK_INIT SPIN_LOCK_UNLOCKED
442 + #define XDisplayLock() spin_lock(&x_display_lock)
443 + #define XDisplayUnlock() spin_unlock(&x_display_lock)
444   #else
445   #define XDisplayLock()
446   #define XDisplayUnlock()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines