--- np2/i286c/i286c.c	2003/10/16 17:57:37	1.1
+++ np2/i286c/i286c.c	2003/10/17 12:49:52	1.4
@@ -8,11 +8,7 @@
 #include	"i286c.mcr"
 
 
-	I286REGS	i286r;
-	I286STAT	i286s;
-	I286DTR		GDTR;
-	I286DTR		IDTR;
-	UINT16		MSW;
+	I286REG		i286reg;
 
 const BYTE iflags[256] = {					// Z_FLAG, S_FLAG, P_FLAG
 			0x44, 0x00, 0x00, 0x04, 0x00, 0x04, 0x04, 0x00,
@@ -51,17 +47,20 @@ const BYTE iflags[256] = {					// Z_FLAG
 
 // ----
 
-	DWORD	EA_FIX;
+	UINT32	EA_FIX;
 	BYTE	*reg8_b53[256];
 	BYTE	*reg8_b20[256];
 	UINT16	*reg16_b53[256];
 	UINT16	*reg16_b20[256];
 	BYTE	szpcflag[0x200];
-	BYTE	szpflag_w[0x10000];
 	CALCEA	c_calc_ea_dst[256];
 	CALCLEA	c_calc_lea[192];
 	GETLEA	c_get_ea[192];
 
+#if !defined(CPUW2TEST)
+	BYTE	szpflag_w[0x10000];
+#endif
+
 
 static UINT32 ea_nop(void) {
 
@@ -99,16 +98,16 @@ void i286_initialize(void) {
 		pos = ((i & 0x20)?0:1);
 #endif
 		pos += ((i >> 3) & 3) * 2;
-		reg8_b53[i] = ((BYTE *)&i286r) + pos;
+		reg8_b53[i] = ((BYTE *)&I286_REG) + pos;
 #if defined(BYTESEX_LITTLE)
 		pos = ((i & 0x4)?1:0);
 #else
 		pos = ((i & 0x4)?0:1);
 #endif
 		pos += (i & 3) * 2;
-		reg8_b20[i] = ((BYTE *)&i286r) + pos;
-		reg16_b53[i] = ((UINT16 *)&i286r) + ((i >> 3) & 7);
-		reg16_b20[i] = ((UINT16 *)&i286r) + (i & 7);
+		reg8_b20[i] = ((BYTE *)&I286_REG) + pos;
+		reg16_b53[i] = ((UINT16 *)&I286_REG) + ((i >> 3) & 7);
+		reg16_b20[i] = ((UINT16 *)&I286_REG) + (i & 7);
 	}
 
 	for (i=0; i<0xc0; i++) {
@@ -120,6 +119,8 @@ void i286_initialize(void) {
 	for (; i<0x100; i++) {
 		c_calc_ea_dst[i] = ea_nop;
 	}
+
+#if !defined(CPUW2TEST)
 	for (i=0; i<0x10000; i++) {
 		f = P_FLAG;
 		for (bit=0x80; bit; bit>>=1) {
@@ -135,24 +136,21 @@ void i286_initialize(void) {
 		}
 		szpflag_w[i] = f;
 	}
+#endif
 }
 
 void i286_reset(void) {
 
 	i286_initialize();
-	ZeroMemory(&i286r, sizeof(i286r));
-	ZeroMemory(&i286s, sizeof(i286s));
+	ZeroMemory(&i286reg, sizeof(i286reg));
 	I286_CS = 0x1fc0;
 	CS_BASE = 0x1fc00;
-	ZeroMemory(&GDTR, sizeof(GDTR));
-	ZeroMemory(&IDTR, sizeof(IDTR));
-	MSW = 0;
 }
 
 void i286_resetprefetch(void) {
 }
 
-void CPUCALL i286_intnum(DWORD vect, WORD IP) {
+void CPUCALL i286_intnum(UINT vect, UINT16 IP) {
 
 const BYTE	*ptr;
 
@@ -172,7 +170,7 @@ const BYTE	*ptr;
 
 void CPUCALL i286_interrupt(BYTE vect) {
 
-	BYTE	op;
+	UINT	op;
 const BYTE	*ptr;
 
 	op = i286_memoryread(I286_IP + CS_BASE);
@@ -189,7 +187,7 @@ const BYTE	*ptr;
 	ptr = I286_MEM + (vect * 4);
 	I286_IP = LOADINTELWORD(ptr+0);				// real mode!
 	I286_CS = LOADINTELWORD(ptr+2);				// real mode!
-	CS_BASE = (UINT32)I286_CS << 4;
+	CS_BASE = I286_CS << 4;
 	I286_CLOCK(20)
 }