--- np2/i286c/i286c_mn.c	2003/11/29 00:36:00	1.14
+++ np2/i286c/i286c_mn.c	2003/12/01 10:45:46	1.18
@@ -10,6 +10,11 @@
 
 #define	MAX_PREFIX		8
 
+#define EXISTINTR		(isI286EI) && (!pic.ext_irq) &&				\
+						((pic.pi[0].irr & (~pic.pi[0].imr)) ||		\
+						(pic.pi[1].irr & (~pic.pi[1].imr)))
+
+
 #define	NEXT_OPCODE												\
 		if (I286_REMCLOCK < 1) {								\
 			I286_BASECLOCK += (1 - I286_REMCLOCK);				\
@@ -176,7 +181,9 @@ I286FN _or_ea_r8(void) {						// 08: or 
 		}
 		out = mem + madr;
 	}
-	ORBYTE(*out, src);
+	dst = *out;
+	ORBYTE(dst, src);
+	*out = (BYTE)dst;
 }
 
 I286FN _or_ea_r16(void) {							// 09: or EA, REG16
@@ -203,7 +210,9 @@ I286FN _or_ea_r16(void) {							// 09: o
 		}
 		out = (UINT16 *)(mem + madr);
 	}
-	ORWORD(*out, src);
+	dst = *out;
+	ORWORD(dst, src);
+	*out = (UINT16)dst;
 }
 
 I286FN _or_r8_ea(void) {						// 0a: or REG8, EA
@@ -211,9 +220,12 @@ I286FN _or_r8_ea(void) {						// 0a: or 
 	BYTE	*out;
 	UINT	op;
 	UINT	src;
+	UINT	dst;
 
 	PREPART_REG8_EA(op, src, out, 2, 7);
-	ORBYTE(*out, src);
+	dst = *out;
+	ORBYTE(dst, src);
+	*out = (BYTE)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 = (BYTE)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
@@ -518,7 +539,9 @@ I286FN _and_ea_r8(void) {						// 20: an
 		}
 		out = mem + madr;
 	}
-	ANDBYTE(*out, src);
+	dst = *out;
+	ANDBYTE(dst, src);
+	*out = (BYTE)dst;
 }
 
 I286FN _and_ea_r16(void) {						// 21: and EA, REG16
@@ -545,7 +568,9 @@ I286FN _and_ea_r16(void) {						// 21: a
 		}
 		out = (UINT16 *)(mem + madr);
 	}
-	ANDWORD(*out, src);
+	dst = *out;
+	ANDWORD(dst, src);
+	*out = (UINT16)dst;
 }
 
 I286FN _and_r8_ea(void) {						// 22: and REG8, EA
@@ -553,9 +578,12 @@ I286FN _and_r8_ea(void) {						// 22: an
 	BYTE	*out;
 	UINT	op;
 	UINT	src;
+	UINT	dst;
 
 	PREPART_REG8_EA(op, src, out, 2, 7);
-	ANDBYTE(*out, src);
+	dst = *out;
+	ANDBYTE(dst, src);
+	*out = (BYTE)dst;
 }
 
 I286FN _and_r16_ea(void) {						// 23: and REG16, EA
@@ -563,40 +591,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 = (BYTE)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) {
+	i286core.s.prefix++;
+	if (i286core.s.prefix < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op[op]();
 		REMOVE_PREFIX
-		i286reg.prefix = 0;
+		i286core.s.prefix = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -641,14 +678,14 @@ I286FN _sub_ea_r8(void) {						// 28: su
 		madr = CALC_EA(op);
 		if (madr >= I286_MEMWRITEMAX) {
 			dst = i286_memoryread(madr);
-			BYTE_SUB(res, dst, src);
+			SUBBYTE(res, dst, src);
 			i286_memorywrite(madr, (REG8)res);
 			return;
 		}
 		out = mem + madr;
 	}
 	dst = *out;
-	BYTE_SUB(res, dst, src);
+	SUBBYTE(res, dst, src);
 	*out = (BYTE)res;
 }
 
@@ -671,14 +708,14 @@ I286FN _sub_ea_r16(void) {						// 29: s
 		madr = CALC_EA(op);
 		if (INHIBIT_WORDP(madr)) {
 			dst = i286_memoryread_w(madr);
-			WORD_SUB(res, dst, src);
+			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;
 }
 
@@ -692,7 +729,7 @@ I286FN _sub_r8_ea(void) {						// 2a: su
 
 	PREPART_REG8_EA(op, src, out, 2, 7);
 	dst = *out;
-	BYTE_SUB(res, dst, src);
+	SUBBYTE(res, dst, src);
 	*out = (BYTE)res;
 }
 
@@ -706,7 +743,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,7 +754,7 @@ I286FN _sub_al_data8(void) {					// 2c: 
 
 	I286_WORKCLOCK(3);
 	GET_PCBYTE(src);
-	BYTE_SUB(res, I286_AL, src);
+	SUBBYTE(res, I286_AL, src);
 	I286_AL = (BYTE)res;
 }
 
@@ -728,7 +765,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 +773,13 @@ I286FN _segprefix_cs(void) {					// 2e: 
 
 	SS_FIX = CS_BASE;
 	DS_FIX = CS_BASE;
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	i286core.s.prefix++;
+	if (i286core.s.prefix < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op[op]();
 		REMOVE_PREFIX
-		i286reg.prefix = 0;
+		i286core.s.prefix = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -783,13 +820,15 @@ I286FN _xor_ea_r8(void) {						// 30: xo
 		madr = CALC_EA(op);
 		if (madr >= I286_MEMWRITEMAX) {
 			dst = i286_memoryread(madr);
-			BYTE_XOR(dst, src);
+			XORBYTE(dst, src);
 			i286_memorywrite(madr, (REG8)dst);
 			return;
 		}
 		out = mem + madr;
 	}
-	BYTE_XOR(*out, src);
+	dst = *out;
+	XORBYTE(dst, src);
+	*out = (BYTE)dst;
 }
 
 I286FN _xor_ea_r16(void) {						// 31: xor EA, REG16
@@ -810,13 +849,15 @@ I286FN _xor_ea_r16(void) {						// 31: x
 		madr = CALC_EA(op);
 		if (INHIBIT_WORDP(madr)) {
 			dst = i286_memoryread_w(madr);
-			WORD_XOR(dst, src);
+			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
@@ -824,9 +865,12 @@ I286FN _xor_r8_ea(void) {						// 32: xo
 	BYTE	*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 = (BYTE)dst;
 }
 
 I286FN _xor_r16_ea(void) {						// 33: or REG16, EA
@@ -834,40 +878,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 = (BYTE)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) {
+	i286core.s.prefix++;
+	if (i286core.s.prefix < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op[op]();
 		REMOVE_PREFIX
-		i286reg.prefix = 0;
+		i286core.s.prefix = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -898,12 +951,12 @@ I286FN _cmp_ea_r8(void) {						// 38: cm
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
 		dst = *(REG8_B20(op));
-		BYTE_SUB(res, dst, src);
+		SUBBYTE(res, dst, src);
 	}
 	else {
 		I286_WORKCLOCK(7);
 		dst = i286_memoryread(CALC_EA(op));
-		BYTE_SUB(res, dst, src);
+		SUBBYTE(res, dst, src);
 	}
 }
 
@@ -918,12 +971,12 @@ I286FN _cmp_ea_r16(void) {						// 39: c
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
 		dst = *(REG16_B20(op));
-		WORD_SUB(res, dst, src);
+		SUBWORD(res, dst, src);
 	}
 	else {
 		I286_WORKCLOCK(7);
 		dst = i286_memoryread_w(CALC_EA(op));
-		WORD_SUB(res, dst, src);
+		SUBWORD(res, dst, src);
 	}
 }
 
@@ -937,7 +990,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 +1003,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 +1013,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 +1023,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) {
+	i286core.s.prefix++;
+	if (i286core.s.prefix < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op[op]();
 		REMOVE_PREFIX
-		i286reg.prefix = 0;
+		i286core.s.prefix = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -1003,22 +1056,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 +1090,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,6 +1184,8 @@ I286FN _popa(void) {						// 61:	popa
 	I286_WORKCLOCK(19);
 }
 
+#endif
+
 I286FN _bound(void) {						// 62:	bound
 
 	UINT	vect = 0;
@@ -1695,12 +1815,20 @@ I286FN _pushf(void) {						// 9C:	pushf
 
 I286FN _popf(void) {						// 9D:	popf
 
+	UINT	flag;
+
 	I286_WORKCLOCK(5);
-	REGPOP0(I286_FLAG)
-	I286_OV = I286_FLAG & O_FLAG;
-	I286_FLAG &= (0xfff ^ O_FLAG);
-	I286_TRAP = ((I286_FLAG & 0x300) == 0x300);
+	REGPOP0(flag)
+	I286_OV = flag & O_FLAG;
+	I286_FLAG = flag & (0xfff ^ O_FLAG);
+	I286_TRAP = ((flag & 0x300) == 0x300);
+#if defined(INTR_FAST)
+	if (EXISTINTR) {
+		I286IRQCHECKTERM
+	}
+#else
 	I286IRQCHECKTERM
+#endif
 }
 
 I286FN _sahf(void) {						// 9E:	sahf
@@ -1782,7 +1910,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 +1924,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 +1988,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 +2001,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;
 }
 
@@ -2145,16 +2273,24 @@ I286FN _into(void) {						// CE:	into
 
 I286FN _iret(void) {						// CF:	iret
 
+	UINT	flag;
+
 	extirq_pop();
 	I286_WORKCLOCK(31);
 	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;
+#if defined(INTR_FAST)
+	if (EXISTINTR) {
+		I286IRQCHECKTERM
+	}
+#else
 	I286IRQCHECKTERM
+#endif
 }
 
 I286FN _shift_ea8_1(void) {				// D0:	shift EA8, 1
@@ -2342,9 +2478,9 @@ I286FN _in_al_data8(void) {					// E4:	i
 
 	I286_WORKCLOCK(5);
 	GET_PCBYTE(port)
-	i286reg.inport = CS_BASE + I286_IP;
+	i286core.s.inport = CS_BASE + I286_IP;
 	I286_AL = iocore_inp8(port);
-	i286reg.inport = 0;
+	i286core.s.inport = 0;
 }
 
 I286FN _in_ax_data8(void) {					// E5:	in		ax, DATA8
@@ -2444,12 +2580,12 @@ I286FN _lock(void) {						// F0:	lock
 
 I286FN _repne(void) {						// F2:	repne
 
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	i286core.s.prefix++;
+	if (i286core.s.prefix < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repne[op]();
-		i286reg.prefix = 0;
+		i286core.s.prefix = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -2458,12 +2594,12 @@ I286FN _repne(void) {						// F2:	repne
 
 I286FN _repe(void) {						// F3:	repe
 
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	i286core.s.prefix++;
+	if (i286core.s.prefix < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repe[op]();
-		i286reg.prefix = 0;
+		i286core.s.prefix = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -2520,10 +2656,20 @@ I286FN _cli(void) {							// FA:	cli
 I286FN _sti(void) {							// FB:	sti
 
 	I286_WORKCLOCK(2);
+#if defined(INTR_FAST)
+	if (I286_FLAG & I_FLAG) {
+		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 (EXISTINTR) {
+		REMAIN_ADJUST(1)
+	}
+#else
 	REMAIN_ADJUST(1)
+#endif
 }
 
 I286FN _cld(void) {							// FC:	cld
@@ -2838,13 +2984,13 @@ I286FN _repe_segprefix_es(void) {
 
 	DS_FIX = ES_BASE;
 	SS_FIX = ES_BASE;
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	i286core.s.prefix++;
+	if (i286core.s.prefix < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repe[op]();
 		REMOVE_PREFIX
-		i286reg.prefix = 0;
+		i286core.s.prefix = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -2855,13 +3001,13 @@ I286FN _repe_segprefix_cs(void) {
 
 	DS_FIX = CS_BASE;
 	SS_FIX = CS_BASE;
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	i286core.s.prefix++;
+	if (i286core.s.prefix < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repe[op]();
 		REMOVE_PREFIX
-		i286reg.prefix = 0;
+		i286core.s.prefix = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -2872,13 +3018,13 @@ I286FN _repe_segprefix_ss(void) {
 
 	DS_FIX = SS_BASE;
 	SS_FIX = SS_BASE;
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	i286core.s.prefix++;
+	if (i286core.s.prefix < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repe[op]();
 		REMOVE_PREFIX
-		i286reg.prefix = 0;
+		i286core.s.prefix = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -2889,13 +3035,13 @@ I286FN _repe_segprefix_ds(void) {
 
 	DS_FIX = DS_BASE;
 	SS_FIX = DS_BASE;
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	i286core.s.prefix++;
+	if (i286core.s.prefix < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repe[op]();
 		REMOVE_PREFIX
-		i286reg.prefix = 0;
+		i286core.s.prefix = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -3183,13 +3329,13 @@ I286FN _repne_segprefix_es(void) {
 
 	DS_FIX = ES_BASE;
 	SS_FIX = ES_BASE;
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	i286core.s.prefix++;
+	if (i286core.s.prefix < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repne[op]();
 		REMOVE_PREFIX
-		i286reg.prefix = 0;
+		i286core.s.prefix = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -3200,13 +3346,13 @@ I286FN _repne_segprefix_cs(void) {
 
 	DS_FIX = CS_BASE;
 	SS_FIX = CS_BASE;
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	i286core.s.prefix++;
+	if (i286core.s.prefix < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repne[op]();
 		REMOVE_PREFIX
-		i286reg.prefix = 0;
+		i286core.s.prefix = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -3217,13 +3363,13 @@ I286FN _repne_segprefix_ss(void) {
 
 	DS_FIX = SS_BASE;
 	SS_FIX = SS_BASE;
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	i286core.s.prefix++;
+	if (i286core.s.prefix < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repne[op]();
 		REMOVE_PREFIX
-		i286reg.prefix = 0;
+		i286core.s.prefix = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -3234,13 +3380,13 @@ I286FN _repne_segprefix_ds(void) {
 
 	DS_FIX = DS_BASE;
 	SS_FIX = DS_BASE;
-	i286reg.prefix++;
-	if (i286reg.prefix < MAX_PREFIX) {
+	i286core.s.prefix++;
+	if (i286core.s.prefix < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repne[op]();
 		REMOVE_PREFIX
-		i286reg.prefix = 0;
+		i286core.s.prefix = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);