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.18 by gbeauche, 2003-12-28T17:56:03Z vs.
Revision 1.20 by gbeauche, 2004-01-06T15:05:35Z

# Line 219 | Line 219 | static inline uint64 tswap64(uint64 x) {
219  
220   #ifdef __powerpc__
221   #define HAVE_TEST_AND_SET 1
222 < static inline int testandset(int *p)
222 > static inline int testandset(volatile int *p)
223   {
224          int ret;
225          __asm__ __volatile__("0:    lwarx %0,0,%1 ;"
# Line 237 | Line 237 | static inline int testandset(int *p)
237  
238   #ifdef __i386__
239   #define HAVE_TEST_AND_SET 1
240 < static inline int testandset(int *p)
240 > static inline int testandset(volatile int *p)
241   {
242 <        char ret;
242 >        int ret;
243          long int readval;
244 <        
245 <        __asm__ __volatile__("lock; cmpxchgl %3, %1; sete %0"
246 <                                                 : "=q" (ret), "=m" (*p), "=a" (readval)
247 <                                                 : "r" (1), "m" (*p), "a" (0)
244 >        /* Note: the "xchg" instruction does not need a "lock" prefix */
245 >        __asm__ __volatile__("xchgl %0, %1"
246 >                                                 : "=r" (ret), "=m" (*p), "=a" (readval)
247 >                                                 : "0" (1), "m" (*p)
248                                                   : "memory");
249          return ret;
250   }
# Line 252 | Line 252 | static inline int testandset(int *p)
252  
253   #ifdef __s390__
254   #define HAVE_TEST_AND_SET 1
255 < static inline int testandset(int *p)
255 > static inline int testandset(volatile int *p)
256   {
257          int ret;
258  
# Line 267 | Line 267 | static inline int testandset(int *p)
267  
268   #ifdef __alpha__
269   #define HAVE_TEST_AND_SET 1
270 < static inline int testandset(int *p)
270 > static inline int testandset(volatile int *p)
271   {
272          int ret;
273          unsigned long one;
# Line 287 | Line 287 | static inline int testandset(int *p)
287  
288   #ifdef __sparc__
289   #define HAVE_TEST_AND_SET 1
290 < static inline int testandset(int *p)
290 > static inline int testandset(volatile int *p)
291   {
292          int ret;
293  
# Line 302 | Line 302 | static inline int testandset(int *p)
302  
303   #ifdef __arm__
304   #define HAVE_TEST_AND_SET 1
305 < static inline int testandset(int *p)
305 > static inline int testandset(volatile int *p)
306   {
307          register unsigned int ret;
308          __asm__ __volatile__("swp %0, %1, [%2]"
# Line 317 | Line 317 | static inline int testandset(int *p)
317  
318   #if HAVE_TEST_AND_SET
319   #define HAVE_SPINLOCKS 1
320 < typedef int spinlock_t;
320 > typedef volatile int spinlock_t;
321  
322   static const spinlock_t SPIN_LOCK_UNLOCKED = 0;
323  
# Line 359 | Line 359 | typedef struct rgb_color {
359          uint8           alpha;
360   } rgb_color;
361  
362 + // X11 display fast locks
363 + #ifdef HAVE_SPINLOCKS
364 + #define X11_LOCK_TYPE spinlock_t
365 + #define X11_LOCK_INIT SPIN_LOCK_UNLOCKED
366 + #define XDisplayLock() spin_lock(&x_display_lock)
367 + #define XDisplayUnlock() spin_unlock(&x_display_lock)
368 + #elif defined(HAVE_PTHREADS)
369 + #define X11_LOCK_TYPE pthread_mutex_t
370 + #define X11_LOCK_INIT PTHREAD_MUTEX_INITIALIZER
371 + #define XDisplayLock() pthread_mutex_lock(&x_display_lock);
372 + #define XDisplayUnlock() pthread_mutex_unlock(&x_display_lock);
373 + #else
374 + #define XDisplayLock()
375 + #define XDisplayUnlock()
376 + #endif
377 + #ifdef X11_LOCK_TYPE
378 + extern X11_LOCK_TYPE x_display_lock;
379 + #endif
380 +
381   // Macro for calling MacOS routines
382   #define CallMacOS(type, tvect) call_macos((uint32)tvect)
383   #define CallMacOS1(type, tvect, arg1) call_macos1((uint32)tvect, (uint32)arg1)

Diff Legend

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