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.33 by gbeauche, 2004-06-15T21:37:22Z vs.
Revision 1.48 by gbeauche, 2005-07-03T22:02:01Z

# 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 < // Mac and host address space are the same
81 > // Always use Real Addressing mode on native architectures
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(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
98  
# Line 254 | Line 279 | static inline int testandset(volatile in
279   }
280   #endif
281  
282 < /* FIXME: SheepShaver occasionnally hangs with those locks */
258 < #if 0 && (defined(__i386__) || defined(__x86_64__))
282 > #if defined(__i386__) || defined(__x86_64__)
283   #define HAVE_TEST_AND_SET 1
284   static inline int testandset(volatile int *p)
285   {
# Line 338 | Line 362 | typedef volatile int spinlock_t;
362  
363   static const spinlock_t SPIN_LOCK_UNLOCKED = 0;
364  
365 < #if HAVE_TEST_AND_SET
365 > #if defined(HAVE_TEST_AND_SET) && defined(HAVE_PTHREADS)
366 > // There is nothing to lock if we are not in an multithreaded environment
367   #define HAVE_SPINLOCKS 1
368   static inline void spin_lock(spinlock_t *lock)
369   {
# Line 376 | Line 401 | typedef struct timespec tm_time_t;
401   typedef struct timeval tm_time_t;
402   #endif
403  
404 + /* Define codes for all the float formats that we know of.
405 + * Though we only handle IEEE format.  */
406 + #define UNKNOWN_FLOAT_FORMAT 0
407 + #define IEEE_FLOAT_FORMAT 1
408 + #define VAX_FLOAT_FORMAT 2
409 + #define IBM_FLOAT_FORMAT 3
410 + #define C4X_FLOAT_FORMAT 4
411 +
412 + // High-precision timing
413 + #if defined(HAVE_PTHREADS) && defined(HAVE_CLOCK_NANOSLEEP)
414 + #define PRECISE_TIMING 1
415 + #define PRECISE_TIMING_POSIX 1
416 + #endif
417 +
418   // Timing functions
419   extern uint64 GetTicks_usec(void);
420   extern void Delay_usec(uint32 usec);
421  
422 < #if defined(HAVE_PTHREADS) || (defined(__linux__) && defined(__powerpc__))
422 > #ifdef HAVE_PTHREADS
423   // Setup pthread attributes
424   extern void Set_pthread_attr(pthread_attr_t *attr, int priority);
425   #endif
# Line 394 | Line 433 | typedef struct rgb_color {
433   } rgb_color;
434  
435   // X11 display fast locks
436 < #ifdef HAVE_SPINLOCKS
398 < #define X11_LOCK_TYPE spinlock_t
399 < #define X11_LOCK_INIT SPIN_LOCK_UNLOCKED
400 < #define XDisplayLock() spin_lock(&x_display_lock)
401 < #define XDisplayUnlock() spin_unlock(&x_display_lock)
402 < #elif defined(HAVE_PTHREADS)
436 > #if defined(HAVE_PTHREADS)
437   #define X11_LOCK_TYPE pthread_mutex_t
438   #define X11_LOCK_INIT PTHREAD_MUTEX_INITIALIZER
439   #define XDisplayLock() pthread_mutex_lock(&x_display_lock);
440   #define XDisplayUnlock() pthread_mutex_unlock(&x_display_lock);
441 + #elif defined(HAVE_SPINLOCKS)
442 + #define X11_LOCK_TYPE spinlock_t
443 + #define X11_LOCK_INIT SPIN_LOCK_UNLOCKED
444 + #define XDisplayLock() spin_lock(&x_display_lock)
445 + #define XDisplayUnlock() spin_unlock(&x_display_lock)
446   #else
447   #define XDisplayLock()
448   #define XDisplayUnlock()
# Line 413 | Line 452 | extern X11_LOCK_TYPE x_display_lock;
452   #endif
453  
454   // Macro for calling MacOS routines
455 < #define CallMacOS(type, tvect) call_macos((uint32)tvect)
456 < #define CallMacOS1(type, tvect, arg1) call_macos1((uint32)tvect, (uint32)arg1)
457 < #define CallMacOS2(type, tvect, arg1, arg2) call_macos2((uint32)tvect, (uint32)arg1, (uint32)arg2)
458 < #define CallMacOS3(type, tvect, arg1, arg2, arg3) call_macos3((uint32)tvect, (uint32)arg1, (uint32)arg2, (uint32)arg3)
459 < #define CallMacOS4(type, tvect, arg1, arg2, arg3, arg4) call_macos4((uint32)tvect, (uint32)arg1, (uint32)arg2, (uint32)arg3, (uint32)arg4)
460 < #define CallMacOS5(type, tvect, arg1, arg2, arg3, arg4, arg5) call_macos5((uint32)tvect, (uint32)arg1, (uint32)arg2, (uint32)arg3, (uint32)arg4, (uint32)arg5)
461 < #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)
462 < #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)
455 > #define CallMacOS(type, tvect) call_macos((uintptr)tvect)
456 > #define CallMacOS1(type, tvect, arg1) call_macos1((uintptr)tvect, (uintptr)arg1)
457 > #define CallMacOS2(type, tvect, arg1, arg2) call_macos2((uintptr)tvect, (uintptr)arg1, (uintptr)arg2)
458 > #define CallMacOS3(type, tvect, arg1, arg2, arg3) call_macos3((uintptr)tvect, (uintptr)arg1, (uintptr)arg2, (uintptr)arg3)
459 > #define CallMacOS4(type, tvect, arg1, arg2, arg3, arg4) call_macos4((uintptr)tvect, (uintptr)arg1, (uintptr)arg2, (uintptr)arg3, (uintptr)arg4)
460 > #define CallMacOS5(type, tvect, arg1, arg2, arg3, arg4, arg5) call_macos5((uintptr)tvect, (uintptr)arg1, (uintptr)arg2, (uintptr)arg3, (uintptr)arg4, (uintptr)arg5)
461 > #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)
462 > #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)
463  
464   #ifdef __cplusplus
465   extern "C" {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines