--- np2/i386c/ia32/interface.h	2004/03/05 14:17:35	1.9
+++ np2/i386c/ia32/interface.h	2011/12/21 17:32:49	1.21
@@ -1,5 +1,3 @@
-/*	$Id: interface.h,v 1.9 2004/03/05 14:17:35 monaka Exp $	*/
-
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
  * All rights reserved.
@@ -12,8 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -30,34 +26,49 @@
 #ifndef	IA32_CPU_INTERFACE_H__
 #define	IA32_CPU_INTERFACE_H__
 
+#ifndef CPUCALL
+#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
 #endif
 
-#define CPU_isDI		(!(CPU_FLAG & I_FLAG))
 #define CPU_isEI		(CPU_FLAG & I_FLAG)
+#define CPU_isDI		(!CPU_isEI)
+#define	CPU_A20EN(en)		CPU_ADRSMASK = (en)?0xffffffff:0x000fffff;
 
-#define CPU_INITIALIZE()	i386c_initialize()
+#define CPU_INITIALIZE()		i386c_initialize()
 #define	CPU_DEINITIALIZE()
-#define	CPU_RESET()		ia32reset()
-#define	CPU_CLEARPREFETCH()	CPU_PREFETCH_CLEAR()
-#define	CPU_INTERRUPT(vect)	ia32_interrupt(vect)
-#define	CPU_EXEC()		ia32()
-#define	CPU_EXECV30()		ia32()
-#define	CPU_SHUT()		ia32shut()
-#define	CPU_SETEXTSIZE(size)	ia32_setextsize((UINT32)size << 20)
-#define CPU_SETEMM(frame, addr)
-
-#define	cpu_memorywrite(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_w(a)	i286_memoryread_w(a)
-#define	cpu_memoryread_d(a)	i286_memoryread_d(a)
+#define	CPU_RESET()			ia32reset()
+#define	CPU_CLEARPREFETCH()
+#define	CPU_INTERRUPT(vect, soft)	ia32_interrupt(vect, soft)
+#define	CPU_EXEC()			ia32()
+#define	CPU_EXECV30()			ia32()
+#define	CPU_SHUT()			ia32shut()
+#define	CPU_SETEXTSIZE(size)		ia32_setextsize((UINT32)(size) << 20)
+#define CPU_SETEMM(frame, addr)		ia32_setemm(frame, addr)
+
+#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);