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.40 by gbeauche, 2005-03-05T19:07:35Z vs.
Revision 1.54 by gbeauche, 2006-07-06T00:01:04Z

# 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__)
116 > #if defined(__i386__) || defined(__x86_64__)
117   #define DYNGEN_ASM_OPTS 1
118   #endif
119   #else
# Line 179 | Line 166 | typedef int64 intptr;
166   #error "Unsupported size of pointer"
167   #endif
168  
169 + // Define if the host processor supports fast unaligned load/stores
170 + #if defined __i386__ || defined __x86_64__
171 + #define UNALIGNED_PROFITABLE 1
172 + #endif
173 +
174 +
175   /**
176   *              Helper functions to byteswap data
177   **/
# Line 288 | Line 281 | static inline int testandset(volatile in
281   }
282   #endif
283  
284 < /* FIXME: SheepShaver occasionnally hangs with those locks */
292 < #if 0 && (defined(__i386__) || defined(__x86_64__))
284 > #if defined(__i386__) || defined(__x86_64__)
285   #define HAVE_TEST_AND_SET 1
286   static inline int testandset(volatile int *p)
287   {
# Line 372 | Line 364 | typedef volatile int spinlock_t;
364  
365   static const spinlock_t SPIN_LOCK_UNLOCKED = 0;
366  
367 < #if HAVE_TEST_AND_SET
367 > #if defined(HAVE_TEST_AND_SET) && defined(HAVE_PTHREADS)
368 > // There is nothing to lock if we are not in an multithreaded environment
369   #define HAVE_SPINLOCKS 1
370   static inline void spin_lock(spinlock_t *lock)
371   {
# Line 410 | Line 403 | typedef struct timespec tm_time_t;
403   typedef struct timeval tm_time_t;
404   #endif
405  
406 + /* Define codes for all the float formats that we know of.
407 + * Though we only handle IEEE format.  */
408 + #define UNKNOWN_FLOAT_FORMAT 0
409 + #define IEEE_FLOAT_FORMAT 1
410 + #define VAX_FLOAT_FORMAT 2
411 + #define IBM_FLOAT_FORMAT 3
412 + #define C4X_FLOAT_FORMAT 4
413 +
414   // High-precision timing
415   #if defined(HAVE_PTHREADS) && defined(HAVE_CLOCK_NANOSLEEP)
416   #define PRECISE_TIMING 1
# Line 420 | Line 421 | typedef struct timeval tm_time_t;
421   extern uint64 GetTicks_usec(void);
422   extern void Delay_usec(uint32 usec);
423  
424 < #if defined(HAVE_PTHREADS) || ((defined(__linux__) || defined(__NetBSD__)) && defined(__powerpc__))
424 > #ifdef HAVE_PTHREADS
425   // Setup pthread attributes
426   extern void Set_pthread_attr(pthread_attr_t *attr, int priority);
427   #endif
# Line 434 | Line 435 | typedef struct rgb_color {
435   } rgb_color;
436  
437   // X11 display fast locks
438 < #ifdef HAVE_SPINLOCKS
438 < #define X11_LOCK_TYPE spinlock_t
439 < #define X11_LOCK_INIT SPIN_LOCK_UNLOCKED
440 < #define XDisplayLock() spin_lock(&x_display_lock)
441 < #define XDisplayUnlock() spin_unlock(&x_display_lock)
442 < #elif defined(HAVE_PTHREADS)
438 > #if defined(HAVE_PTHREADS)
439   #define X11_LOCK_TYPE pthread_mutex_t
440   #define X11_LOCK_INIT PTHREAD_MUTEX_INITIALIZER
441   #define XDisplayLock() pthread_mutex_lock(&x_display_lock);
442   #define XDisplayUnlock() pthread_mutex_unlock(&x_display_lock);
443 + #elif defined(HAVE_SPINLOCKS)
444 + #define X11_LOCK_TYPE spinlock_t
445 + #define X11_LOCK_INIT SPIN_LOCK_UNLOCKED
446 + #define XDisplayLock() spin_lock(&x_display_lock)
447 + #define XDisplayUnlock() spin_unlock(&x_display_lock)
448   #else
449   #define XDisplayLock()
450   #define XDisplayUnlock()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines