--- BasiliskII/src/Unix/sysdeps.h	2000/09/22 17:14:46	1.13
+++ BasiliskII/src/Unix/sysdeps.h	2001/07/03 15:59:47	1.18
@@ -1,7 +1,7 @@
 /*
  *  sysdeps.h - System dependent definitions for Unix
  *
- *  Basilisk II (C) 1997-2000 Christian Bauer
+ *  Basilisk II (C) 1997-2001 Christian Bauer
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -69,6 +69,7 @@
 
 /* Mac ROM is not write protected */
 #define ROM_IS_WRITE_PROTECTED 0
+#define USE_SCRATCHMEM_SUBTERFUGE 1
 
 #else
 
@@ -83,7 +84,7 @@
 /* The m68k emulator uses a prefetch buffer ? */
 #define USE_PREFETCH_BUFFER 0
 
-/* Mac ROM is write protected */
+/* Mac ROM is write protected when banked memory is used */
 #if REAL_ADDRESSING || DIRECT_ADDRESSING
 # define ROM_IS_WRITE_PROTECTED 0
 # define USE_SCRATCHMEM_SUBTERFUGE 1
@@ -235,6 +236,15 @@ static inline void do_put_mem_word(uae_u
 #else
 static inline void do_put_mem_word(uae_u16 *a, uae_u32 v) {__asm__ ("rolw $8,%0" : "=r" (v) : "0" (v) : "cc"); *a = v;}
 #endif
+#define HAVE_OPTIMIZED_BYTESWAP_32
+/* bswap doesn't affect condition codes */
+static inline uae_u32 do_byteswap_32(uae_u32 v) {__asm__ ("bswap %0" : "=r" (v) : "0" (v)); return v;}
+#define HAVE_OPTIMIZED_BYTESWAP_16
+#ifdef X86_PPRO_OPT
+static inline uae_u32 do_byteswap_16(uae_u32 v) {__asm__ ("bswapl %0" : "=&r" (v) : "0" (v << 16) : "cc"); return v;}
+#else
+static inline uae_u32 do_byteswap_16(uae_u32 v) {__asm__ ("rolw $8,%0" : "=r" (v) : "0" (v) : "cc"); return v;}
+#endif
 
 #elif defined(CPU_CAN_ACCESS_UNALIGNED)
 
@@ -256,6 +266,16 @@ static inline void do_put_mem_word(uae_u
 
 #endif /* WORDS_BIGENDIAN */
 
+#ifndef HAVE_OPTIMIZED_BYTESWAP_32
+static inline uae_u32 do_byteswap_32(uae_u32 v)
+	{ return (((v >> 24) & 0xff) | ((v >> 8) & 0xff00) | ((v & 0xff) << 24) | ((v & 0xff00) << 8)); }
+#endif
+
+#ifndef HAVE_OPTIMIZED_BYTESWAP_16
+static inline uae_u32 do_byteswap_16(uae_u32 v)
+	{ return (((v >> 8) & 0xff) | ((v & 0xff) << 8)); }
+#endif
+
 #define do_get_mem_byte(a) ((uae_u32)*((uae_u8 *)(a)))
 #define do_put_mem_byte(a, v) (*(uae_u8 *)(a) = (v))
 
@@ -269,16 +289,6 @@ static inline void do_put_mem_word(uae_u
 #define ENUMNAME(name) name
 #define write_log printf
 
-#ifdef USE_COMPILER
-#define USE_MAPPED_MEMORY
-#define CAN_MAP_MEMORY
-#define NO_EXCEPTION_3
-#define NO_PREFETCH_BUFFER
-#else
-#undef USE_MAPPED_MEMORY
-#undef CAN_MAP_MEMORY
-#endif
-
 #ifdef X86_ASSEMBLY
 #define ASM_SYM_FOR_FUNC(a) __asm__(a)
 #else