--- np2/i286c/i286c_mn.c	2003/10/26 06:44:47	1.8
+++ np2/i286c/i286c_mn.c	2005/03/16 03:53:45	1.40
@@ -1,15 +1,18 @@
 #include	"compiler.h"
-#include	"i286.h"
+#include	"cpucore.h"
 #include	"i286c.h"
-#include	"memory.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"bios.h"
 #include	"i286c.mcr"
+#if defined(ENABLE_TRAP)
+#include	"inttrap.h"
+#endif
 
 
 #define	MAX_PREFIX		8
 
+
 #define	NEXT_OPCODE												\
 		if (I286_REMCLOCK < 1) {								\
 			I286_BASECLOCK += (1 - I286_REMCLOCK);				\
@@ -27,13 +30,12 @@
 
 I286FN _reserved(void) {
 
-	I286_WORKCLOCK(23);							// ToDo
 	INT_NUM(6, I286_IP - 1);
 }
 
 I286FN _add_ea_r8(void) {						// 00: add EA, REG8
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT	op;
 	UINT	src;
 	UINT	dst;
@@ -43,22 +45,22 @@ I286FN _add_ea_r8(void) {						// 00: ad
 	PREPART_EA_REG8(op, src);
 	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) {
 			dst = i286_memoryread(madr);
 			ADDBYTE(res, dst, src);
-			i286_memorywrite(madr, (BYTE)res);
+			i286_memorywrite(madr, (REG8)res);
 			return;
 		}
 		out = mem + madr;
 	}
 	dst = *out;
 	ADDBYTE(res, dst, src);
-	*out = (BYTE)res;
+	*out = (UINT8)res;
 }
 
 I286FN _add_ea_r16(void) {						// 01: add EA, REG16
@@ -73,15 +75,15 @@ I286FN _add_ea_r16(void) {						// 01: a
 	PREPART_EA_REG16(op, src);
 	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)) {
 			dst = i286_memoryread_w(madr);
 			ADDWORD(res, dst, src);
-			i286_memorywrite_w(madr, (UINT16)res);
+			i286_memorywrite_w(madr, (REG16)res);
 			return;
 		}
 		out = (UINT16 *)(mem + madr);
@@ -93,7 +95,7 @@ I286FN _add_ea_r16(void) {						// 01: a
 
 I286FN _add_r8_ea(void) {						// 02: add REG8, EA
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT	op;
 	UINT	src;
 	UINT	dst;
@@ -102,7 +104,7 @@ I286FN _add_r8_ea(void) {						// 02: ad
 	PREPART_REG8_EA(op, src, out, 2, 7);
 	dst = *out;
 	ADDBYTE(res, dst, src);
-	*out = (BYTE)res;
+	*out = (UINT8)res;
 }
 
 I286FN _add_r16_ea(void) {						// 03: add REG16, EA
@@ -127,7 +129,7 @@ I286FN _add_al_data8(void) {					// 04: 
 	I286_WORKCLOCK(3);
 	GET_PCBYTE(src);
 	ADDBYTE(res, I286_AL, src);
-	I286_AL = (BYTE)res;
+	I286_AL = (UINT8)res;
 }
 
 I286FN _add_ax_data16(void) {					// 05: add ax, DATA16
@@ -148,13 +150,16 @@ I286FN _push_es(void) {							// 06: pus
 
 I286FN _pop_es(void) {							// 07: pop es
 
-	REGPOP(I286_ES, 5)
-	ES_BASE = (UINT32)I286_ES << 4;
+	UINT	tmp;
+
+	REGPOP(tmp, 5)
+	I286_ES = tmp;
+	ES_BASE = SEGSELECT(tmp);
 }
 
 I286FN _or_ea_r8(void) {						// 08: or EA, REG8
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT	op;
 	UINT	src;
 	UINT	dst;
@@ -163,20 +168,22 @@ I286FN _or_ea_r8(void) {						// 08: or 
 	PREPART_EA_REG8(op, src);
 	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) {
 			dst = i286_memoryread(madr);
 			ORBYTE(dst, src);
-			i286_memorywrite(madr, (BYTE)dst);
+			i286_memorywrite(madr, (REG8)dst);
 			return;
 		}
 		out = mem + madr;
 	}
-	ORBYTE(*out, src);
+	dst = *out;
+	ORBYTE(dst, src);
+	*out = (UINT8)dst;
 }
 
 I286FN _or_ea_r16(void) {							// 09: or EA, REG16
@@ -190,30 +197,35 @@ I286FN _or_ea_r16(void) {							// 09: o
 	PREPART_EA_REG16(op, src);
 	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)) {
 			dst = i286_memoryread_w(madr);
 			ORWORD(dst, src);
-			i286_memorywrite_w(madr, (UINT16)dst);
+			i286_memorywrite_w(madr, (REG16)dst);
 			return;
 		}
 		out = (UINT16 *)(mem + madr);
 	}
-	ORWORD(*out, src);
+	dst = *out;
+	ORWORD(dst, src);
+	*out = (UINT16)dst;
 }
 
 I286FN _or_r8_ea(void) {						// 0a: or REG8, EA
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT	op;
 	UINT	src;
+	UINT	dst;
 
 	PREPART_REG8_EA(op, src, out, 2, 7);
-	ORBYTE(*out, src);
+	dst = *out;
+	ORBYTE(dst, src);
+	*out = (UINT8)dst;
 }
 
 I286FN _or_r16_ea(void) {						// 0b: or REG16, EA
@@ -221,27 +233,36 @@ I286FN _or_r16_ea(void) {						// 0b: or
 	UINT16	*out;
 	UINT	op;
 	UINT32	src;
+	UINT32	dst;
 
 	PREPART_REG16_EA(op, src, out, 2, 7);
-	ORWORD(*out, src);
+	dst = *out;
+	ORWORD(dst, src);
+	*out = (UINT16)dst;
 }
 
 I286FN _or_al_data8(void) {						// 0c: or al, DATA8
 
 	UINT	src;
+	UINT	dst;
 
 	I286_WORKCLOCK(3);
 	GET_PCBYTE(src);
-	ORBYTE(I286_AL, src);
+	dst = I286_AL;
+	ORBYTE(dst, src);
+	I286_AL = (UINT8)dst;
 }
 
 I286FN _or_ax_data16(void) {					// 0d: or ax, DATA16
 
 	UINT32	src;
+	UINT32	dst;
 
 	I286_WORKCLOCK(3);
 	GET_PCWORD(src);
-	ORWORD(I286_AX, src);
+	dst = I286_AX;
+	ORWORD(dst, src);
+	I286_AX = (UINT16)dst;
 }
 
 I286FN _push_cs(void) {							// 0e: push cs
@@ -251,7 +272,7 @@ I286FN _push_cs(void) {							// 0e: pus
 
 I286FN _adc_ea_r8(void) {						// 10: adc EA, REG8
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT	op;
 	UINT	src;
 	UINT	dst;
@@ -261,22 +282,22 @@ I286FN _adc_ea_r8(void) {						// 10: ad
 	PREPART_EA_REG8(op, src);
 	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) {
 			dst = i286_memoryread(madr);
 			ADCBYTE(res, dst, src);
-			i286_memorywrite(madr, (BYTE)res);
+			i286_memorywrite(madr, (REG8)res);
 			return;
 		}
 		out = mem + madr;
 	}
 	dst = *out;
 	ADCBYTE(res, dst, src);
-	*out = (BYTE)res;
+	*out = (UINT8)res;
 }
 
 I286FN _adc_ea_r16(void) {						// 11: adc EA, REG16
@@ -291,15 +312,15 @@ I286FN _adc_ea_r16(void) {						// 11: a
 	PREPART_EA_REG16(op, src);
 	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)) {
 			dst = i286_memoryread_w(madr);
 			ADCWORD(res, dst, src);
-			i286_memorywrite_w(madr, (UINT16)res);
+			i286_memorywrite_w(madr, (REG16)res);
 			return;
 		}
 		out = (UINT16 *)(mem + madr);
@@ -311,7 +332,7 @@ I286FN _adc_ea_r16(void) {						// 11: a
 
 I286FN _adc_r8_ea(void) {						// 12: adc REG8, EA
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT	op;
 	UINT	src;
 	UINT	dst;
@@ -320,7 +341,7 @@ I286FN _adc_r8_ea(void) {						// 12: ad
 	PREPART_REG8_EA(op, src, out, 2, 7);
 	dst = *out;
 	ADCBYTE(res, dst, src);
-	*out = (BYTE)res;
+	*out = (UINT8)res;
 }
 
 I286FN _adc_r16_ea(void) {						// 13: adc REG16, EA
@@ -345,7 +366,7 @@ I286FN _adc_al_data8(void) {					// 14: 
 	I286_WORKCLOCK(3);
 	GET_PCBYTE(src);
 	ADCBYTE(res, I286_AL, src);
-	I286_AL = (BYTE)res;
+	I286_AL = (UINT8)res;
 }
 
 I286FN _adc_ax_data16(void) {					// 15: adc ax, DATA16
@@ -366,15 +387,18 @@ I286FN _push_ss(void) {							// 16: pus
 
 I286FN _pop_ss(void) {							// 17: pop ss
 
-	REGPOP(I286_SS, 5)
-	SS_BASE = I286_SS << 4;
+	UINT	tmp;
+
+	REGPOP(tmp, 5)
+	I286_SS = tmp;
+	SS_BASE = SEGSELECT(tmp);
 	SS_FIX = SS_BASE;
 	NEXT_OPCODE
 }
 
 I286FN _sbb_ea_r8(void) {						// 18: sbb EA, REG8
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT	op;
 	UINT	src;
 	UINT	dst;
@@ -384,22 +408,22 @@ I286FN _sbb_ea_r8(void) {						// 18: sb
 	PREPART_EA_REG8(op, src);
 	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) {
 			dst = i286_memoryread(madr);
 			SBBBYTE(res, dst, src);
-			i286_memorywrite(madr, (BYTE)res);
+			i286_memorywrite(madr, (REG8)res);
 			return;
 		}
 		out = mem + madr;
 	}
 	dst = *out;
 	SBBBYTE(res, dst, src);
-	*out = (BYTE)res;
+	*out = (UINT8)res;
 }
 
 I286FN _sbb_ea_r16(void) {						// 19: sbb EA, REG16
@@ -414,15 +438,15 @@ I286FN _sbb_ea_r16(void) {						// 19: s
 	PREPART_EA_REG16(op, src);
 	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)) {
 			dst = i286_memoryread_w(madr);
 			SBBWORD(res, dst, src);
-			i286_memorywrite_w(madr, (UINT16)res);
+			i286_memorywrite_w(madr, (REG16)res);
 			return;
 		}
 		out = (UINT16 *)(mem + madr);
@@ -434,7 +458,7 @@ I286FN _sbb_ea_r16(void) {						// 19: s
 
 I286FN _sbb_r8_ea(void) {						// 1a: sbb REG8, EA
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT	op;
 	UINT	src;
 	UINT	dst;
@@ -443,7 +467,7 @@ I286FN _sbb_r8_ea(void) {						// 1a: sb
 	PREPART_REG8_EA(op, src, out, 2, 7);
 	dst = *out;
 	SBBBYTE(res, dst, src);
-	*out = (BYTE)res;
+	*out = (UINT8)res;
 }
 
 I286FN _sbb_r16_ea(void) {						// 1b: sbb REG16, EA
@@ -468,7 +492,7 @@ I286FN _sbb_al_data8(void) {					// 1c: 
 	I286_WORKCLOCK(3);
 	GET_PCBYTE(src);
 	SBBBYTE(res, I286_AL, src);
-	I286_AL = (BYTE)res;
+	I286_AL = (UINT8)res;
 }
 
 I286FN _sbb_ax_data16(void) {					// 1d: adc ax, DATA16
@@ -489,14 +513,17 @@ I286FN _push_ds(void) {							// 1e: pus
 
 I286FN _pop_ds(void) {							// 1f: pop ds
 
-	REGPOP(I286_DS, 5)
-	DS_BASE = I286_DS << 4;
+	UINT	tmp;
+
+	REGPOP(tmp, 5)
+	I286_DS = tmp;
+	DS_BASE = SEGSELECT(tmp);
 	DS_FIX = DS_BASE;
 }
 
 I286FN _and_ea_r8(void) {						// 20: and EA, REG8
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT	op;
 	UINT	src;
 	UINT	dst;
@@ -505,20 +532,22 @@ I286FN _and_ea_r8(void) {						// 20: an
 	PREPART_EA_REG8(op, src);
 	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) {
 			dst = i286_memoryread(madr);
 			ANDBYTE(dst, src);
-			i286_memorywrite(madr, (BYTE)dst);
+			i286_memorywrite(madr, (REG8)dst);
 			return;
 		}
 		out = mem + madr;
 	}
-	ANDBYTE(*out, src);
+	dst = *out;
+	ANDBYTE(dst, src);
+	*out = (UINT8)dst;
 }
 
 I286FN _and_ea_r16(void) {						// 21: and EA, REG16
@@ -532,30 +561,35 @@ I286FN _and_ea_r16(void) {						// 21: a
 	PREPART_EA_REG16(op, src);
 	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)) {
 			dst = i286_memoryread_w(madr);
 			ANDWORD(dst, src);
-			i286_memorywrite_w(madr, (UINT16)dst);
+			i286_memorywrite_w(madr, (REG16)dst);
 			return;
 		}
 		out = (UINT16 *)(mem + madr);
 	}
-	ANDWORD(*out, src);
+	dst = *out;
+	ANDWORD(dst, src);
+	*out = (UINT16)dst;
 }
 
 I286FN _and_r8_ea(void) {						// 22: and REG8, EA
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT	op;
 	UINT	src;
+	UINT	dst;
 
 	PREPART_REG8_EA(op, src, out, 2, 7);
-	ANDBYTE(*out, src);
+	dst = *out;
+	ANDBYTE(dst, src);
+	*out = (UINT8)dst;
 }
 
 I286FN _and_r16_ea(void) {						// 23: and REG16, EA
@@ -563,40 +597,49 @@ I286FN _and_r16_ea(void) {						// 23: a
 	UINT16	*out;
 	UINT	op;
 	UINT32	src;
+	UINT32	dst;
 
 	PREPART_REG16_EA(op, src, out, 2, 7);
-	ANDWORD(*out, src);
+	dst = *out;
+	ANDWORD(dst, src);
+	*out = (UINT16)dst;
 }
 
 I286FN _and_al_data8(void) {					// 24: and al, DATA8
 
 	UINT	src;
+	UINT	dst;
 
 	I286_WORKCLOCK(3);
 	GET_PCBYTE(src);
-	ANDBYTE(I286_AL, src);
+	dst = I286_AL;
+	ANDBYTE(dst, src);
+	I286_AL = (UINT8)dst;
 }
 
 I286FN _and_ax_data16(void) {					// 25: and ax, DATA16
 
 	UINT32	src;
+	UINT32	dst;
 
 	I286_WORKCLOCK(3);
 	GET_PCWORD(src);
-	ANDWORD(I286_AX, src);
+	dst = I286_AX;
+	ANDWORD(dst, src);
+	I286_AX = (UINT16)dst;
 }
 
 I286FN _segprefix_es(void) {					// 26: es:
 
 	SS_FIX = ES_BASE;
 	DS_FIX = ES_BASE;
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op[op]();
 		REMOVE_PREFIX
-		i286reg.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -611,7 +654,7 @@ I286FN _daa(void) {								// 27: daa
 				((I286_AL >= 0x1a) && (I286_FLAGL & C_FLAG))));
 	if ((I286_FLAGL & A_FLAG) || ((I286_AL & 0x0f) > 9)) {
 		I286_FLAGL |= A_FLAG;
-		I286_FLAGL |= (BYTE)((I286_AL + 6) >> 8);
+		I286_FLAGL |= (UINT8)((I286_AL + 6) >> 8);
 		I286_AL += 6;
 	}
 	if ((I286_FLAGL & C_FLAG) || (I286_AL > 0x9f)) {
@@ -619,12 +662,12 @@ I286FN _daa(void) {								// 27: daa
 		I286_AL += 0x60;
 	}
 	I286_FLAGL &= A_FLAG | C_FLAG;
-	I286_FLAGL |= szpcflag[I286_AL];
+	I286_FLAGL |= BYTESZPF(I286_AL);
 }
 
 I286FN _sub_ea_r8(void) {						// 28: sub EA, REG8
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT	op;
 	UINT	src;
 	UINT	dst;
@@ -634,22 +677,22 @@ I286FN _sub_ea_r8(void) {						// 28: su
 	PREPART_EA_REG8(op, src);
 	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) {
 			dst = i286_memoryread(madr);
-			BYTE_SUB(res, dst, src);
-			i286_memorywrite(madr, (BYTE)res);
+			SUBBYTE(res, dst, src);
+			i286_memorywrite(madr, (REG8)res);
 			return;
 		}
 		out = mem + madr;
 	}
 	dst = *out;
-	BYTE_SUB(res, dst, src);
-	*out = (BYTE)res;
+	SUBBYTE(res, dst, src);
+	*out = (UINT8)res;
 }
 
 I286FN _sub_ea_r16(void) {						// 29: sub EA, REG16
@@ -664,27 +707,27 @@ I286FN _sub_ea_r16(void) {						// 29: s
 	PREPART_EA_REG16(op, src);
 	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)) {
 			dst = i286_memoryread_w(madr);
-			WORD_SUB(res, dst, src);
-			i286_memorywrite_w(madr, (UINT16)res);
+			SUBWORD(res, dst, src);
+			i286_memorywrite_w(madr, (REG16)res);
 			return;
 		}
 		out = (UINT16 *)(mem + madr);
 	}
 	dst = *out;
-	WORD_SUB(res, dst, src);
+	SUBWORD(res, dst, src);
 	*out = (UINT16)res;
 }
 
 I286FN _sub_r8_ea(void) {						// 2a: sub REG8, EA
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT	op;
 	UINT	src;
 	UINT	dst;
@@ -692,8 +735,8 @@ I286FN _sub_r8_ea(void) {						// 2a: su
 
 	PREPART_REG8_EA(op, src, out, 2, 7);
 	dst = *out;
-	BYTE_SUB(res, dst, src);
-	*out = (BYTE)res;
+	SUBBYTE(res, dst, src);
+	*out = (UINT8)res;
 }
 
 I286FN _sub_r16_ea(void) {						// 2b: sub REG16, EA
@@ -706,7 +749,7 @@ I286FN _sub_r16_ea(void) {						// 2b: s
 
 	PREPART_REG16_EA(op, src, out, 2, 7);
 	dst = *out;
-	WORD_SUB(res, dst, src);
+	SUBWORD(res, dst, src);
 	*out = (UINT16)res;
 }
 
@@ -717,8 +760,8 @@ I286FN _sub_al_data8(void) {					// 2c: 
 
 	I286_WORKCLOCK(3);
 	GET_PCBYTE(src);
-	BYTE_SUB(res, I286_AL, src);
-	I286_AL = (BYTE)res;
+	SUBBYTE(res, I286_AL, src);
+	I286_AL = (UINT8)res;
 }
 
 I286FN _sub_ax_data16(void) {					// 2d: sub ax, DATA16
@@ -728,7 +771,7 @@ I286FN _sub_ax_data16(void) {					// 2d:
 
 	I286_WORKCLOCK(3);
 	GET_PCWORD(src);
-	WORD_SUB(res, I286_AX, src);
+	SUBWORD(res, I286_AX, src);
 	I286_AX = (UINT16)res;
 }
 
@@ -736,13 +779,13 @@ I286FN _segprefix_cs(void) {					// 2e: 
 
 	SS_FIX = CS_BASE;
 	DS_FIX = CS_BASE;
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op[op]();
 		REMOVE_PREFIX
-		i286reg.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -762,12 +805,12 @@ I286FN _das(void) {								// 2f: das
 		I286_AL -= 6;
 	}
 	I286_FLAGL &= A_FLAG | C_FLAG;
-	I286_FLAGL |= szpcflag[I286_AL];
+	I286_FLAGL |= BYTESZPF(I286_AL);
 }
 
 I286FN _xor_ea_r8(void) {						// 30: xor EA, REG8
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT	op;
 	UINT	src;
 	UINT	dst;
@@ -776,20 +819,22 @@ I286FN _xor_ea_r8(void) {						// 30: xo
 	PREPART_EA_REG8(op, src);
 	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) {
 			dst = i286_memoryread(madr);
-			BYTE_XOR(dst, src);
-			i286_memorywrite(madr, (BYTE)dst);
+			XORBYTE(dst, src);
+			i286_memorywrite(madr, (REG8)dst);
 			return;
 		}
 		out = mem + madr;
 	}
-	BYTE_XOR(*out, src);
+	dst = *out;
+	XORBYTE(dst, src);
+	*out = (UINT8)dst;
 }
 
 I286FN _xor_ea_r16(void) {						// 31: xor EA, REG16
@@ -803,30 +848,35 @@ I286FN _xor_ea_r16(void) {						// 31: x
 	PREPART_EA_REG16(op, src);
 	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)) {
 			dst = i286_memoryread_w(madr);
-			WORD_XOR(dst, src);
-			i286_memorywrite_w(madr, (UINT16)dst);
+			XORWORD(dst, src);
+			i286_memorywrite_w(madr, (REG16)dst);
 			return;
 		}
 		out = (UINT16 *)(mem + madr);
 	}
-	WORD_XOR(*out, src);
+	dst = *out;
+	XORWORD(dst, src);
+	*out = (UINT16)dst;
 }
 
 I286FN _xor_r8_ea(void) {						// 32: xor REG8, EA
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT	op;
 	UINT	src;
+	UINT	dst;
 
 	PREPART_REG8_EA(op, src, out, 2, 7);
-	BYTE_XOR(*out, src);
+	dst = *out;
+	XORBYTE(dst, src);
+	*out = (UINT8)dst;
 }
 
 I286FN _xor_r16_ea(void) {						// 33: or REG16, EA
@@ -834,40 +884,49 @@ I286FN _xor_r16_ea(void) {						// 33: o
 	UINT16	*out;
 	UINT	op;
 	UINT32	src;
+	UINT32	dst;
 
 	PREPART_REG16_EA(op, src, out, 2, 7);
-	WORD_XOR(*out, src);
+	dst = *out;
+	XORWORD(dst, src);
+	*out = (UINT16)dst;
 }
 
 I286FN _xor_al_data8(void) {					// 34: or al, DATA8
 
 	UINT	src;
+	UINT	dst;
 
 	I286_WORKCLOCK(3);
 	GET_PCBYTE(src);
-	BYTE_XOR(I286_AL, src);
+	dst = I286_AL;
+	XORBYTE(dst, src);
+	I286_AL = (UINT8)dst;
 }
 
 I286FN _xor_ax_data16(void) {					// 35: or ax, DATA16
 
 	UINT32	src;
+	UINT32	dst;
 
 	I286_WORKCLOCK(3);
 	GET_PCWORD(src);
-	WORD_XOR(I286_AX, src);
+	dst = I286_AX;
+	XORWORD(dst, src);
+	I286_AX = (UINT16)dst;
 }
 
 I286FN _segprefix_ss(void) {					// 36: ss:
 
 	SS_FIX = SS_BASE;
 	DS_FIX = SS_BASE;
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op[op]();
 		REMOVE_PREFIX
-		i286reg.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -885,6 +944,7 @@ I286FN _aaa(void) {								// 37: aaa
 	else {
 		I286_FLAGL &= ~(A_FLAG | C_FLAG);
 	}
+	I286_AL &= 0x0f;
 }
 
 I286FN _cmp_ea_r8(void) {						// 38: cmp EA, REG8
@@ -897,13 +957,13 @@ I286FN _cmp_ea_r8(void) {						// 38: cm
 	PREPART_EA_REG8(op, src);
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
-		dst = *(reg8_b20[op]);
-		BYTE_SUB(res, dst, src);
+		dst = *(REG8_B20(op));
+		SUBBYTE(res, dst, src);
 	}
 	else {
-		I286_WORKCLOCK(7);
-		dst = i286_memoryread(c_calc_ea_dst[op]());
-		BYTE_SUB(res, dst, src);
+		I286_WORKCLOCK(6);
+		dst = i286_memoryread(CALC_EA(op));
+		SUBBYTE(res, dst, src);
 	}
 }
 
@@ -917,19 +977,19 @@ I286FN _cmp_ea_r16(void) {						// 39: c
 	PREPART_EA_REG16(op, src);
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
-		dst = *(reg16_b20[op]);
-		WORD_SUB(res, dst, src);
+		dst = *(REG16_B20(op));
+		SUBWORD(res, dst, src);
 	}
 	else {
-		I286_WORKCLOCK(7);
-		dst = i286_memoryread_w(c_calc_ea_dst[op]());
-		WORD_SUB(res, dst, src);
+		I286_WORKCLOCK(6);
+		dst = i286_memoryread_w(CALC_EA(op));
+		SUBWORD(res, dst, src);
 	}
 }
 
 I286FN _cmp_r8_ea(void) {						// 3a: cmp REG8, EA
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT	op;
 	UINT	src;
 	UINT	dst;
@@ -937,7 +997,7 @@ I286FN _cmp_r8_ea(void) {						// 3a: cm
 
 	PREPART_REG8_EA(op, src, out, 2, 6);
 	dst = *out;
-	BYTE_SUB(res, dst, src);
+	SUBBYTE(res, dst, src);
 }
 
 I286FN _cmp_r16_ea(void) {						// 3b: cmp REG16, EA
@@ -950,7 +1010,7 @@ I286FN _cmp_r16_ea(void) {						// 3b: c
 
 	PREPART_REG16_EA(op, src, out, 2, 6);
 	dst = *out;
-	WORD_SUB(res, dst, src);
+	SUBWORD(res, dst, src);
 }
 
 I286FN _cmp_al_data8(void) {					// 3c: cmp al, DATA8
@@ -960,7 +1020,7 @@ I286FN _cmp_al_data8(void) {					// 3c: 
 
 	I286_WORKCLOCK(3);
 	GET_PCBYTE(src);
-	BYTE_SUB(res, I286_AL, src);
+	SUBBYTE(res, I286_AL, src);
 }
 
 I286FN _cmp_ax_data16(void) {					// 3d: cmp ax, DATA16
@@ -970,20 +1030,20 @@ I286FN _cmp_ax_data16(void) {					// 3d:
 
 	I286_WORKCLOCK(3);
 	GET_PCWORD(src);
-	WORD_SUB(res, I286_AX, src);
+	SUBWORD(res, I286_AX, src);
 }
 
 I286FN _segprefix_ds(void) {					// 3e: ds:
 
 	SS_FIX = DS_BASE;
 	DS_FIX = DS_BASE;
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op[op]();
 		REMOVE_PREFIX
-		i286reg.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -1003,22 +1063,22 @@ I286FN _aas(void) {								// 3f: aas
 	}
 }
 
-I286FN _inc_ax(void) INCWORD(I286_AX, 2) 	// 40:	inc		ax
-I286FN _inc_cx(void) INCWORD(I286_CX, 2)	// 41:	inc		cx
-I286FN _inc_dx(void) INCWORD(I286_DX, 2)	// 42:	inc		dx
-I286FN _inc_bx(void) INCWORD(I286_BX, 2)	// 43:	inc		bx
-I286FN _inc_sp(void) INCWORD(I286_SP, 2)	// 44:	inc		sp
-I286FN _inc_bp(void) INCWORD(I286_BP, 2)	// 45:	inc		bp
-I286FN _inc_si(void) INCWORD(I286_SI, 2)	// 46:	inc		si
-I286FN _inc_di(void) INCWORD(I286_DI, 2)	// 47:	inc		di
-I286FN _dec_ax(void) DECWORD(I286_AX, 2)	// 48:	dec		ax
-I286FN _dec_cx(void) DECWORD(I286_CX, 2)	// 49:	dec		cx
-I286FN _dec_dx(void) DECWORD(I286_DX, 2)	// 4a:	dec		dx
-I286FN _dec_bx(void) DECWORD(I286_BX, 2)	// 4b:	dec		bx
-I286FN _dec_sp(void) DECWORD(I286_SP, 2)	// 4c:	dec		sp
-I286FN _dec_bp(void) DECWORD(I286_BP, 2)	// 4d:	dec		bp
-I286FN _dec_si(void) DECWORD(I286_SI, 2)	// 4e:	dec		si
-I286FN _dec_di(void) DECWORD(I286_DI, 2)	// 4f:	dec		di
+I286FN _inc_ax(void) INCWORD2(I286_AX, 2) 	// 40:	inc		ax
+I286FN _inc_cx(void) INCWORD2(I286_CX, 2)	// 41:	inc		cx
+I286FN _inc_dx(void) INCWORD2(I286_DX, 2)	// 42:	inc		dx
+I286FN _inc_bx(void) INCWORD2(I286_BX, 2)	// 43:	inc		bx
+I286FN _inc_sp(void) INCWORD2(I286_SP, 2)	// 44:	inc		sp
+I286FN _inc_bp(void) INCWORD2(I286_BP, 2)	// 45:	inc		bp
+I286FN _inc_si(void) INCWORD2(I286_SI, 2)	// 46:	inc		si
+I286FN _inc_di(void) INCWORD2(I286_DI, 2)	// 47:	inc		di
+I286FN _dec_ax(void) DECWORD2(I286_AX, 2)	// 48:	dec		ax
+I286FN _dec_cx(void) DECWORD2(I286_CX, 2)	// 49:	dec		cx
+I286FN _dec_dx(void) DECWORD2(I286_DX, 2)	// 4a:	dec		dx
+I286FN _dec_bx(void) DECWORD2(I286_BX, 2)	// 4b:	dec		bx
+I286FN _dec_sp(void) DECWORD2(I286_SP, 2)	// 4c:	dec		sp
+I286FN _dec_bp(void) DECWORD2(I286_BP, 2)	// 4d:	dec		bp
+I286FN _dec_si(void) DECWORD2(I286_SI, 2)	// 4e:	dec		si
+I286FN _dec_di(void) DECWORD2(I286_DI, 2)	// 4f:	dec		di
 
 I286FN _push_ax(void) REGPUSH(I286_AX, 3)	// 50:	push	ax
 I286FN _push_cx(void) REGPUSH(I286_CX, 3)	// 51:	push	cx
@@ -1037,9 +1097,74 @@ I286FN _pop_bp(void) REGPOP(I286_BP, 5)	
 I286FN _pop_si(void) REGPOP(I286_SI, 5)		// 5E:	pop		si
 I286FN _pop_di(void) REGPOP(I286_DI, 5)		// 5F:	pop		di
 
+#if (defined(ARM) || defined(X11)) && defined(BYTESEX_LITTLE)
+
 I286FN _pusha(void) {						// 60:	pusha
 
-	UINT16	tmp;
+	REG16	tmp;
+	UINT32	addr;
+
+	I286_WORKCLOCK(17);
+	tmp = I286_SP;
+	addr = tmp + SS_BASE;
+	if ((tmp < 16) || (INHIBIT_WORDP(addr))) {
+		REGPUSH0(I286_AX)
+		REGPUSH0(I286_CX)
+		REGPUSH0(I286_DX)
+		REGPUSH0(I286_BX)
+	    REGPUSH0(tmp)
+		REGPUSH0(I286_BP)
+		REGPUSH0(I286_SI)
+		REGPUSH0(I286_DI)
+	}
+	else {
+		*(UINT16 *)(mem + addr - 2) = I286_AX;
+		*(UINT16 *)(mem + addr - 4) = I286_CX;
+		*(UINT16 *)(mem + addr - 6) = I286_DX;
+		*(UINT16 *)(mem + addr - 8) = I286_BX;
+		*(UINT16 *)(mem + addr - 10) = tmp;
+		*(UINT16 *)(mem + addr - 12) = I286_BP;
+		*(UINT16 *)(mem + addr - 14) = I286_SI;
+		*(UINT16 *)(mem + addr - 16) = I286_DI;
+		I286_SP -= 16;
+	}
+}
+
+I286FN _popa(void) {						// 61:	popa
+
+	UINT	tmp;
+	UINT32	addr;
+
+	I286_WORKCLOCK(19);
+	tmp = I286_SP + 16;
+	addr = tmp + SS_BASE;
+	if ((tmp >= 0x10000) || (INHIBIT_WORDP(addr))) {
+		REGPOP0(I286_DI);
+		REGPOP0(I286_SI);
+		REGPOP0(I286_BP);
+		I286_SP += 2;
+		REGPOP0(I286_BX);
+		REGPOP0(I286_DX);
+		REGPOP0(I286_CX);
+		REGPOP0(I286_AX);
+	}
+	else {
+		I286_DI = *(UINT16 *)(mem + addr - 16);
+		I286_SI = *(UINT16 *)(mem + addr - 14);
+		I286_BP = *(UINT16 *)(mem + addr - 12);
+		I286_BX = *(UINT16 *)(mem + addr - 8);
+		I286_DX = *(UINT16 *)(mem + addr - 6);
+		I286_CX = *(UINT16 *)(mem + addr - 4);
+		I286_AX = *(UINT16 *)(mem + addr - 2);
+		I286_SP = tmp;
+	}
+}
+
+#else
+
+I286FN _pusha(void) {						// 60:	pusha
+
+	REG16	tmp;
 
 	tmp = I286_SP;
 	REGPUSH0(I286_AX)
@@ -1066,20 +1191,22 @@ I286FN _popa(void) {						// 61:	popa
 	I286_WORKCLOCK(19);
 }
 
+#endif
+
 I286FN _bound(void) {						// 62:	bound
 
 	UINT	vect = 0;
 	UINT	op;
 	UINT32	madr;
-	UINT16	reg;
+	REG16	reg;
 
 	I286_WORKCLOCK(13);										// ToDo
 	GET_PCBYTE(op);
 	if (op < 0xc0) {
-		reg = *(reg16_b53[op]);
-		madr = c_calc_ea_dst[op]();
+		reg = *(REG16_B53(op));
+		madr = CALC_EA(op);
 		if (reg >= i286_memoryread_w(madr)) {
-			madr += 2;									// ToDo
+			madr += 2;										// ToDo
 			if (reg <= i286_memoryread_w(madr)) {
 				return;
 			}
@@ -1099,7 +1226,7 @@ I286FN _arpl(void) {						// 63:	arpl
 
 	GET_PCBYTE(op)
 	tmp = ((op < 0xc0)?1:0);
-	I286_IP += (BYTE)tmp;
+	I286_IP += (UINT8)tmp;
 	I286_WORKCLOCK(tmp + 10);
 	INT_NUM(6, I286_IP);
 }
@@ -1150,7 +1277,7 @@ I286FN _imul_reg_ea_data8(void) {		// 6B
 
 I286FN _insb(void) {						// 6C:	insb
 
-	BYTE	dat;
+	REG8	dat;
 
 	I286_WORKCLOCK(5);
 	dat = iocore_inp8(I286_DX);
@@ -1160,7 +1287,7 @@ I286FN _insb(void) {						// 6C:	insb
 
 I286FN _insw(void) {						// 6D:	insw
 
-	UINT16	dat;
+	REG16	dat;
 
 	I286_WORKCLOCK(5);
 	dat = iocore_inp16(I286_DX);
@@ -1170,123 +1297,123 @@ I286FN _insw(void) {						// 6D:	insw
 
 I286FN _outsb(void) {						// 6E:	outsb
 
-	BYTE	dat;
+	REG8	dat;
 
 	I286_WORKCLOCK(3);
 	dat = i286_memoryread(I286_SI + DS_FIX);
 	I286_SI += STRING_DIR;
-	iocore_out8(I286_DX, dat);
+	iocore_out8(I286_DX, (UINT8)dat);
 }
 
 I286FN _outsw(void) {						// 6F:	outsw
 
-	UINT16	dat;
+	REG16	dat;
 
 	I286_WORKCLOCK(3);
 	dat = i286_memoryread_w(I286_SI + DS_FIX);
 	I286_SI += STRING_DIRx2;
-	iocore_out16(I286_DX, dat);
+	iocore_out16(I286_DX, (UINT16)dat);
 }
 
 I286FN _jo_short(void) {					// 70:	jo short
 
-	if (!I286_OV) JMPNOP(2) else JMPSHORT(7)
+	if (!I286_OV) JMPNOP(3) else JMPSHORT(7)
 }
 
 I286FN _jno_short(void) {					// 71:	jno short
 
-	if (I286_OV) JMPNOP(2) else JMPSHORT(7)
+	if (I286_OV) JMPNOP(3) else JMPSHORT(7)
 }
 
 I286FN _jc_short(void) {					// 72:	jnae/jb/jc short
 
-	if (!(I286_FLAGL & C_FLAG)) JMPNOP(2) else JMPSHORT(7)
+	if (!(I286_FLAGL & C_FLAG)) JMPNOP(3) else JMPSHORT(7)
 }
 
 I286FN _jnc_short(void) {					// 73:	jae/jnb/jnc short
 
-	if (I286_FLAGL & C_FLAG) JMPNOP(2) else JMPSHORT(7)
+	if (I286_FLAGL & C_FLAG) JMPNOP(3) else JMPSHORT(7)
 }
 
 I286FN _jz_short(void) {					// 74:	je/jz short
 
-	if (!(I286_FLAGL & Z_FLAG)) JMPNOP(2) else JMPSHORT(7)
+	if (!(I286_FLAGL & Z_FLAG)) JMPNOP(3) else JMPSHORT(7)
 }
 
 I286FN _jnz_short(void) {					// 75:	jne/jnz short
 
-	if (I286_FLAGL & Z_FLAG) JMPNOP(2) else JMPSHORT(7)
+	if (I286_FLAGL & Z_FLAG) JMPNOP(3) else JMPSHORT(7)
 }
 
 I286FN _jna_short(void) {					// 76:	jna/jbe short
 
-	if (!(I286_FLAGL & (Z_FLAG | C_FLAG))) JMPNOP(2) else JMPSHORT(7)
+	if (!(I286_FLAGL & (Z_FLAG | C_FLAG))) JMPNOP(3) else JMPSHORT(7)
 }
 
 I286FN _ja_short(void) {					// 77:	ja/jnbe short
-	if (I286_FLAGL & (Z_FLAG | C_FLAG)) JMPNOP(2) else JMPSHORT(7)
+	if (I286_FLAGL & (Z_FLAG | C_FLAG)) JMPNOP(3) else JMPSHORT(7)
 }
 
 I286FN _js_short(void) {					// 78:	js short
 
-	if (!(I286_FLAGL & S_FLAG)) JMPNOP(2) else JMPSHORT(7)
+	if (!(I286_FLAGL & S_FLAG)) JMPNOP(3) else JMPSHORT(7)
 }
 
 I286FN _jns_short(void) {					// 79:	jns short
 
-	if (I286_FLAGL & S_FLAG) JMPNOP(2) else JMPSHORT(7)
+	if (I286_FLAGL & S_FLAG) JMPNOP(3) else JMPSHORT(7)
 }
 
 I286FN _jp_short(void) {					// 7A:	jp/jpe short
 
-	if (!(I286_FLAGL & P_FLAG)) JMPNOP(2) else JMPSHORT(7)
+	if (!(I286_FLAGL & P_FLAG)) JMPNOP(3) else JMPSHORT(7)
 }
 
 I286FN _jnp_short(void) {					// 7B:	jnp/jpo short
 
-	if (I286_FLAGL & P_FLAG) JMPNOP(2) else JMPSHORT(7)
+	if (I286_FLAGL & P_FLAG) JMPNOP(3) else JMPSHORT(7)
 }
 
 I286FN _jl_short(void) {					// 7C:	jl/jnge short
 
 	if (((I286_FLAGL & S_FLAG) == 0) == (I286_OV == 0))
-												JMPNOP(2) else JMPSHORT(7)
+												JMPNOP(3) else JMPSHORT(7)
 }
 
 I286FN _jnl_short(void) {					// 7D:	jnl/jge short
 
 	if (((I286_FLAGL & S_FLAG) == 0) != (I286_OV == 0))
-												JMPNOP(2) else JMPSHORT(7)
+												JMPNOP(3) else JMPSHORT(7)
 }
 
 I286FN _jle_short(void) {					// 7E:	jle/jng short
 
 	if ((!(I286_FLAGL & Z_FLAG)) &&
 		(((I286_FLAGL & S_FLAG) == 0) == (I286_OV == 0)))
-												JMPNOP(2) else JMPSHORT(7)
+												JMPNOP(3) else JMPSHORT(7)
 }
 
 I286FN _jnle_short(void) {					// 7F:	jg/jnle short
 
 	if ((I286_FLAGL & Z_FLAG) ||
 		(((I286_FLAGL & S_FLAG) == 0) != (I286_OV == 0)))
-												JMPNOP(2) else JMPSHORT(7)
+												JMPNOP(3) else JMPSHORT(7)
 }
 
 I286FN _calc_ea8_i8(void) {					// 80:	op		EA8, DATA8
 											// 82:	op		EA8, DATA8
-	BYTE	*out;
+	UINT8	*out;
 	UINT	op;
 	UINT32	madr;
 
 	GET_PCBYTE(op)
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(3);
-		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) {
 			c_op8xext8_table[(op >> 3) & 7](madr);
 			return;
@@ -1306,11 +1433,11 @@ I286FN _calc_ea16_i16(void) {				// 81:	
 	GET_PCBYTE(op)
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(3);
-		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)) {
 			GET_PCWORD(src);
 			c_op8xext16_table[(op >> 3) & 7](madr, src);
@@ -1332,11 +1459,11 @@ I286FN _calc_ea16_i8(void) {				// 83:	o
 	GET_PCBYTE(op)
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(3);
-		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)) {
 			GET_PCBYTES(src);
 			c_op8xext16_table[(op >> 3) & 7](madr, src);
@@ -1350,7 +1477,7 @@ I286FN _calc_ea16_i8(void) {				// 83:	o
 
 I286FN _test_ea_r8(void) {					// 84:	test	EA, REG8
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT	op;
 	UINT	src;
 	UINT	tmp;
@@ -1359,11 +1486,11 @@ I286FN _test_ea_r8(void) {					// 84:	te
 	PREPART_EA_REG8(op, src);
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
-		out = reg8_b20[op];
+		out = REG8_B20(op);
 	}
 	else {
 		I286_WORKCLOCK(6);
-		madr = c_calc_ea_dst[op]();
+		madr = CALC_EA(op);
 		if (madr >= I286_MEMWRITEMAX) {
 			tmp = i286_memoryread(madr);
 			ANDBYTE(tmp, src);
@@ -1386,11 +1513,11 @@ I286FN _test_ea_r16(void) {					// 85:	t
 	PREPART_EA_REG16(op, src);
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
-		out = reg16_b20[op];
+		out = REG16_B20(op);
 	}
 	else {
-		I286_WORKCLOCK(7);
-		madr = c_calc_ea_dst[op]();
+		I286_WORKCLOCK(6);
+		madr = CALC_EA(op);
 		if (INHIBIT_WORDP(madr)) {
 			tmp = i286_memoryread_w(madr);
 			ANDWORD(tmp, src);
@@ -1404,21 +1531,21 @@ I286FN _test_ea_r16(void) {					// 85:	t
 
 I286FN _xchg_ea_r8(void) {					// 86:	xchg	EA, REG8
 
-	BYTE	*out;
-	BYTE	*src;
+	UINT8	*out;
+	UINT8	*src;
 	UINT	op;
 	UINT32	madr;
 
 	PREPART_EA_REG8P(op, src);
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(3);
-		out = reg8_b20[op];
+		out = REG8_B20(op);
 	}
 	else {
 		I286_WORKCLOCK(5);
-		madr = c_calc_ea_dst[op]();
+		madr = CALC_EA(op);
 		if (madr >= I286_MEMWRITEMAX) {
-			BYTE tmp = i286_memoryread(madr);
+			UINT8 tmp = i286_memoryread(madr);
 			i286_memorywrite(madr, *src);
 			*src = tmp;
 			return;
@@ -1438,11 +1565,11 @@ I286FN _xchg_ea_r16(void) {					// 87:	x
 	PREPART_EA_REG16P(op, src);
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(3);
-		out = reg16_b20[op];
+		out = REG16_B20(op);
 	}
 	else {
 		I286_WORKCLOCK(5);
-		madr = c_calc_ea_dst[op]();
+		madr = CALC_EA(op);
 		if (INHIBIT_WORDP(madr)) {
 			UINT16 tmp = i286_memoryread_w(madr);
 			i286_memorywrite_w(madr, *src);
@@ -1456,18 +1583,18 @@ I286FN _xchg_ea_r16(void) {					// 87:	x
 
 I286FN _mov_ea_r8(void) {					// 88:	mov		EA, REG8
 
-	BYTE	src;
+	UINT8	src;
 	UINT	op;
 	UINT32	madr;
 
 	PREPART_EA_REG8(op, src)
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
-		*(reg8_b20[op]) = src;
+		*(REG8_B20(op)) = src;
 	}
 	else {
 		I286_WORKCLOCK(3);
-		madr = c_calc_ea_dst[op]();
+		madr = CALC_EA(op);
 		i286_memorywrite(madr, src);
 	}
 }
@@ -1480,18 +1607,18 @@ I286FN _mov_ea_r16(void) {					// 89:	mo
 	PREPART_EA_REG16(op, src);
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
-		*(reg16_b20[op]) = src;
+		*(REG16_B20(op)) = src;
 	}
 	else {
 		I286_WORKCLOCK(3);
-		i286_memorywrite_w(c_calc_ea_dst[op](), src);
+		i286_memorywrite_w(CALC_EA(op), src);
 	}
 }
 
 I286FN _mov_r8_ea(void) {					// 8A:	mov		REG8, EA
 
-	BYTE	*out;
-	BYTE	src;
+	UINT8	*out;
+	UINT8	src;
 	UINT	op;
 
 	PREPART_REG8_EA(op, src, out, 2, 5);
@@ -1517,11 +1644,11 @@ I286FN _mov_ea_seg(void) {					// 8C:	mo
 	tmp = *SEGMENTPTR((op >> 3) & 3);
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
-		*(reg16_b20[op]) = tmp;
+		*(REG16_B20(op)) = tmp;
 	}
 	else {
 		I286_WORKCLOCK(3);
-		i286_memorywrite_w(c_calc_ea_dst[op](), tmp);
+		i286_memorywrite_w(CALC_EA(op), tmp);
 	}
 }
 
@@ -1532,7 +1659,7 @@ I286FN _lea_r16_ea(void) {					// 8D:	le
 	I286_WORKCLOCK(3);
 	GET_PCBYTE(op)
 	if (op < 0xc0) {
-		*(reg16_b53[op]) = c_calc_lea[op]();
+		*(REG16_B53(op)) = CALC_LEA(op);
 	}
 	else {
 		INT_NUM(6, I286_SP - 2);
@@ -1543,35 +1670,37 @@ I286FN _mov_seg_ea(void) {					// 8E:	mo
 
 	UINT	op;
 	UINT	tmp;
+	UINT32	base;
 	UINT16	ipbak;
 
 	ipbak = I286_IP;
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
-		tmp = *(reg16_b20[op]);
+		tmp = *(REG16_B20(op));
 	}
 	else {
 		I286_WORKCLOCK(5);
-		tmp = i286_memoryread_w(c_calc_ea_dst[op]());
+		tmp = i286_memoryread_w(CALC_EA(op));
 	}
+	base = SEGSELECT(tmp);
 	switch(op & 0x18) {
 		case 0x00:			// es
 			I286_ES = (UINT16)tmp;
-			ES_BASE = tmp << 4;
+			ES_BASE = base;
 			break;
 
 		case 0x10:			// ss
 			I286_SS = (UINT16)tmp;
-			SS_BASE = tmp << 4;
-			SS_FIX = SS_BASE;
+			SS_BASE = base;
+			SS_FIX = base;
 			NEXT_OPCODE
 			break;
 
 		case 0x18:			// ds
 			I286_DS = (UINT16)tmp;
-			DS_BASE = tmp << 4;
-			DS_FIX = DS_BASE;
+			DS_BASE = base;
+			DS_FIX = base;
 			break;
 
 		default:			// cs
@@ -1590,10 +1719,10 @@ I286FN _pop_ea(void) {						// 8F:	pop		
 
 	GET_PCBYTE(op)
 	if (op < 0xc0) {
-		i286_memorywrite_w(c_calc_ea_dst[op](), tmp);
+		i286_memorywrite_w(CALC_EA(op), tmp);
 	}
 	else {
-		*(reg16_b20[op]) = tmp;
+		*(REG16_B20(op)) = tmp;
 	}
 }
 
@@ -1602,7 +1731,7 @@ I286FN _nop(void) {							// 90: nop / b
 #if 1										// call BIOS
 	UINT32	adrs;
 
-	adrs = ((I286_IP - 1) & 0xffff) + CS_BASE;
+	adrs = LOW16(I286_IP - 1) + CS_BASE;
 	if ((adrs >= 0xf8000) && (adrs < 0x100000)) {
 		biosfunc(adrs);
 		ES_BASE = I286_ES << 4;
@@ -1678,7 +1807,7 @@ I286FN _call_far(void) {					// 9A:	call
 	REGPUSH0(I286_CS)
 	GET_PCWORD(newip)
 	GET_PCWORD(I286_CS)
-	CS_BASE = I286_CS << 4;
+	CS_BASE = SEGSELECT(I286_CS);
 	REGPUSH0(I286_IP)
 	I286_IP = newip;
 }
@@ -1695,12 +1824,20 @@ I286FN _pushf(void) {						// 9C:	pushf
 
 I286FN _popf(void) {						// 9D:	popf
 
+	UINT	flag;
+
+	REGPOP0(flag)
+	I286_OV = flag & O_FLAG;
+	I286_FLAG = flag & (0xfff ^ O_FLAG);
+	I286_TRAP = ((flag & 0x300) == 0x300);
 	I286_WORKCLOCK(5);
-	REGPOP0(I286_FLAG)
-	I286_OV = I286_FLAG & O_FLAG;
-	I286_FLAG &= (0xfff ^ O_FLAG);
-	I286_TRAP = ((I286_FLAG & 0x300) == 0x300);
+#if defined(INTR_FAST)
+	if ((I286_TRAP) || ((flag & I_FLAG) && (PICEXISTINTR))) {
+		I286IRQCHECKTERM
+	}
+#else
 	I286IRQCHECKTERM
+#endif
 }
 
 I286FN _sahf(void) {						// 9E:	sahf
@@ -1753,7 +1890,7 @@ I286FN _mov_m16_ax(void) {					// A3:	mo
 
 I286FN _movsb(void) {						// A4:	movsb
 
-	BYTE	tmp;
+	UINT8	tmp;
 
 	I286_WORKCLOCK(5);
 	tmp = i286_memoryread(I286_SI + DS_FIX);
@@ -1782,7 +1919,7 @@ I286FN _cmpsb(void) {						// A6:	cmpsb
 	I286_WORKCLOCK(8);
 	dst = i286_memoryread(I286_SI + DS_FIX);
 	src = i286_memoryread(I286_DI + ES_BASE);
-	BYTE_SUB(res, dst, src)
+	SUBBYTE(res, dst, src)
 	I286_SI += STRING_DIR;
 	I286_DI += STRING_DIR;
 }
@@ -1796,7 +1933,7 @@ I286FN _cmpsw(void) {						// A7:	cmpsw
 	I286_WORKCLOCK(8);
 	dst = i286_memoryread_w(I286_SI + DS_FIX);
 	src = i286_memoryread_w(I286_DI + ES_BASE);
-	WORD_SUB(res, dst, src)
+	SUBWORD(res, dst, src)
 	I286_SI += STRING_DIRx2;
 	I286_DI += STRING_DIRx2;
 }
@@ -1860,7 +1997,7 @@ I286FN _scasb(void) {						// AE:	scasb
 	I286_WORKCLOCK(7);
 	src = i286_memoryread(I286_DI + ES_BASE);
 	dst = I286_AL;
-	BYTE_SUB(res, dst, src)
+	SUBBYTE(res, dst, src)
 	I286_DI += STRING_DIR;
 }
 
@@ -1873,7 +2010,7 @@ I286FN _scasw(void) {						// AF:	scasw
 	I286_WORKCLOCK(7);
 	src = i286_memoryread_w(I286_DI + ES_BASE);
 	dst = I286_AX;
-	WORD_SUB(res, dst, src)
+	SUBWORD(res, dst, src)
 	I286_DI += STRING_DIRx2;
 }
 
@@ -1896,19 +2033,19 @@ I286FN _mov_di_imm(void) MOVIMM16(I286_D
 
 I286FN _shift_ea8_data8(void) {				// C0:	shift	EA8, DATA8
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT	op;
 	UINT32	madr;
-	BYTE	cl;
+	UINT8	cl;
 
 	GET_PCBYTE(op)
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(5);
-		out = reg8_b20[op];
+		out = REG8_B20(op);
 	}
 	else {
 		I286_WORKCLOCK(8);
-		madr = c_calc_ea_dst[op]();
+		madr = CALC_EA(op);
 		if (madr >= I286_MEMWRITEMAX) {
 			GET_PCBYTE(cl)
 			I286_WORKCLOCK(cl);
@@ -1927,16 +2064,16 @@ I286FN _shift_ea16_data8(void) {			// C1
 	UINT16	*out;
 	UINT	op;
 	UINT32	madr;
-	BYTE	cl;
+	UINT8	cl;
 
 	GET_PCBYTE(op)
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(5);
-		out = reg16_b20[op];
+		out = REG16_B20(op);
 	}
 	else {
 		I286_WORKCLOCK(8);
-		madr = c_calc_ea_dst[op]();
+		madr = CALC_EA(op);
 		if (INHIBIT_WORDP(madr)) {
 			GET_PCBYTE(cl);
 			I286_WORKCLOCK(cl);
@@ -1969,16 +2106,16 @@ I286FN _ret_near(void) {					// C3:	ret 
 I286FN _les_r16_ea(void) {					// C4:	les		REG16, EA
 
 	UINT	op;
-	UINT16	ad;
+	UINT32	seg;
+	UINT	ad;
 
 	I286_WORKCLOCK(3);
 	GET_PCBYTE(op)
 	if (op < 0xc0) {
-		ad = c_get_ea[op]();
-		*(reg16_b53[op]) = i286_memoryread_w(ad + EA_FIX);
-		ad += 2;
-		I286_ES = i286_memoryread_w(ad + EA_FIX);
-		ES_BASE = I286_ES << 4;
+		ad = GET_EA(op, &seg);
+		*(REG16_B53(op)) = i286_memoryread_w(seg + ad);
+		I286_ES = i286_memoryread_w(seg + LOW16(ad + 2));
+		ES_BASE = SEGSELECT(I286_ES);
 	}
 	else {
 		INT_NUM(6, I286_IP - 2);
@@ -1988,16 +2125,16 @@ I286FN _les_r16_ea(void) {					// C4:	le
 I286FN _lds_r16_ea(void) {					// C5:	lds		REG16, EA
 
 	UINT	op;
-	UINT16	ad;
+	UINT32	seg;
+	UINT	ad;
 
 	I286_WORKCLOCK(3);
 	GET_PCBYTE(op)
 	if (op < 0xc0) {
-		ad = c_get_ea[op]();
-		*(reg16_b53[op]) = i286_memoryread_w(ad + EA_FIX);
-		ad += 2;
-		I286_DS = i286_memoryread_w(ad + EA_FIX);
-		DS_BASE = I286_DS << 4;
+		ad = GET_EA(op, &seg);
+		*(REG16_B53(op)) = i286_memoryread_w(seg + ad);
+		I286_DS = i286_memoryread_w(seg + LOW16(ad + 2));
+		DS_BASE = SEGSELECT(I286_DS);
 		DS_FIX = DS_BASE;
 	}
 	else {
@@ -2012,15 +2149,15 @@ I286FN _mov_ea8_data8(void) {				// C6:	
 	GET_PCBYTE(op)
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
-		GET_PCBYTE(*(reg8_b53[op]))
+		GET_PCBYTE(*(REG8_B53(op)))
 	}
-	else {
-		UINT ad;
-		BYTE val;
+	else {				// 03/11/23
+		UINT32 ad;
+		UINT8 val;
 		I286_WORKCLOCK(3);
-		ad = c_get_ea[op]();
+		ad = CALC_EA(op);
 		GET_PCBYTE(val)
-		i286_memorywrite(ad + EA_FIX, val);
+		i286_memorywrite(ad, val);
 	}
 }
 
@@ -2031,22 +2168,22 @@ I286FN _mov_ea16_data16(void) {				// C7
 	GET_PCBYTE(op)
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
-		GET_PCWORD(*(reg16_b53[op]))
+		GET_PCWORD(*(REG16_B53(op)))
 	}
-	else {
-		UINT	ad;
+	else {				// 03/11/23
+		UINT32	ad;
 		UINT16	val;
 		I286_WORKCLOCK(3);
-		ad = c_get_ea[op]();
+		ad = CALC_EA(op);
 		GET_PCWORD(val)
-		i286_memorywrite_w(ad + EA_FIX, val);
+		i286_memorywrite_w(ad, val);
 	}
 }
 
 I286FN _enter(void) {						// C8:	enter	DATA16, DATA8
 
 	UINT16	dimsize;
-	BYTE	level;
+	UINT8	level;
 
 	GET_PCWORD(dimsize)
 	GET_PCBYTE(level)
@@ -2069,14 +2206,22 @@ I286FN _enter(void) {						// C8:	enter	
 		}
 		else {									// enter level=2-31
 			UINT16 bp;
-			I286_WORKCLOCK(12 + level*4);
+			I286_WORKCLOCK(12 + 4 + level*4);
 			bp = I286_BP;
 			I286_BP = I286_SP;
 			while(level--) {
+#if 1											// なにやってんだヲレ
+				REG16 val;
+				bp -= 2;
+				I286_SP -= 2;
+				val = i286_memoryread_w(bp + SS_BASE);
+				i286_memorywrite_w(I286_SP + SS_BASE, val);
+#else
 				UINT16 val = i286_memoryread_w(bp + SS_BASE);
 				i286_memorywrite_w(I286_SP + SS_BASE, val);
 				bp -= 2;
 				I286_SP -= 2;
+#endif
 			}
 			REGPUSH0(I286_BP)
 			I286_SP -= dimsize;
@@ -2100,7 +2245,7 @@ I286FN _ret_far_data16(void) {				// CA:
 	REGPOP0(I286_IP)
 	REGPOP0(I286_CS)
 	I286_SP += ad;
-	CS_BASE = I286_CS << 4;
+	CS_BASE = SEGSELECT(I286_CS);
 }
 
 I286FN _ret_far(void) {						// CB:	ret far
@@ -2108,12 +2253,12 @@ I286FN _ret_far(void) {						// CB:	ret 
 	I286_WORKCLOCK(15);
 	REGPOP0(I286_IP)
 	REGPOP0(I286_CS)
-	CS_BASE = I286_CS << 4;
+	CS_BASE = SEGSELECT(I286_CS);
 }
 
 I286FN _int_03(void) {						// CC:	int		3
 
-	I286_WORKCLOCK(23);
+	I286_WORKCLOCK(3);
 	INT_NUM(3, I286_IP);
 }
 
@@ -2121,8 +2266,11 @@ I286FN _int_data8(void) {					// CD:	int
 
 	UINT	vect;
 
-	I286_WORKCLOCK(23);
+	I286_WORKCLOCK(3);
 	GET_PCBYTE(vect)
+#if defined(ENABLE_TRAP)
+	softinttrap(CPU_CS, CPU_IP - 2, vect);
+#endif
 	INT_NUM(vect, I286_IP);
 }
 
@@ -2130,39 +2278,46 @@ I286FN _into(void) {						// CE:	into
 
 	I286_WORKCLOCK(4);
 	if (I286_OV) {
-		I286_WORKCLOCK(24 - 4);
 		INT_NUM(4, I286_IP);
 	}
 }
 
 I286FN _iret(void) {						// CF:	iret
 
-	extirq_pop();
-	I286_WORKCLOCK(31);
+	UINT	flag;
+
 	REGPOP0(I286_IP)
 	REGPOP0(I286_CS)
-	REGPOP0(I286_FLAG)
-	I286_OV = I286_FLAG & O_FLAG;
-	I286_FLAG &= 0x7ff;
-	I286_TRAP = ((I286_FLAG & 0x300) == 0x300);
+	REGPOP0(flag)
+	I286_OV = flag & O_FLAG;
+	I286_FLAG = flag & (0xfff ^ O_FLAG);
+	I286_TRAP = ((flag & 0x300) == 0x300);
 	CS_BASE = I286_CS << 4;
+//	CS_BASE = SEGSELECT(I286_CS);
+	I286_WORKCLOCK(31);
+#if defined(INTR_FAST)
+	if ((I286_TRAP) || ((flag & I_FLAG) && (PICEXISTINTR))) {
+		I286IRQCHECKTERM
+	}
+#else
 	I286IRQCHECKTERM
+#endif
 }
 
 I286FN _shift_ea8_1(void) {				// D0:	shift EA8, 1
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT	op;
 	UINT32	madr;
 
 	GET_PCBYTE(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) {
 			sft_e8_table[(op >> 3) & 7](madr);
 			return;
@@ -2181,11 +2336,11 @@ I286FN _shift_ea16_1(void) {			// D1:	sh
 	GET_PCBYTE(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)) {
 			sft_e16_table[(op >> 3) & 7](madr);
 			return;
@@ -2197,19 +2352,19 @@ I286FN _shift_ea16_1(void) {			// D1:	sh
 
 I286FN _shift_ea8_cl(void) {			// D2:	shift EA8, cl
 
-	BYTE	*out;
+	UINT8	*out;
 	UINT	op;
 	UINT32	madr;
-	BYTE	cl;
+	REG8	cl;
 
 	GET_PCBYTE(op)
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(5);
-		out = reg8_b20[op];
+		out = REG8_B20(op);
 	}
 	else {
 		I286_WORKCLOCK(8);
-		madr = c_calc_ea_dst[op]();
+		madr = CALC_EA(op);
 		if (madr >= I286_MEMWRITEMAX) {
 			cl = I286_CL;
 			I286_WORKCLOCK(cl);
@@ -2228,16 +2383,16 @@ I286FN _shift_ea16_cl(void) {			// D3:	s
 	UINT16	*out;
 	UINT	op;
 	UINT32	madr;
-	BYTE	cl;
+	REG8	cl;
 
 	GET_PCBYTE(op)
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(5);
-		out = reg16_b20[op];
+		out = REG16_B20(op);
 	}
 	else {
 		I286_WORKCLOCK(8);
-		madr = c_calc_ea_dst[op]();
+		madr = CALC_EA(op);
 		if (INHIBIT_WORDP(madr)) {
 			cl = I286_CL;
 			I286_WORKCLOCK(cl);
@@ -2253,8 +2408,8 @@ I286FN _shift_ea16_cl(void) {			// D3:	s
 
 I286FN _aam(void) {							// D4:	AAM
 
-	BYTE	al;
-	BYTE	div;
+	UINT8	al;
+	UINT8	div;
 
 	I286_WORKCLOCK(16);
 	GET_PCBYTE(div);
@@ -2273,14 +2428,14 @@ I286FN _aam(void) {							// D4:	AAM
 
 I286FN _aad(void) {							// D5:	AAD
 
-	BYTE	mul;
+	UINT8	mul;
 
 	I286_WORKCLOCK(14);
 	GET_PCBYTE(mul);
-	I286_AL += (BYTE)(I286_AH * mul);
+	I286_AL += (UINT8)(I286_AH * mul);
 	I286_AH = 0;
 	I286_FLAGL &= ~(S_FLAG | Z_FLAG | P_FLAG);
-	I286_FLAGL |= szpcflag[I286_AL];
+	I286_FLAGL |= BYTESZPF(I286_AL);
 }
 
 I286FN _setalc(void) {						// D6:	setalc (80286)
@@ -2291,7 +2446,7 @@ I286FN _setalc(void) {						// D6:	setal
 I286FN _xlat(void) {						// D7:	xlat
 
 	I286_WORKCLOCK(5);
-	I286_AL = i286_memoryread(((I286_AL + I286_BX) & 0xffff) + DS_FIX);
+	I286_AL = i286_memoryread(LOW16(I286_AL + I286_BX) + DS_FIX);
 }
 
 I286FN _esc(void) {							// D8:	esc
@@ -2301,7 +2456,7 @@ I286FN _esc(void) {							// D8:	esc
 	I286_WORKCLOCK(2);
 	GET_PCBYTE(op)
 	if (op < 0xc0) {
-		c_calc_lea[op]();
+		CALC_LEA(op);
 	}
 }
 
@@ -2334,9 +2489,9 @@ I286FN _in_al_data8(void) {					// E4:	i
 
 	I286_WORKCLOCK(5);
 	GET_PCBYTE(port)
-	i286reg.inport = CS_BASE + I286_IP;
+	I286_INPADRS = CS_BASE + I286_IP;
 	I286_AL = iocore_inp8(port);
-	i286reg.inport = 0;
+	I286_INPADRS = 0;
 }
 
 I286FN _in_ax_data8(void) {					// E5:	in		ax, DATA8
@@ -2392,8 +2547,8 @@ I286FN _jmp_far(void) {						// EA:	jmp 
 	I286_WORKCLOCK(11);
 	GET_PCWORD(ad);
 	GET_PCWORD(I286_CS);
-	CS_BASE = I286_CS << 4;
 	I286_IP = ad;
+	CS_BASE = SEGSELECT(I286_CS);
 }
 
 I286FN _jmp_short(void) {					// EB:	jmp short
@@ -2436,12 +2591,12 @@ I286FN _lock(void) {						// F0:	lock
 
 I286FN _repne(void) {						// F2:	repne
 
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repne[op]();
-		i286reg.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -2450,12 +2605,12 @@ I286FN _repne(void) {						// F2:	repne
 
 I286FN _repe(void) {						// F3:	repe
 
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repe[op]();
-		i286reg.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -2512,10 +2667,24 @@ I286FN _cli(void) {							// FA:	cli
 I286FN _sti(void) {							// FB:	sti
 
 	I286_WORKCLOCK(2);
+#if defined(INTR_FAST)
+	if (I286_FLAG & I_FLAG) {
+		NEXT_OPCODE;
+		return;									// 更新の意味なし
+	}
+#endif
 	I286_FLAG |= I_FLAG;
-	I286_TRAP = (I286_FLAG & T_FLAG) >> 8;		// ToDo
-
+	I286_TRAP = (I286_FLAG & T_FLAG) >> 8;
+#if defined(INTR_FAST)
+	if ((I286_TRAP) || (PICEXISTINTR)) {
+		REMAIN_ADJUST(1)
+	}
+	else {
+		NEXT_OPCODE;
+	}
+#else
 	REMAIN_ADJUST(1)
+#endif
 }
 
 I286FN _cld(void) {							// FC:	cld
@@ -2830,13 +2999,13 @@ I286FN _repe_segprefix_es(void) {
 
 	DS_FIX = ES_BASE;
 	SS_FIX = ES_BASE;
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repe[op]();
 		REMOVE_PREFIX
-		i286reg.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -2847,13 +3016,13 @@ I286FN _repe_segprefix_cs(void) {
 
 	DS_FIX = CS_BASE;
 	SS_FIX = CS_BASE;
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repe[op]();
 		REMOVE_PREFIX
-		i286reg.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -2864,13 +3033,13 @@ I286FN _repe_segprefix_ss(void) {
 
 	DS_FIX = SS_BASE;
 	SS_FIX = SS_BASE;
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repe[op]();
 		REMOVE_PREFIX
-		i286reg.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -2881,13 +3050,13 @@ I286FN _repe_segprefix_ds(void) {
 
 	DS_FIX = DS_BASE;
 	SS_FIX = DS_BASE;
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repe[op]();
 		REMOVE_PREFIX
-		i286reg.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -3075,7 +3244,7 @@ const I286OP i286op_repe[] = {
 			i286c_repe_cmpsw,				// A7:	repe cmpsw
 			_test_al_data8,					// A8:	test	al, DATA8
 			_test_ax_data16,				// A9:	test	ax, DATA16
-			i286c_rep_stosb,				// AA:	rep stosw
+			i286c_rep_stosb,				// AA:	rep stosb
 			i286c_rep_stosw,				// AB:	rep stosw
 			i286c_rep_lodsb,				// AC:	rep lodsb
 			i286c_rep_lodsw,				// AD:	rep lodsw
@@ -3175,13 +3344,13 @@ I286FN _repne_segprefix_es(void) {
 
 	DS_FIX = ES_BASE;
 	SS_FIX = ES_BASE;
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repne[op]();
 		REMOVE_PREFIX
-		i286reg.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -3192,13 +3361,13 @@ I286FN _repne_segprefix_cs(void) {
 
 	DS_FIX = CS_BASE;
 	SS_FIX = CS_BASE;
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repne[op]();
 		REMOVE_PREFIX
-		i286reg.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -3209,13 +3378,13 @@ I286FN _repne_segprefix_ss(void) {
 
 	DS_FIX = SS_BASE;
 	SS_FIX = SS_BASE;
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repne[op]();
 		REMOVE_PREFIX
-		i286reg.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -3226,13 +3395,13 @@ I286FN _repne_segprefix_ds(void) {
 
 	DS_FIX = DS_BASE;
 	SS_FIX = DS_BASE;
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repne[op]();
 		REMOVE_PREFIX
-		i286reg.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -3420,7 +3589,7 @@ const I286OP i286op_repne[] = {
 			i286c_repne_cmpsw,				// A7:	repne cmpsw
 			_test_al_data8,					// A8:	test	al, DATA8
 			_test_ax_data16,				// A9:	test	ax, DATA16
-			i286c_rep_stosb,				// AA:	rep stosw
+			i286c_rep_stosb,				// AA:	rep stosb
 			i286c_rep_stosw,				// AB:	rep stosw
 			i286c_rep_lodsb,				// AC:	rep lodsb
 			i286c_rep_lodsw,				// AD:	rep lodsw