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.51 by gbeauche, 2006-04-01T21:41:18Z

# 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 122 | Line 111
111   #define PPC_PROFILE_GENERIC_CALLS 0
112   #define KPX_MAX_CPUS 1
113   #if ENABLE_DYNGEN
125 // Don't bother with predecode cache when using JIT
114   #define PPC_ENABLE_JIT 1
127 #undef  PPC_DECODE_CACHE
115   #endif
116   #if defined(__i386__)
117   #define DYNGEN_ASM_OPTS 1
# Line 180 | Line 167 | typedef int64 intptr;
167   #endif
168  
169   /**
170 + *              Helper macros to annotate likely branch directions
171 + **/
172 +
173 + #if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
174 + #define likely(x)               __builtin_expect((x),1)
175 + #define unlikely(x)             __builtin_expect((x),0)
176 + #endif
177 + #ifndef likely
178 + #define likely(x)               (x)
179 + #endif
180 + #ifndef unlikely
181 + #define unlikely(x)             (x)
182 + #endif
183 +
184 + /**
185   *              Helper functions to byteswap data
186   **/
187  
# Line 288 | Line 290 | static inline int testandset(volatile in
290   }
291   #endif
292  
293 < /* FIXME: SheepShaver occasionnally hangs with those locks */
292 < #if 0 && (defined(__i386__) || defined(__x86_64__))
293 > #if defined(__i386__) || defined(__x86_64__)
294   #define HAVE_TEST_AND_SET 1
295   static inline int testandset(volatile int *p)
296   {
# Line 372 | Line 373 | typedef volatile int spinlock_t;
373  
374   static const spinlock_t SPIN_LOCK_UNLOCKED = 0;
375  
376 < #if HAVE_TEST_AND_SET
376 > #if defined(HAVE_TEST_AND_SET) && defined(HAVE_PTHREADS)
377 > // There is nothing to lock if we are not in an multithreaded environment
378   #define HAVE_SPINLOCKS 1
379   static inline void spin_lock(spinlock_t *lock)
380   {
# Line 419 | Line 421 | typedef struct timeval tm_time_t;
421   #define C4X_FLOAT_FORMAT 4
422  
423   // High-precision timing
424 < #if defined(HAVE_PTHREADS) && defined(HAVE_CLOCK_NANOSLEEP) && 0
424 > #if defined(HAVE_PTHREADS) && defined(HAVE_CLOCK_NANOSLEEP)
425   #define PRECISE_TIMING 1
426   #define PRECISE_TIMING_POSIX 1
427   #endif
# Line 442 | Line 444 | typedef struct rgb_color {
444   } rgb_color;
445  
446   // X11 display fast locks
447 < #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)
447 > #if defined(HAVE_PTHREADS)
448   #define X11_LOCK_TYPE pthread_mutex_t
449   #define X11_LOCK_INIT PTHREAD_MUTEX_INITIALIZER
450   #define XDisplayLock() pthread_mutex_lock(&x_display_lock);
451   #define XDisplayUnlock() pthread_mutex_unlock(&x_display_lock);
452 + #elif defined(HAVE_SPINLOCKS)
453 + #define X11_LOCK_TYPE spinlock_t
454 + #define X11_LOCK_INIT SPIN_LOCK_UNLOCKED
455 + #define XDisplayLock() spin_lock(&x_display_lock)
456 + #define XDisplayUnlock() spin_unlock(&x_display_lock)
457   #else
458   #define XDisplayLock()
459   #define XDisplayUnlock()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines