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.23 by gbeauche, 2004-01-26T13:52:31Z vs.
Revision 1.33 by gbeauche, 2004-06-15T21:37:22Z

# Line 44 | Line 44
44   #include <string.h>
45   #include <signal.h>
46  
47 + #ifdef HAVE_PTHREADS
48 + # include <pthread.h>
49 + #endif
50 +
51   #ifdef HAVE_FCNTL_H
52   # include <fcntl.h>
53   #endif
# Line 68 | Line 72
72   #define POWERPC_ROM 1
73  
74   #if EMULATED_PPC
71 – // Handle interrupts asynchronously?
72 – #define ASYNC_IRQ 0
75   // Mac ROM is write protected when banked memory is used
76   #if REAL_ADDRESSING || DIRECT_ADDRESSING
77   # define ROM_IS_WRITE_PROTECTED 0
# Line 78 | Line 80
80   # define ROM_IS_WRITE_PROTECTED 1
81   #endif
82   // Configure PowerPC emulator
83 < #define PPC_CHECK_INTERRUPTS (ASYNC_IRQ ? 0 : 1)
83 > #define PPC_REENTRANT_JIT 1
84 > #define PPC_CHECK_INTERRUPTS 1
85   #define PPC_DECODE_CACHE 1
86   #define PPC_FLIGHT_RECORDER 1
87   #define PPC_PROFILE_COMPILE_TIME 0
88   #define PPC_PROFILE_GENERIC_CALLS 0
89   #define KPX_MAX_CPUS 1
90 + #if ENABLE_DYNGEN
91 + // Don't bother with predecode cache when using JIT
92 + #define PPC_ENABLE_JIT 1
93 + #undef  PPC_DECODE_CACHE
94 + #endif
95 + #if defined(__i386__)
96 + #define DYNGEN_ASM_OPTS 1
97 + #endif
98   #else
99   // Mac ROM is write protected
100   #define ROM_IS_WRITE_PROTECTED 1
# Line 243 | Line 254 | static inline int testandset(volatile in
254   }
255   #endif
256  
257 < #ifdef __i386__
257 > /* FIXME: SheepShaver occasionnally hangs with those locks */
258 > #if 0 && (defined(__i386__) || defined(__x86_64__))
259   #define HAVE_TEST_AND_SET 1
260   static inline int testandset(volatile int *p)
261   {
262 <        int ret;
251 <        long int readval;
262 >        long int ret;
263          /* Note: the "xchg" instruction does not need a "lock" prefix */
264 <        __asm__ __volatile__("xchgl %0, %1"
265 <                                                 : "=r" (ret), "=m" (*p), "=a" (readval)
264 >        __asm__ __volatile__("xchgl %k0, %1"
265 >                                                 : "=r" (ret), "=m" (*p)
266                                                   : "0" (1), "m" (*p)
267                                                   : "memory");
268          return ret;
# Line 323 | Line 334 | static inline int testandset(volatile in
334  
335   #endif /* __GNUC__ */
336  
326 – #if HAVE_TEST_AND_SET
327 – #define HAVE_SPINLOCKS 1
337   typedef volatile int spinlock_t;
338  
339   static const spinlock_t SPIN_LOCK_UNLOCKED = 0;
340  
341 + #if HAVE_TEST_AND_SET
342 + #define HAVE_SPINLOCKS 1
343   static inline void spin_lock(spinlock_t *lock)
344   {
345          while (testandset(lock));
# Line 343 | Line 354 | static inline int spin_trylock(spinlock_
354   {
355          return !testandset(lock);
356   }
357 + #else
358 + static inline void spin_lock(spinlock_t *lock)
359 + {
360 + }
361 +
362 + static inline void spin_unlock(spinlock_t *lock)
363 + {
364 + }
365 +
366 + static inline int spin_trylock(spinlock_t *lock)
367 + {
368 +        return 1;
369 + }
370   #endif
371  
372   // Time data type for Time Manager emulation
# Line 356 | Line 380 | typedef struct timeval tm_time_t;
380   extern uint64 GetTicks_usec(void);
381   extern void Delay_usec(uint32 usec);
382  
383 + #if defined(HAVE_PTHREADS) || (defined(__linux__) && defined(__powerpc__))
384   // Setup pthread attributes
385   extern void Set_pthread_attr(pthread_attr_t *attr, int priority);
386 + #endif
387  
388   // Various definitions
389   typedef struct rgb_color {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines