--- np2/i386c/ia32/interface.h	2005/03/12 12:32:54	1.17
+++ np2/i386c/ia32/interface.h	2011/12/21 17:32:49	1.21
@@ -1,5 +1,3 @@
-/*	$Id: interface.h,v 1.17 2005/03/12 12:32:54 monaka Exp $	*/
-
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
  * All rights reserved.
@@ -32,6 +30,14 @@
 #define	CPUCALL
 #endif
 
+#ifndef	STATIC_INLINE
+#if defined(__GNUC__)
+#define	STATIC_INLINE	static INLINE __attribute__((unused))
+#else
+#define	STATIC_INLINE	static INLINE
+#endif
+#endif
+
 #if !defined(QWORD_CONST)
 #define	QWORD_CONST(v)	v ## ULL
 #define	SQWORD_CONST(v)	v ## LL
@@ -44,7 +50,7 @@
 #define CPU_INITIALIZE()		i386c_initialize()
 #define	CPU_DEINITIALIZE()
 #define	CPU_RESET()			ia32reset()
-#define	CPU_CLEARPREFETCH()		CPU_PREFETCH_CLEAR()
+#define	CPU_CLEARPREFETCH()
 #define	CPU_INTERRUPT(vect, soft)	ia32_interrupt(vect, soft)
 #define	CPU_EXEC()			ia32()
 #define	CPU_EXECV30()			ia32()
@@ -52,17 +58,17 @@
 #define	CPU_SETEXTSIZE(size)		ia32_setextsize((UINT32)(size) << 20)
 #define CPU_SETEMM(frame, addr)		ia32_setemm(frame, addr)
 
-#define	cpu_memorywrite(a,v)	i286_memorywrite(a,v)
-#define	cpu_memorywrite_b(a,v)	i286_memorywrite(a,v)
-#define	cpu_memorywrite_w(a,v)	i286_memorywrite_w(a,v)
-#define	cpu_memorywrite_d(a,v)	i286_memorywrite_d(a,v)
-#define	cpu_memoryread(a)	i286_memoryread(a)
-#define	cpu_memoryread_b(a)	i286_memoryread(a)
-#define	cpu_memoryread_w(a)	i286_memoryread_w(a)
-#define	cpu_memoryread_d(a)	i286_memoryread_d(a)
+#define	cpu_memorywrite(a,v)	memp_write8(a,v)
+#define	cpu_memorywrite_b(a,v)	memp_write8(a,v)
+#define	cpu_memorywrite_w(a,v)	memp_write16(a,v)
+#define	cpu_memorywrite_d(a,v)	memp_write32(a,v)
+#define	cpu_memoryread(a)	memp_read8(a)
+#define	cpu_memoryread_b(a)	memp_read8(a)
+#define	cpu_memoryread_w(a)	memp_read16(a)
+#define	cpu_memoryread_d(a)	memp_read32(a)
 
-#define	cpu_memoryread_region(a,p,l)	memp_read(a,p,l)
-#define	cpu_memorywrite_region(a,p,l)	memp_write(a,p,l)
+#define	cpu_memoryread_region(a,p,l)	memp_reads(a,p,l)
+#define	cpu_memorywrite_region(a,p,l)	memp_writes(a,p,l)
 
 void i386c_initialize(void);