--- np2/i286c/i286c_f6.c	2003/11/21 06:51:11	1.6
+++ np2/i286c/i286c_f6.c	2003/11/29 03:38:26	1.9
@@ -18,7 +18,7 @@ I286_F6 _test_ea8_data8(UINT 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)
@@ -34,10 +34,10 @@ I286_F6 _not_ea8(UINT op) {
 	}
 	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;
 		}
@@ -58,17 +58,17 @@ I286_F6 _neg_ea8(UINT 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)
+			NEGBYTE(dst, src)
 			i286_memorywrite(madr, (BYTE)dst);
 			return;
 		}
 		out = mem + madr;
 	}
 	src = *out;
-	BYTE_NEG(dst, src)
+	NEGBYTE(dst, src)
 	*out = (BYTE)dst;
 }
 
@@ -83,7 +83,7 @@ I286_F6 _mul_ea8(UINT 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;
@@ -100,7 +100,7 @@ I286_F6 _imul_ea8(UINT 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;
@@ -114,12 +114,12 @@ I286_F6 _div_ea8(UINT op) {
 
 	ip = I286_IP;
 	if (op >= 0xc0) {
-		I286_WORKCLOCK(2);
+		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)) {
@@ -143,8 +143,8 @@ I286_F6 _idiv_ea8(UINT 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) {
@@ -170,7 +170,7 @@ I286_F6 _test_ea16_data16(UINT 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)
@@ -186,12 +186,12 @@ I286_F6 _not_ea16(UINT op) {
 	}
 	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);
 		}
@@ -211,17 +211,17 @@ I286_F6 _neg_ea16(UINT 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;
 }
 
@@ -236,7 +236,7 @@ I286_F6 _mul_ea16(UINT 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;
@@ -254,7 +254,7 @@ I286_F6 _imul_ea16(UINT 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,12 +269,12 @@ I286_F6 _div_ea16(UINT op) {
 
 	ip = I286_IP;
 	if (op >= 0xc0) {
-		I286_WORKCLOCK(17);
+		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)) {
@@ -295,12 +295,12 @@ I286_F6 _idiv_ea16(UINT op) {
 
 	ip = I286_IP;
 	if (op >= 0xc0) {
-		I286_WORKCLOCK(17);
+		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) {