--- np2/i386c/ia32/interface.h	2004/03/05 14:17:35	1.9
+++ np2/i386c/ia32/interface.h	2004/03/23 15:29:34	1.12
@@ -1,4 +1,4 @@
-/*	$Id: interface.h,v 1.9 2004/03/05 14:17:35 monaka Exp $	*/
+/*	$Id: interface.h,v 1.12 2004/03/23 15:29:34 monaka Exp $	*/
 
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
@@ -35,24 +35,26 @@
 #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_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_RESET()			ia32reset()
+#define	CPU_CLEARPREFETCH()		CPU_PREFETCH_CLEAR()
+#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)
 
 #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)