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.43 by gbeauche, 2005-06-25T11:06:24Z vs.
Revision 1.57 by gbeauche, 2008-01-01T09:47:39Z

# Line 1 | Line 1
1   /*
2   *  sysdeps.h - System dependent definitions for Linux
3   *
4 < *  SheepShaver (C) 1997-2005 Christian Bauer and Marc Hellwig
4 > *  SheepShaver (C) 1997-2008 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 83 | Line 83
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
89 /*
90  The following address translation functions were empirically
91  determined on a Windows XP system running Cygwin 1.5.12-1 so
92  that RAM size can be maximized (up to 960 MB) and avoiding
93  the use of a TLB. This also takes into account reduced address
94  space available when the Cygwin runtime is used.
95 */
96 #define DIRECT_ADDRESSING_VIRT2PHYS(ADDR) \
97        ((ADDR) + (((ADDR)  < 0x41000000) ? 0x39000000 : 0xcf800000))
98 #define DIRECT_ADDRESSING_PHYS2VIRT(ADDR) \
99        ((ADDR) - (((ADDR) >= 0x39000000) ? 0x39000000 : 0xcf800000))
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 119 | Line 108
108   #define PPC_DECODE_CACHE 1
109   #define PPC_FLIGHT_RECORDER 1
110   #define PPC_PROFILE_COMPILE_TIME 0
111 < #define PPC_PROFILE_GENERIC_CALLS 0
111 > #define PPC_PROFILE_GENERIC_CALLS 1
112 > #define PPC_PROFILE_REGS_USE 0
113   #define KPX_MAX_CPUS 1
114   #if ENABLE_DYNGEN
125 // Don't bother with predecode cache when using JIT
115   #define PPC_ENABLE_JIT 1
127 #undef  PPC_DECODE_CACHE
116   #endif
117 < #if defined(__i386__)
117 > #if defined(__i386__) || defined(__x86_64__)
118   #define DYNGEN_ASM_OPTS 1
119   #endif
120   #else
# Line 179 | Line 167 | typedef int64 intptr;
167   #error "Unsupported size of pointer"
168   #endif
169  
170 + // Define if the host processor supports fast unaligned load/stores
171 + #if defined __i386__ || defined __x86_64__
172 + #define UNALIGNED_PROFITABLE 1
173 + #endif
174 +
175 +
176   /**
177   *              Helper functions to byteswap data
178   **/
# Line 288 | Line 282 | static inline int testandset(volatile in
282   }
283   #endif
284  
285 < /* FIXME: SheepShaver occasionnally hangs with those locks */
292 < #if 0 && (defined(__i386__) || defined(__x86_64__))
285 > #if defined(__i386__) || defined(__x86_64__)
286   #define HAVE_TEST_AND_SET 1
287   static inline int testandset(volatile int *p)
288   {
# Line 372 | Line 365 | typedef volatile int spinlock_t;
365  
366   static const spinlock_t SPIN_LOCK_UNLOCKED = 0;
367  
368 < #if HAVE_TEST_AND_SET
368 > #if defined(HAVE_TEST_AND_SET) && defined(HAVE_PTHREADS)
369 > // There is nothing to lock if we are not in an multithreaded environment
370   #define HAVE_SPINLOCKS 1
371   static inline void spin_lock(spinlock_t *lock)
372   {
# Line 419 | Line 413 | typedef struct timeval tm_time_t;
413   #define C4X_FLOAT_FORMAT 4
414  
415   // High-precision timing
416 < #if defined(HAVE_PTHREADS) && defined(HAVE_CLOCK_NANOSLEEP) && 0
416 > #if defined(HAVE_PTHREADS) && defined(HAVE_CLOCK_NANOSLEEP)
417   #define PRECISE_TIMING 1
418   #define PRECISE_TIMING_POSIX 1
419   #endif
# Line 442 | Line 436 | typedef struct rgb_color {
436   } rgb_color;
437  
438   // X11 display fast locks
439 < #ifdef HAVE_SPINLOCKS
446 < #define X11_LOCK_TYPE spinlock_t
447 < #define X11_LOCK_INIT SPIN_LOCK_UNLOCKED
448 < #define XDisplayLock() spin_lock(&x_display_lock)
449 < #define XDisplayUnlock() spin_unlock(&x_display_lock)
450 < #elif defined(HAVE_PTHREADS)
439 > #if defined(HAVE_PTHREADS)
440   #define X11_LOCK_TYPE pthread_mutex_t
441   #define X11_LOCK_INIT PTHREAD_MUTEX_INITIALIZER
442   #define XDisplayLock() pthread_mutex_lock(&x_display_lock);
443   #define XDisplayUnlock() pthread_mutex_unlock(&x_display_lock);
444 + #elif defined(HAVE_SPINLOCKS)
445 + #define X11_LOCK_TYPE spinlock_t
446 + #define X11_LOCK_INIT SPIN_LOCK_UNLOCKED
447 + #define XDisplayLock() spin_lock(&x_display_lock)
448 + #define XDisplayUnlock() spin_unlock(&x_display_lock)
449   #else
450   #define XDisplayLock()
451   #define XDisplayUnlock()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines