--- np2/i286c/i286c_f6.c	2003/10/21 11:22:05	1.5
+++ np2/i286c/i286c_f6.c	2005/02/07 14:46:10	1.16
@@ -1,7 +1,6 @@
 #include	"compiler.h"
-#include	"i286.h"
+#include	"cpucore.h"
 #include	"i286c.h"
-#include	"memory.h"
 #include	"i286c.mcr"
 
 
@@ -14,11 +13,11 @@ I286_F6 _test_ea8_data8(UINT op) {
 
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
-		dst = *(reg8_b20[op]);
+		dst = *(REG8_B20(op));
 	}
 	else {
 		I286_WORKCLOCK(6);
-		dst = i286_memoryread(c_calc_ea_dst[op]());
+		dst = i286_memoryread(CALC_EA(op));
 	}
 	GET_PCBYTE(src)
 	ANDBYTE(dst, src)
@@ -30,14 +29,14 @@ I286_F6 _not_ea8(UINT op) {
 
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
-		*(reg8_b20[op]) ^= 0xff;
+		*(REG8_B20(op)) ^= 0xff;
 	}
 	else {
 		I286_WORKCLOCK(7);
-		madr = c_calc_ea_dst[op]();
+		madr = CALC_EA(op);
 		if (madr >= I286_MEMWRITEMAX) {
-			BYTE value = i286_memoryread(madr);
-			value = ~value;
+			REG8 value = i286_memoryread(madr);
+			value ^= 0xff;
 			i286_memorywrite(madr, value);
 			return;
 		}
@@ -47,43 +46,43 @@ I286_F6 _not_ea8(UINT op) {
 
 I286_F6 _neg_ea8(UINT op) {
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT	src;
 	UINT	dst;
 	UINT32	madr;
 
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
-		out = reg8_b20[op];
+		out = REG8_B20(op);
 	}
 	else {
 		I286_WORKCLOCK(7);
-		madr = c_calc_ea_dst[op]();
+		madr = CALC_EA(op);
 		if (madr >= I286_MEMWRITEMAX) {
 			src = i286_memoryread(madr);
-			BYTE_NEG(dst, src)
-			i286_memorywrite(madr, (BYTE)dst);
+			NEGBYTE(dst, src)
+			i286_memorywrite(madr, (REG8)dst);
 			return;
 		}
 		out = mem + madr;
 	}
 	src = *out;
-	BYTE_NEG(dst, src)
-	*out = (BYTE)dst;
+	NEGBYTE(dst, src)
+	*out = (UINT8)dst;
 }
 
 I286_F6 _mul_ea8(UINT op) {
 
-	BYTE	src;
+	UINT8	src;
 	UINT	res;
 
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(13);
-		src = *(reg8_b20[op]);
+		src = *(REG8_B20(op));
 	}
 	else {
 		I286_WORKCLOCK(16);
-		src = i286_memoryread(c_calc_ea_dst[op]());
+		src = i286_memoryread(CALC_EA(op));
 	}
 	BYTE_MUL(res, I286_AL, src)
 	I286_AX = (UINT16)res;
@@ -91,16 +90,16 @@ I286_F6 _mul_ea8(UINT op) {
 
 I286_F6 _imul_ea8(UINT op) {
 
-	BYTE	src;
+	UINT8	src;
 	SINT32	res;
 
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(13);
-		src = *(reg8_b20[op]);
+		src = *(REG8_B20(op));
 	}
 	else {
 		I286_WORKCLOCK(16);
-		src = i286_memoryread(c_calc_ea_dst[op]());
+		src = i286_memoryread(CALC_EA(op));
 	}
 	BYTE_IMUL(res, I286_AL, src)
 	I286_AX = (UINT16)res;
@@ -109,20 +108,20 @@ I286_F6 _imul_ea8(UINT op) {
 I286_F6 _div_ea8(UINT op) {
 
 	UINT16	tmp;
-	BYTE	src;
+	UINT8	src;
 	UINT16	ip;
 
 	ip = I286_IP;
 	if (op >= 0xc0) {
-		I286_WORKCLOCK(2);
-		src = *(reg8_b20[op]);
+		I286_WORKCLOCK(14);
+		src = *(REG8_B20(op));
 	}
 	else {
-		I286_WORKCLOCK(7);
-		src = i286_memoryread(c_calc_ea_dst[op]());
+		I286_WORKCLOCK(17);
+		src = i286_memoryread(CALC_EA(op));
 	}
 	tmp = I286_AX;
-	if (tmp < ((UINT16)src << 8)) {
+	if ((src) && (tmp < ((UINT16)src << 8))) {
 		I286_AL = tmp / src;
 		I286_AH = tmp % src;
 	}
@@ -134,23 +133,23 @@ I286_F6 _div_ea8(UINT op) {
 I286_F6 _idiv_ea8(UINT op) {
 
 	SINT16	tmp, r;
-	char	src;
+	SINT8	src;
 	UINT16	ip;
 
 	ip = I286_IP;
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(17);
-		src = *(reg8_b20[op]);
+		src = *(REG8_B20(op));
 	}
 	else {
-		I286_WORKCLOCK(25);
-		src = i286_memoryread(c_calc_ea_dst[op]());
+		I286_WORKCLOCK(20);
+		src = i286_memoryread(CALC_EA(op));
 	}
 	tmp = (SINT16)I286_AX;
 	if (src) {
 		r = tmp / src;
 		if (!((r + 0x80) & 0xff00)) {
-			I286_AL = (char)r;
+			I286_AL = (UINT8)r;
 			I286_AH = tmp % src;
 			return;
 		}
@@ -166,11 +165,11 @@ I286_F6 _test_ea16_data16(UINT op) {
 
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
-		dst = *(reg16_b20[op]);
+		dst = *(REG16_B20(op));
 	}
 	else {
 		I286_WORKCLOCK(6);
-		dst = i286_memoryread_w(c_calc_ea_dst[op]());
+		dst = i286_memoryread_w(CALC_EA(op));
 	}
 	GET_PCWORD(src)
 	ANDWORD(dst, src)
@@ -182,16 +181,16 @@ I286_F6 _not_ea16(UINT op) {
 
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
-		*(reg16_b20[op]) ^= 0xffff;
+		*(REG16_B20(op)) ^= 0xffff;
 	}
 	else {
 		I286_WORKCLOCK(7);
-		madr = c_calc_ea_dst[op]();
+		madr = CALC_EA(op);
 		if (!(INHIBIT_WORDP(madr))) {
 			*(mem + madr) ^= 0xffff;
 		}
 		else {
-			UINT16 value = i286_memoryread_w(madr);
+			REG16 value = i286_memoryread_w(madr);
 			value = ~value;
 			i286_memorywrite_w(madr, value);
 		}
@@ -207,21 +206,21 @@ I286_F6 _neg_ea16(UINT op) {
 
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
-		out = reg16_b20[op];
+		out = REG16_B20(op);
 	}
 	else {
 		I286_WORKCLOCK(7);
-		madr = c_calc_ea_dst[op]();
+		madr = CALC_EA(op);
 		if (INHIBIT_WORDP(madr)) {
 			src = i286_memoryread_w(madr);
-			WORD_NEG(dst, src)
-			i286_memorywrite_w(madr, (UINT16)dst);
+			NEGWORD(dst, src)
+			i286_memorywrite_w(madr, (REG16)dst);
 			return;
 		}
 		out = (UINT16 *)(mem + madr);
 	}
 	src = *out;
-	WORD_NEG(dst, src)
+	NEGWORD(dst, src)
 	*out = (UINT16)dst;
 }
 
@@ -232,11 +231,11 @@ I286_F6 _mul_ea16(UINT op) {
 
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(21);
-		src = *(reg16_b20[op]);
+		src = *(REG16_B20(op));
 	}
 	else {
 		I286_WORKCLOCK(24);
-		src = i286_memoryread_w(c_calc_ea_dst[op]());
+		src = i286_memoryread_w(CALC_EA(op));
 	}
 	WORD_MUL(res, I286_AX, src)
 	I286_AX = (UINT16)res;
@@ -250,11 +249,11 @@ I286_F6 _imul_ea16(UINT op) {
 
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(21);
-		src = *(reg16_b20[op]);
+		src = *(REG16_B20(op));
 	}
 	else {
 		I286_WORKCLOCK(24);
-		src = i286_memoryread_w(c_calc_ea_dst[op]());
+		src = i286_memoryread_w(CALC_EA(op));
 	}
 	WORD_IMUL(res, I286_AX, src)
 	I286_AX = (UINT16)res;
@@ -269,17 +268,17 @@ I286_F6 _div_ea16(UINT op) {
 
 	ip = I286_IP;
 	if (op >= 0xc0) {
-		I286_WORKCLOCK(17);
-		src = *(reg16_b20[op]);
+		I286_WORKCLOCK(22);
+		src = *(REG16_B20(op));
 	}
 	else {
 		I286_WORKCLOCK(25);
-		src = i286_memoryread_w(c_calc_ea_dst[op]());
+		src = i286_memoryread_w(CALC_EA(op));
 	}
 	tmp = (I286_DX << 16) + I286_AX;
-	if (tmp < (src << 16)) {
-		I286_AX = (SINT16)(tmp / src);
-		I286_DX = (SINT16)(tmp % src);
+	if ((src) && (tmp < (src << 16))) {
+		I286_AX = tmp / src;
+		I286_DX = tmp % src;
 	}
 	else {
 		INT_NUM(0, ip - 2);										// 80x86
@@ -295,12 +294,12 @@ I286_F6 _idiv_ea16(UINT op) {
 
 	ip = I286_IP;
 	if (op >= 0xc0) {
-		I286_WORKCLOCK(17);
-		src = *(reg16_b20[op]);
+		I286_WORKCLOCK(25);
+		src = *(REG16_B20(op));
 	}
 	else {
-		I286_WORKCLOCK(25);
-		src = i286_memoryread_w(c_calc_ea_dst[op]());
+		I286_WORKCLOCK(28);
+		src = i286_memoryread_w(CALC_EA(op));
 	}
 	tmp = (SINT32)((I286_DX << 16) + I286_AX);
 	if (src) {