--- np2/i286c/i286c.h	2003/10/17 12:49:52	1.4
+++ np2/i286c/i286c.h	2003/11/28 08:01:32	1.8
@@ -1,44 +1,26 @@
 
-#define	CPUW2TEST
-
+// #define	I286C_TEST
+#if defined(I286C_TEST)
+#undef MEMOPTIMIZE
+#endif
 
 #define I286FN	static void
-#define I286_P	static void
 #define I286EXT	void
 
 typedef void (*I286OP)(void);
-typedef UINT32 (*CALCEA)(void);
-typedef UINT16 (*CALCLEA)(void);
-typedef UINT16 (*GETLEA)(void);
-
-extern	UINT32	EA_FIX;
-extern	BYTE	*reg8_b53[256];
-extern	BYTE	*reg8_b20[256];
-extern	UINT16	*reg16_b53[256];
-extern	UINT16	*reg16_b20[256];
-extern	BYTE	szpcflag[0x200];
-extern	CALCEA	c_calc_ea_dst[];
-extern	CALCLEA	c_calc_lea[];
-extern	GETLEA	c_get_ea[];
-
-#if !defined(CPUW2TEST)
-extern	BYTE	szpflag_w[0x10000];
-#endif
 
+extern	BYTE	_szpcflag[0x200];
 
-extern void CPUCALL i286_intnum(UINT vect, UINT16 IP);
+extern void CPUCALL i286_intnum(UINT vect, UINT IP);
 
+#if !defined(MEMOPTIMIZE) || (MEMOPTIMIZE < 2)
+extern void i286cea_initialize(void);
+#endif
 
 extern const I286OP i286op[];
 extern const I286OP i286op_repe[];
 extern const I286OP i286op_repne[];
 
-
-extern const CALCEA i286c_ea_dst_tbl[];
-extern const CALCLEA i286c_lea_tbl[];
-extern const GETLEA i286c_ea_tbl[];
-
-
 #define	I286_0F	static void CPUCALL
 typedef void (CPUCALL * I286OP_0F)(UINT op);