--- np2/i286c/i286c_fe.c	2003/10/17 11:10:02	1.3
+++ np2/i286c/i286c_fe.c	2003/11/29 00:36:00	1.9
@@ -1,9 +1,8 @@
 #include	"compiler.h"
 #include	"i286.h"
 #include	"i286c.h"
-#include	"i286c.mcr"
 #include	"memory.h"
-#include	"nevent.h"
+#include	"i286c.mcr"
 
 
 // ------------------------------------------------------------ opecode 0xfe,f
@@ -21,14 +20,14 @@ I286_F6 _inc_ea8(UINT op) {
 	BYTE	*out;
 
 	if (op >= 0xc0) {
-		I286_CLOCK(2)
-		out = reg8_b20[op];
+		I286_WORKCLOCK(2);
+		out = REG8_B20(op);
 	}
 	else {
-		I286_CLOCK(7)
-		madr = c_calc_ea_dst[op]();
+		I286_WORKCLOCK(7);
+		madr = CALC_EA(op);
 		if (madr >= I286_MEMWRITEMAX) {
-			BYTE value = i286_memoryread(madr);
+			REG8 value = i286_memoryread(madr);
 			BYTE_INC(value)
 			i286_memorywrite(madr, value);
 			return;
@@ -44,14 +43,14 @@ I286_F6 _dec_ea8(UINT op) {
 	BYTE	*out;
 
 	if (op >= 0xc0) {
-		I286_CLOCK(2)
-		out = reg8_b20[op];
+		I286_WORKCLOCK(2);
+		out = REG8_B20(op);
 	}
 	else {
-		I286_CLOCK(7)
-		madr = c_calc_ea_dst[op]();
+		I286_WORKCLOCK(7);
+		madr = CALC_EA(op);
 		if (madr >= I286_MEMWRITEMAX) {
-			BYTE value = i286_memoryread(madr);
+			REG8 value = i286_memoryread(madr);
 			BYTE_DEC(value)
 			i286_memorywrite(madr, value);
 			return;
@@ -67,14 +66,14 @@ I286_F6 _inc_ea16(UINT op) {
 	UINT16	*out;
 
 	if (op >= 0xc0) {
-		I286_CLOCK(2)
-		out = reg16_b20[op];
+		I286_WORKCLOCK(2);
+		out = REG16_B20(op);
 	}
 	else {
-		I286_CLOCK(7)
-		madr = c_calc_ea_dst[op]();
+		I286_WORKCLOCK(7);
+		madr = CALC_EA(op);
 		if (INHIBIT_WORDP(madr)) {
-			UINT16 value = i286_memoryread_w(madr);
+			REG16 value = i286_memoryread_w(madr);
 			WORD_INC(value)
 			i286_memorywrite_w(madr, value);
 			return;
@@ -90,14 +89,14 @@ I286_F6 _dec_ea16(UINT op) {
 	UINT16	*out;
 
 	if (op >= 0xc0) {
-		I286_CLOCK(2)
-		out = reg16_b20[op];
+		I286_WORKCLOCK(2);
+		out = REG16_B20(op);
 	}
 	else {
-		I286_CLOCK(7)
-		madr = c_calc_ea_dst[op]();
+		I286_WORKCLOCK(7);
+		madr = CALC_EA(op);
 		if (INHIBIT_WORDP(madr)) {
-			UINT16 value = i286_memoryread_w(madr);
+			REG16 value = i286_memoryread_w(madr);
 			WORD_DEC(value)
 			i286_memorywrite_w(madr, value);
 			return;
@@ -112,12 +111,12 @@ I286_F6 _call_ea16(UINT op) {
 	UINT16	src;
 
 	if (op >= 0xc0) {
-		I286_CLOCK(7)
-		src = *(reg16_b20[op]);
+		I286_WORKCLOCK(7);
+		src = *(REG16_B20(op));
 	}
 	else {
-		I286_CLOCK(11)
-		src = i286_memoryread_w(c_calc_ea_dst[op]());
+		I286_WORKCLOCK(11);
+		src = i286_memoryread_w(CALC_EA(op));
 	}
 	REGPUSH0(I286_IP);
 	I286_IP = src;
@@ -125,14 +124,16 @@ I286_F6 _call_ea16(UINT op) {
 
 I286_F6 _call_far_ea16(UINT op) {
 
-	I286_CLOCK(16)
+	UINT32	seg;
+	UINT	ad;
+
+	I286_WORKCLOCK(16);
 	if (op < 0xc0) {
-		UINT16 ad = c_get_ea[op]();
+		ad = GET_EA(op, &seg);
 		REGPUSH0(I286_CS)								// ToDo
 		REGPUSH0(I286_IP)
-		I286_IP = i286_memoryread_w(ad + EA_FIX);
-		ad += 2;
-		I286_CS = i286_memoryread_w(ad + EA_FIX);
+		I286_IP = i286_memoryread_w(seg + ad);
+		I286_CS = i286_memoryread_w(seg + LOW16(ad + 2));
 		CS_BASE = I286_CS << 4;
 	}
 	else {
@@ -143,23 +144,25 @@ I286_F6 _call_far_ea16(UINT op) {
 I286_F6 _jmp_ea16(UINT op) {
 
 	if (op >= 0xc0) {
-		I286_CLOCK(7)
-		I286_IP = *(reg16_b20[op]);
+		I286_WORKCLOCK(7);
+		I286_IP = *(REG16_B20(op));
 	}
 	else {
-		I286_CLOCK(11)
-		I286_IP = i286_memoryread_w(c_calc_ea_dst[op]());
+		I286_WORKCLOCK(11);
+		I286_IP = i286_memoryread_w(CALC_EA(op));
 	}
 }
 
 I286_F6 _jmp_far_ea16(UINT op) {
 
-	I286_CLOCK(11)
+	UINT32	seg;
+	UINT	ad;
+
+	I286_WORKCLOCK(11);
 	if (op < 0xc0) {
-		UINT16 ad = c_get_ea[op]();
-		I286_IP = i286_memoryread_w(ad + EA_FIX);
-		ad += 2;
-		I286_CS = i286_memoryread_w(ad + EA_FIX);
+		ad = GET_EA(op, &seg);
+		I286_IP = i286_memoryread_w(seg + ad);
+		I286_CS = i286_memoryread_w(seg + LOW16(ad + 2));
 		CS_BASE = I286_CS << 4;
 	}
 	else {
@@ -172,12 +175,12 @@ I286_F6 _push_ea16(UINT op) {
 	UINT16	src;
 
 	if (op >= 0xc0) {
-		I286_CLOCK(3)
-		src = *(reg16_b20[op]);
+		I286_WORKCLOCK(3);
+		src = *(REG16_B20(op));
 	}
 	else {
-		I286_CLOCK(5)
-		src = i286_memoryread_w(c_calc_ea_dst[op]());
+		I286_WORKCLOCK(5);
+		src = i286_memoryread_w(CALC_EA(op));
 	}
 	REGPUSH0(src);
 }
@@ -187,12 +190,12 @@ I286_F6 _pop_ea16(UINT op) {
 	UINT16	src;
 
 	REGPOP0(src);
-	I286_CLOCK(5)
+	I286_WORKCLOCK(5);
 	if (op >= 0xc0) {
-		*(reg16_b20[op]) = src;
+		*(REG16_B20(op)) = src;
 	}
 	else {
-		i286_memorywrite_w(c_calc_ea_dst[op](), src);
+		i286_memorywrite_w(CALC_EA(op), src);
 	}
 }