--- np2/i286c/i286c_fe.c	2003/11/29 00:36:00	1.9
+++ np2/i286c/i286c_fe.c	2004/02/18 18:29:29	1.14
@@ -1,7 +1,6 @@
 #include	"compiler.h"
-#include	"i286.h"
+#include	"cpucore.h"
 #include	"i286c.h"
-#include	"memory.h"
 #include	"i286c.mcr"
 
 
@@ -17,7 +16,8 @@ I286_F6 _nop_int(UINT op) {
 I286_F6 _inc_ea8(UINT op) {
 
 	UINT32	madr;
-	BYTE	*out;
+	UINT8	*out;
+	REG8	res;
 
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
@@ -27,20 +27,23 @@ I286_F6 _inc_ea8(UINT op) {
 		I286_WORKCLOCK(7);
 		madr = CALC_EA(op);
 		if (madr >= I286_MEMWRITEMAX) {
-			REG8 value = i286_memoryread(madr);
-			BYTE_INC(value)
-			i286_memorywrite(madr, value);
+			res = i286_memoryread(madr);
+			INCBYTE(res)
+			i286_memorywrite(madr, res);
 			return;
 		}
 		out = mem + madr;
 	}
-	BYTE_INC(*out)
+	res = *out;
+	INCBYTE(res)
+	*out = (UINT8)res;
 }
 
 I286_F6 _dec_ea8(UINT op) {
 
 	UINT32	madr;
-	BYTE	*out;
+	UINT8	*out;
+	REG8	res;
 
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
@@ -50,20 +53,23 @@ I286_F6 _dec_ea8(UINT op) {
 		I286_WORKCLOCK(7);
 		madr = CALC_EA(op);
 		if (madr >= I286_MEMWRITEMAX) {
-			REG8 value = i286_memoryread(madr);
-			BYTE_DEC(value)
-			i286_memorywrite(madr, value);
+			res = i286_memoryread(madr);
+			DECBYTE(res)
+			i286_memorywrite(madr, res);
 			return;
 		}
 		out = mem + madr;
 	}
-	BYTE_DEC(*out)
+	res = *out;
+	DECBYTE(res)
+	*out = (UINT8)res;
 }
 
 I286_F6 _inc_ea16(UINT op) {
 
 	UINT32	madr;
 	UINT16	*out;
+	REG16	res;
 
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
@@ -73,20 +79,23 @@ I286_F6 _inc_ea16(UINT op) {
 		I286_WORKCLOCK(7);
 		madr = CALC_EA(op);
 		if (INHIBIT_WORDP(madr)) {
-			REG16 value = i286_memoryread_w(madr);
-			WORD_INC(value)
-			i286_memorywrite_w(madr, value);
+			res = i286_memoryread_w(madr);
+			INCWORD(res)
+			i286_memorywrite_w(madr, res);
 			return;
 		}
 		out = (UINT16 *)(mem + madr);
 	}
-	WORD_INC(*out)
+	res = *out;
+	INCWORD(res)
+	*out = (UINT16)res;
 }
 
 I286_F6 _dec_ea16(UINT op) {
 
 	UINT32	madr;
 	UINT16	*out;
+	REG16	res;
 
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
@@ -96,14 +105,16 @@ I286_F6 _dec_ea16(UINT op) {
 		I286_WORKCLOCK(7);
 		madr = CALC_EA(op);
 		if (INHIBIT_WORDP(madr)) {
-			REG16 value = i286_memoryread_w(madr);
-			WORD_DEC(value)
-			i286_memorywrite_w(madr, value);
+			res = i286_memoryread_w(madr);
+			DECWORD(res)
+			i286_memorywrite_w(madr, res);
 			return;
 		}
 		out = (UINT16 *)(mem + madr);
 	}
-	WORD_DEC(*out)
+	res = *out;
+	DECWORD(res)
+	*out = (UINT16)res;
 }
 
 I286_F6 _call_ea16(UINT op) {
@@ -134,7 +145,7 @@ I286_F6 _call_far_ea16(UINT op) {
 		REGPUSH0(I286_IP)
 		I286_IP = i286_memoryread_w(seg + ad);
 		I286_CS = i286_memoryread_w(seg + LOW16(ad + 2));
-		CS_BASE = I286_CS << 4;
+		CS_BASE = SEGSELECT(I286_CS);
 	}
 	else {
 		INT_NUM(6, I286_IP - 2);
@@ -163,7 +174,7 @@ I286_F6 _jmp_far_ea16(UINT op) {
 		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;
+		CS_BASE = SEGSELECT(I286_CS);
 	}
 	else {
 		INT_NUM(6, I286_IP - 2);