--- np2/i286c/i286c_fe.c	2003/10/19 14:56:15	1.4
+++ np2/i286c/i286c_fe.c	2003/11/28 08:01:32	1.8
@@ -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
@@ -22,11 +21,11 @@ I286_F6 _inc_ea8(UINT op) {
 
 	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) {
 			BYTE value = i286_memoryread(madr);
 			BYTE_INC(value)
@@ -45,11 +44,11 @@ I286_F6 _dec_ea8(UINT op) {
 
 	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) {
 			BYTE value = i286_memoryread(madr);
 			BYTE_DEC(value)
@@ -68,11 +67,11 @@ I286_F6 _inc_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)) {
 			UINT16 value = i286_memoryread_w(madr);
 			WORD_INC(value)
@@ -91,11 +90,11 @@ I286_F6 _dec_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)) {
 			UINT16 value = i286_memoryread_w(madr);
 			WORD_DEC(value)
@@ -113,11 +112,11 @@ I286_F6 _call_ea16(UINT op) {
 
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(7);
-		src = *(reg16_b20[op]);
+		src = *(REG16_B20(op));
 	}
 	else {
 		I286_WORKCLOCK(11);
-		src = i286_memoryread_w(c_calc_ea_dst[op]());
+		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) {
 
+	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 {
@@ -144,22 +145,24 @@ I286_F6 _jmp_ea16(UINT op) {
 
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(7);
-		I286_IP = *(reg16_b20[op]);
+		I286_IP = *(REG16_B20(op));
 	}
 	else {
 		I286_WORKCLOCK(11);
-		I286_IP = i286_memoryread_w(c_calc_ea_dst[op]());
+		I286_IP = i286_memoryread_w(CALC_EA(op));
 	}
 }
 
 I286_F6 _jmp_far_ea16(UINT op) {
 
+	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 {
@@ -173,11 +176,11 @@ I286_F6 _push_ea16(UINT op) {
 
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(3);
-		src = *(reg16_b20[op]);
+		src = *(REG16_B20(op));
 	}
 	else {
 		I286_WORKCLOCK(5);
-		src = i286_memoryread_w(c_calc_ea_dst[op]());
+		src = i286_memoryread_w(CALC_EA(op));
 	}
 	REGPUSH0(src);
 }
@@ -189,10 +192,10 @@ I286_F6 _pop_ea16(UINT op) {
 	REGPOP0(src);
 	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);
 	}
 }