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.25 by gbeauche, 2004-02-25T22:02:59Z vs.
Revision 1.36 by gbeauche, 2005-01-30T21:48:20Z

# Line 1 | Line 1
1   /*
2   *  sysdeps.h - System dependent definitions for Linux
3   *
4 < *  SheepShaver (C) 1997-2004 Christian Bauer and Marc Hellwig
4 > *  SheepShaver (C) 1997-2005 Christian Bauer and Marc Hellwig
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 66 | Line 66
66   // Define for external components
67   #define SHEEPSHAVER 1
68  
69 < // Mac and host address space are the same
69 > // Always use Real Addressing mode on native architectures
70 > // Otherwise, use Direct Addressing mode if NATMEM_OFFSET is set
71 > #if !defined(EMULATED_PPC)
72   #define REAL_ADDRESSING 1
73 + #elif defined(__CYGWIN__)
74 + #define DIRECT_ADDRESSING 1
75 + #define DIRECT_ADDRESSING_HACK 1
76 + /*
77 +  The following address translation functions were empirically
78 +  determined on a Windows XP system running Cygwin 1.5.12-1 so
79 +  that RAM size can be maximized (up to 960 MB) and avoiding
80 +  the use of a TLB. This also takes into account reduced address
81 +  space available when the Cygwin runtime is used.
82 + */
83 + #define DIRECT_ADDRESSING_VIRT2PHYS(ADDR) \
84 +        ((ADDR) + (((ADDR)  < 0x41000000) ? 0x39000000 : 0xcf800000))
85 + #define DIRECT_ADDRESSING_PHYS2VIRT(ADDR) \
86 +        ((ADDR) - (((ADDR) >= 0x39000000) ? 0x39000000 : 0xcf800000))
87 + #elif defined(NATMEM_OFFSET)
88 + #define DIRECT_ADDRESSING 1
89 + #else
90 + #define REAL_ADDRESSING 1
91 + #endif
92  
93   #define POWERPC_ROM 1
94  
95   #if EMULATED_PPC
75 – // Handle interrupts asynchronously?
76 – #define ASYNC_IRQ 0
96   // Mac ROM is write protected when banked memory is used
97   #if REAL_ADDRESSING || DIRECT_ADDRESSING
98   # define ROM_IS_WRITE_PROTECTED 0
# Line 82 | Line 101
101   # define ROM_IS_WRITE_PROTECTED 1
102   #endif
103   // Configure PowerPC emulator
104 < #define PPC_CHECK_INTERRUPTS (ASYNC_IRQ ? 0 : 1)
104 > #define PPC_REENTRANT_JIT 1
105 > #define PPC_CHECK_INTERRUPTS 1
106   #define PPC_DECODE_CACHE 1
107   #define PPC_FLIGHT_RECORDER 1
108   #define PPC_PROFILE_COMPILE_TIME 0
109   #define PPC_PROFILE_GENERIC_CALLS 0
110   #define KPX_MAX_CPUS 1
111 + #if ENABLE_DYNGEN
112 + // Don't bother with predecode cache when using JIT
113 + #define PPC_ENABLE_JIT 1
114 + #undef  PPC_DECODE_CACHE
115 + #endif
116 + #if defined(__i386__)
117 + #define DYNGEN_ASM_OPTS 1
118 + #endif
119   #else
120   // Mac ROM is write protected
121   #define ROM_IS_WRITE_PROTECTED 1
# Line 247 | Line 275 | static inline int testandset(volatile in
275   }
276   #endif
277  
278 < #ifdef __i386__
278 > /* FIXME: SheepShaver occasionnally hangs with those locks */
279 > #if 0 && (defined(__i386__) || defined(__x86_64__))
280   #define HAVE_TEST_AND_SET 1
281   static inline int testandset(volatile int *p)
282   {
283 <        int ret;
255 <        long int readval;
283 >        long int ret;
284          /* Note: the "xchg" instruction does not need a "lock" prefix */
285 <        __asm__ __volatile__("xchgl %0, %1"
286 <                                                 : "=r" (ret), "=m" (*p), "=a" (readval)
285 >        __asm__ __volatile__("xchgl %k0, %1"
286 >                                                 : "=r" (ret), "=m" (*p)
287                                                   : "0" (1), "m" (*p)
288                                                   : "memory");
289          return ret;
# Line 327 | Line 355 | static inline int testandset(volatile in
355  
356   #endif /* __GNUC__ */
357  
330 – #if HAVE_TEST_AND_SET
331 – #define HAVE_SPINLOCKS 1
358   typedef volatile int spinlock_t;
359  
360   static const spinlock_t SPIN_LOCK_UNLOCKED = 0;
361  
362 + #if HAVE_TEST_AND_SET
363 + #define HAVE_SPINLOCKS 1
364   static inline void spin_lock(spinlock_t *lock)
365   {
366          while (testandset(lock));
# Line 347 | Line 375 | static inline int spin_trylock(spinlock_
375   {
376          return !testandset(lock);
377   }
378 + #else
379 + static inline void spin_lock(spinlock_t *lock)
380 + {
381 + }
382 +
383 + static inline void spin_unlock(spinlock_t *lock)
384 + {
385 + }
386 +
387 + static inline int spin_trylock(spinlock_t *lock)
388 + {
389 +        return 1;
390 + }
391   #endif
392  
393   // Time data type for Time Manager emulation
# Line 393 | Line 434 | extern X11_LOCK_TYPE x_display_lock;
434   #endif
435  
436   // Macro for calling MacOS routines
437 < #define CallMacOS(type, tvect) call_macos((uint32)tvect)
438 < #define CallMacOS1(type, tvect, arg1) call_macos1((uint32)tvect, (uint32)arg1)
439 < #define CallMacOS2(type, tvect, arg1, arg2) call_macos2((uint32)tvect, (uint32)arg1, (uint32)arg2)
440 < #define CallMacOS3(type, tvect, arg1, arg2, arg3) call_macos3((uint32)tvect, (uint32)arg1, (uint32)arg2, (uint32)arg3)
441 < #define CallMacOS4(type, tvect, arg1, arg2, arg3, arg4) call_macos4((uint32)tvect, (uint32)arg1, (uint32)arg2, (uint32)arg3, (uint32)arg4)
442 < #define CallMacOS5(type, tvect, arg1, arg2, arg3, arg4, arg5) call_macos5((uint32)tvect, (uint32)arg1, (uint32)arg2, (uint32)arg3, (uint32)arg4, (uint32)arg5)
443 < #define CallMacOS6(type, tvect, arg1, arg2, arg3, arg4, arg5, arg6) call_macos6((uint32)tvect, (uint32)arg1, (uint32)arg2, (uint32)arg3, (uint32)arg4, (uint32)arg5, (uint32)arg6)
444 < #define CallMacOS7(type, tvect, arg1, arg2, arg3, arg4, arg5, arg6, arg7) call_macos7((uint32)tvect, (uint32)arg1, (uint32)arg2, (uint32)arg3, (uint32)arg4, (uint32)arg5, (uint32)arg6, (uint32)arg7)
437 > #define CallMacOS(type, tvect) call_macos((uintptr)tvect)
438 > #define CallMacOS1(type, tvect, arg1) call_macos1((uintptr)tvect, (uintptr)arg1)
439 > #define CallMacOS2(type, tvect, arg1, arg2) call_macos2((uintptr)tvect, (uintptr)arg1, (uintptr)arg2)
440 > #define CallMacOS3(type, tvect, arg1, arg2, arg3) call_macos3((uintptr)tvect, (uintptr)arg1, (uintptr)arg2, (uintptr)arg3)
441 > #define CallMacOS4(type, tvect, arg1, arg2, arg3, arg4) call_macos4((uintptr)tvect, (uintptr)arg1, (uintptr)arg2, (uintptr)arg3, (uintptr)arg4)
442 > #define CallMacOS5(type, tvect, arg1, arg2, arg3, arg4, arg5) call_macos5((uintptr)tvect, (uintptr)arg1, (uintptr)arg2, (uintptr)arg3, (uintptr)arg4, (uintptr)arg5)
443 > #define CallMacOS6(type, tvect, arg1, arg2, arg3, arg4, arg5, arg6) call_macos6((uintptr)tvect, (uintptr)arg1, (uintptr)arg2, (uintptr)arg3, (uintptr)arg4, (uintptr)arg5, (uintptr)arg6)
444 > #define CallMacOS7(type, tvect, arg1, arg2, arg3, arg4, arg5, arg6, arg7) call_macos7((uintptr)tvect, (uintptr)arg1, (uintptr)arg2, (uintptr)arg3, (uintptr)arg4, (uintptr)arg5, (uintptr)arg6, (uintptr)arg7)
445  
446   #ifdef __cplusplus
447   extern "C" {

Diff Legend

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