--- uae/src/md-i386-gcc/memory.h	2018/04/24 16:39:33	1.1
+++ uae/src/md-i386-gcc/memory.h	2018/04/24 16:40:30	1.1.1.2
@@ -6,57 +6,58 @@
   * Copyright 1996 Bernd Schmidt
   */
 
-
-static __inline__ ULONG do_get_mem_long(ULONG *a)
+static __inline__ uae_u32 do_get_mem_long(uae_u32 *a)
 {
-    ULONG retval;
+    uae_u32 retval;
 
     __asm__ ("bswapl %0" : "=r" (retval) : "0" (*a) : "cc");
     return retval;
 }
 
-static __inline__ ULONG do_get_mem_word(UWORD *a)
+static __inline__ uae_u32 do_get_mem_word(uae_u16 *a)
 {
-    ULONG retval;
+    uae_u32 retval;
 
-    __asm__ ("movzwl %1,%k0\n\trolw $8,%w0" : "=r" (retval) : "m" (*a) : "cc");
+#ifdef X86_PPRO_OPT
+    __asm__ ("movzwl %w1,%k0\n\tshll $16,%k0\n\tbswapl %k0\n" : "=&r" (retval) : "m" (*a) : "cc");
+#else
+    __asm__ ("xorl %k0,%k0\n\tmovw %w1,%w0\n\trolw $8,%w0" : "=&r" (retval) : "m" (*a) : "cc");
+#endif
     return retval;
 }
 
-static __inline__ UBYTE do_get_mem_byte(UBYTE *a)
-{
-    return *a;
-}
+#define do_get_mem_byte(a) ((uae_u32)*(a))
 
-static __inline__ void do_put_mem_long(ULONG *a, ULONG v)
+static __inline__ void do_put_mem_long(uae_u32 *a, uae_u32 v)
 {
     __asm__ ("bswapl %0" : "=r" (v) : "0" (v) : "cc");
     *a = v;
 }
 
-static __inline__ void do_put_mem_word(UWORD *a, UWORD v)
+static __inline__ void do_put_mem_word(uae_u16 *a, uae_u32 v)
 {
+#ifdef X86_PPRO_OPT
+    __asm__ ("bswapl %0" : "=&r" (v) : "0" (v << 16) : "cc");
+#else
     __asm__ ("rolw $8,%0" : "=r" (v) : "0" (v) : "cc");
+#endif
     *a = v;
 }
 
-static __inline__ void do_put_mem_byte(UBYTE *a, UBYTE v)
-{
-    *a = v;
-}
+#define do_put_mem_byte(a,v) (*(a) = (v))
 
 #if 0
-static __inline__ ULONG call_mem_get_func(mem_get_func func, CPTR addr)
+static __inline__ uae_u32 call_mem_get_func(mem_get_func func, uae_cptr addr)
 {
-    ULONG result;
+    uae_u32 result;
     __asm__("call *%1"
-	    : "=a" (result) : "r" (func) : "cc", "edx", "ecx");
+	    : "=a" (result) : "r" (func), "a" (addr) : "cc", "edx", "ecx");
     return result;
 }
 
-static __inline__ void call_mem_put_func(mem_put_func func, CPTR addr, ULONG v)
+static __inline__ void call_mem_put_func(mem_put_func func, uae_cptr addr, uae_u32 v)
 {
-    __asm__("call *%1"
+    __asm__("call *%2"
 	    : : "a" (addr), "d" (v), "r" (func) : "cc", "eax", "edx", "ecx", "memory");
 }
 #else
@@ -66,6 +67,102 @@ static __inline__ void call_mem_put_func
 
 #endif
 
-#undef USE_MAPPED_MEMORY
-#undef CAN_MAP_MEMORY
 #undef NO_INLINE_MEMORY_ACCESS
+#undef MD_HAVE_MEM_1_FUNCS
+
+#ifdef MD_HAVE_MEM_1_FUNCS
+static __inline__ uae_u32 longget_1(uae_cptr addr)
+{
+    uae_u32 result;
+
+    __asm__ ("andl $0x00FFFFFF,%1\n"
+	     "\tcmpb $0,(%1,%3)\n"
+	     "\tleal 1f,%%ecx\n"
+	     "\tje longget_stub\n"
+	     "\taddl address_space,%1\n"
+	     "\tmovl (%1),%0\n"
+	     "\tbswapl %0\n"
+	     "\t1:"
+	     : "=c" (result), "=d" (addr) : "1" (addr), "r" (good_address_map) : "cc");
+    return result;
+}
+static __inline__ uae_u32 wordget_1(uae_cptr addr)
+{
+    uae_u32 result;
+
+    __asm__ ("andl $0x00FFFFFF,%1\n"
+	     "\tcmpb $0,(%1,%3)\n"
+	     "\tleal 1f,%%ecx\n"
+	     "\tje wordget_stub\n"
+	     "\taddl address_space,%1\n"
+	     "\tmovzwl (%1),%0\n"
+	     "\trolw $8,%w0\n"
+	     "\t1:"
+	     : "=c" (result), "=d" (addr) : "1" (addr), "r" (good_address_map) : "cc");
+    return result;
+}
+static __inline__ uae_u32 byteget_1(uae_cptr addr) 
+{
+    uae_u32 result;
+
+    __asm__ ("andl $0x00FFFFFF,%1\n"
+	     "\tcmpb $0,(%1,%3)\n"
+	     "\tleal 1f,%%ecx\n"
+	     "\tje byteget_stub\n"
+	     "\taddl address_space,%1\n"
+	     "\tmovzbl (%1),%0\n"
+	     "\t1:"
+	     : "=c" (result), "=d" (addr) : "1" (addr), "r" (good_address_map) : "cc");
+    return result;
+}
+static __inline__ void longput_1(uae_cptr addr, uae_u32 l)
+{
+    __asm__ __volatile__("andl $0x00FFFFFF,%0\n"
+	     "\tcmpb $0,(%0,%3)\n"
+	     "\tleal 1f,%%ecx\n"
+	     "\tje longput_stub\n"
+	     "\taddl address_space,%0\n"
+	     "\tbswapl %1\n"
+	     "\tmovl %1,(%0)\n"
+	     "\t1:"
+	     : "=d" (addr), "=b" (l) : "0" (addr), "r" (good_address_map), "1" (l) : "cc", "memory", "ecx");
+}
+static __inline__ void wordput_1(uae_cptr addr, uae_u32 w)
+{
+    __asm__ __volatile__("andl $0x00FFFFFF,%0\n"
+	     "\tcmpb $0,(%0,%3)\n"
+	     "\tleal 1f,%%ecx\n"
+	     "\tje wordput_stub\n"
+	     "\taddl address_space,%0\n"
+	     "\trolw $8,%1\n"
+	     "\tmovw %w1,(%0)\n"
+	     "\t1:"
+	     : "=d" (addr), "=b" (w) : "0" (addr), "r" (good_address_map), "1" (w) : "cc", "memory", "ecx");
+}
+static __inline__ void byteput_1(uae_cptr addr, uae_u32 b)
+{
+    __asm__ __volatile__("andl $0x00FFFFFF,%0\n"
+	     "\tcmpb $0,(%0,%3)\n"
+	     "\tleal 1f,%%ecx\n"
+	     "\tje byteput_stub\n"
+	     "\taddl address_space,%0\n"
+	     "\tmovb %b1,(%0)\n"
+	     "\t1:"
+	     : "=d" (addr), "=b" (b) : "0" (addr), "r" (good_address_map), "1" (b) : "cc", "memory", "ecx");
+}
+
+#endif
+
+#define ALIGN_POINTER_TO32(p) ((~(unsigned long)(p)) & 3)
+
+/* Not the best place for this, but then there's no good place for a kludge
+ * like this... */
+#define HAVE_UAE_U24
+typedef struct {
+    unsigned char a, b, c;
+} __attribute__ ((packed)) uae_u24;
+
+static __inline__ uae_u24 uae24_convert (uae_u32 v)
+{
+    return *(uae_u24 *)&v;
+}