--- np2/i386c/ia32/interface.h	2004/01/23 15:05:05	1.4
+++ np2/i386c/ia32/interface.h	2004/03/12 13:34:08	1.11
@@ -1,4 +1,4 @@
-/*	$Id: interface.h,v 1.4 2004/01/23 15:05:05 yui Exp $	*/
+/*	$Id: interface.h,v 1.11 2004/03/12 13:34:08 monaka Exp $	*/
 
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
@@ -30,30 +30,35 @@
 #ifndef	IA32_CPU_INTERFACE_H__
 #define	IA32_CPU_INTERFACE_H__
 
-typedef signed char		SBYTE;
-typedef signed short		SWORD;
-typedef signed int		SDWORD;
+#if !defined(QWORD_CONST)
+#define	QWORD_CONST(v)	v ## ULL
+#define	SQWORD_CONST(v)	v ## LL
+#endif
 
-typedef	UINT64			QWORD;
-typedef	SINT64			SQWORD;
+#define CPU_isEI		(CPU_FLAG & I_FLAG)
+#define CPU_isDI		(!CPU_isEI)
 
-#define CPU_isDI	(!(CPU_FLAG & I_FLAG))
-#define CPU_isEI	(CPU_FLAG & I_FLAG)
-
-#define CPU_INITIALIZE()	i386c_initialize()
+#define CPU_INITIALIZE()		i386c_initialize()
 #define	CPU_DEINITIALIZE()
-#define	CPU_RESET()		ia32reset()
-#define	CPU_CLEARPREFETCH()
-#define	CPU_INTERRUPT(a)	ia32_interrupt(a)
-#define	CPU_EXEC()		ia32()
-#define	CPU_EXECV30()		ia32()
-#define	CPU_SHUT()		ia32shut()
-#define	CPU_SETEXTMEM(s)
+#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_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)
 
-void i386c_initialize(void);
+#define	cpu_memoryread_region(a,p,l)	memp_read(a,p,l)
+#define	cpu_memorywrite_region(a,p,l)	memp_write(a,p,l)
 
-void FASTCALL msgbox_str(char *msg);
-void FASTCALL msgbox_mem(DWORD no);
-void put_cpuinfo(void);
+void i386c_initialize(void);
 
 #endif	/* IA32_CPU_INTERFACE_H__ */