ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/SheepShaver/src/Unix/sysdeps.h

Comparing SheepShaver/src/Unix/sysdeps.h (file contents):
Revision 1.39 by gbeauche, 2005-02-27T21:52:06Z vs.
Revision 1.48 by gbeauche, 2005-07-03T22:02:01Z

#	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	+	#if DIRECT_ADDRESSING
94	+	#define USE_ETHER_FULL_DRIVER 1
95	+	#endif
96	+
97		#define POWERPC_ROM 1
98
99		#if EMULATED_PPC
#	Line 288 | Line 279 | static inline int testandset(volatile in
279		}
280		#endif
281
282	<	/* FIXME: SheepShaver occasionnally hangs with those locks */
292	<	#if 0 && (defined(__i386__) || defined(__x86_64__))
282	>	#if defined(__i386__) || defined(__x86_64__)
283		#define HAVE_TEST_AND_SET 1
284		static inline int testandset(volatile int *p)
285		{
#	Line 372 | Line 362 | typedef volatile int spinlock_t;
362
363		static const spinlock_t SPIN_LOCK_UNLOCKED = 0;
364
365	<	#if HAVE_TEST_AND_SET
365	>	#if defined(HAVE_TEST_AND_SET) && defined(HAVE_PTHREADS)
366	>	// There is nothing to lock if we are not in an multithreaded environment
367		#define HAVE_SPINLOCKS 1
368		static inline void spin_lock(spinlock_t *lock)
369		{
#	Line 410 | Line 401 | typedef struct timespec tm_time_t;
401		typedef struct timeval tm_time_t;
402		#endif
403
404	+	/* Define codes for all the float formats that we know of.
405	+	* Though we only handle IEEE format.  */
406	+	#define UNKNOWN_FLOAT_FORMAT 0
407	+	#define IEEE_FLOAT_FORMAT 1
408	+	#define VAX_FLOAT_FORMAT 2
409	+	#define IBM_FLOAT_FORMAT 3
410	+	#define C4X_FLOAT_FORMAT 4
411	+
412	+	// High-precision timing
413	+	#if defined(HAVE_PTHREADS) && defined(HAVE_CLOCK_NANOSLEEP)
414	+	#define PRECISE_TIMING 1
415	+	#define PRECISE_TIMING_POSIX 1
416	+	#endif
417	+
418		// Timing functions
419		extern uint64 GetTicks_usec(void);
420		extern void Delay_usec(uint32 usec);
421
422	<	#if defined(HAVE_PTHREADS) || ((defined(__linux__) || defined(__NetBSD__)) && defined(__powerpc__))
422	>	#ifdef HAVE_PTHREADS
423		// Setup pthread attributes
424		extern void Set_pthread_attr(pthread_attr_t *attr, int priority);
425		#endif
#	Line 428 | Line 433 | typedef struct rgb_color {
433		} rgb_color;
434
435		// X11 display fast locks
436	<	#ifdef HAVE_SPINLOCKS
432	<	#define X11_LOCK_TYPE spinlock_t
433	<	#define X11_LOCK_INIT SPIN_LOCK_UNLOCKED
434	<	#define XDisplayLock() spin_lock(&x_display_lock)
435	<	#define XDisplayUnlock() spin_unlock(&x_display_lock)
436	<	#elif defined(HAVE_PTHREADS)
436	>	#if defined(HAVE_PTHREADS)
437		#define X11_LOCK_TYPE pthread_mutex_t
438		#define X11_LOCK_INIT PTHREAD_MUTEX_INITIALIZER
439		#define XDisplayLock() pthread_mutex_lock(&x_display_lock);
440		#define XDisplayUnlock() pthread_mutex_unlock(&x_display_lock);
441	+	#elif defined(HAVE_SPINLOCKS)
442	+	#define X11_LOCK_TYPE spinlock_t
443	+	#define X11_LOCK_INIT SPIN_LOCK_UNLOCKED
444	+	#define XDisplayLock() spin_lock(&x_display_lock)
445	+	#define XDisplayUnlock() spin_unlock(&x_display_lock)
446		#else
447		#define XDisplayLock()
448		#define XDisplayUnlock()

Diff Legend

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