--- np2/i286c/i286c_mn.c	2003/11/29 03:38:26	1.15
+++ np2/i286c/i286c_mn.c	2004/01/22 01:54:38	1.29
@@ -1,7 +1,6 @@
 #include	"compiler.h"
-#include	"i286.h"
+#include	"cpucore.h"
 #include	"i286c.h"
-#include	"memory.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"bios.h"
@@ -10,6 +9,7 @@
 
 #define	MAX_PREFIX		8
 
+
 #define	NEXT_OPCODE												\
 		if (I286_REMCLOCK < 1) {								\
 			I286_BASECLOCK += (1 - I286_REMCLOCK);				\
@@ -27,7 +27,6 @@
 
 I286FN _reserved(void) {
 
-	I286_WORKCLOCK(23);							// ToDo
 	INT_NUM(6, I286_IP - 1);
 }
 
@@ -148,8 +147,17 @@ 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;
+	if (!(I286_MSW & MSW_PE)) {
+		ES_BASE = tmp << 4;
+		NEXT_OPCODE
+	}
+	else {
+		ES_BASE = i286c_selector(tmp);
+	}
 }
 
 I286FN _or_ea_r8(void) {						// 08: or EA, REG8
@@ -382,10 +390,22 @@ I286FN _push_ss(void) {							// 16: pus
 
 I286FN _pop_ss(void) {							// 17: pop ss
 
-	REGPOP(I286_SS, 5)
-	SS_BASE = I286_SS << 4;
-	SS_FIX = SS_BASE;
-	NEXT_OPCODE
+	UINT	tmp;
+	UINT32	base;
+
+	REGPOP(tmp, 5)
+	I286_SS = tmp;
+	if (!(I286_MSW & MSW_PE)) {
+		SS_BASE = tmp << 4;
+		SS_FIX = tmp << 4;
+		NEXT_OPCODE
+	}
+	else {
+		base = i286c_selector(tmp);
+		SS_BASE = base;
+		SS_FIX = base;
+		NEXT_OPCODE
+	}
 }
 
 I286FN _sbb_ea_r8(void) {						// 18: sbb EA, REG8
@@ -505,9 +525,22 @@ I286FN _push_ds(void) {							// 1e: pus
 
 I286FN _pop_ds(void) {							// 1f: pop ds
 
-	REGPOP(I286_DS, 5)
-	DS_BASE = I286_DS << 4;
-	DS_FIX = DS_BASE;
+	UINT	tmp;
+	UINT32	base;
+
+	REGPOP(tmp, 5)
+	I286_DS = tmp;
+	if (!(I286_MSW & MSW_PE)) {
+		DS_BASE = tmp << 4;
+		DS_FIX = tmp << 4;
+		NEXT_OPCODE
+	}
+	else {
+		base = i286c_selector(tmp);
+		DS_BASE = base;
+		DS_FIX = base;
+		NEXT_OPCODE
+	}
 }
 
 I286FN _and_ea_r8(void) {						// 20: and EA, REG8
@@ -622,13 +655,13 @@ I286FN _segprefix_es(void) {					// 26: 
 
 	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);
@@ -768,13 +801,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);
@@ -909,13 +942,13 @@ I286FN _segprefix_ss(void) {					// 36: 
 
 	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);
@@ -933,6 +966,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
@@ -1025,13 +1059,13 @@ I286FN _segprefix_ds(void) {					// 3e: 
 
 	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);
@@ -1085,9 +1119,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)
@@ -1114,6 +1213,8 @@ I286FN _popa(void) {						// 61:	popa
 	I286_WORKCLOCK(19);
 }
 
+#endif
+
 I286FN _bound(void) {						// 62:	bound
 
 	UINT	vect = 0;
@@ -1591,6 +1692,7 @@ I286FN _mov_seg_ea(void) {					// 8E:	mo
 
 	UINT	op;
 	UINT	tmp;
+	UINT32	base;
 	UINT16	ipbak;
 
 	ipbak = I286_IP;
@@ -1603,23 +1705,30 @@ I286FN _mov_seg_ea(void) {					// 8E:	mo
 		I286_WORKCLOCK(5);
 		tmp = i286_memoryread_w(CALC_EA(op));
 	}
+	if (!(I286_MSW & MSW_PE)) {
+		base = tmp << 4;
+	}
+	else {
+		base = i286c_selector(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
@@ -1743,12 +1852,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
@@ -2169,7 +2286,7 @@ I286FN _ret_far(void) {						// CB:	ret 
 
 I286FN _int_03(void) {						// CC:	int		3
 
-	I286_WORKCLOCK(23);
+	I286_WORKCLOCK(3);
 	INT_NUM(3, I286_IP);
 }
 
@@ -2177,7 +2294,7 @@ I286FN _int_data8(void) {					// CD:	int
 
 	UINT	vect;
 
-	I286_WORKCLOCK(23);
+	I286_WORKCLOCK(3);
 	GET_PCBYTE(vect)
 	INT_NUM(vect, I286_IP);
 }
@@ -2186,23 +2303,30 @@ 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
 
+	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;
+	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
@@ -2256,7 +2380,7 @@ I286FN _shift_ea8_cl(void) {			// D2:	sh
 	BYTE	*out;
 	UINT	op;
 	UINT32	madr;
-	BYTE	cl;
+	REG8	cl;
 
 	GET_PCBYTE(op)
 	if (op >= 0xc0) {
@@ -2284,7 +2408,7 @@ I286FN _shift_ea16_cl(void) {			// D3:	s
 	UINT16	*out;
 	UINT	op;
 	UINT32	madr;
-	BYTE	cl;
+	REG8	cl;
 
 	GET_PCBYTE(op)
 	if (op >= 0xc0) {
@@ -2390,9 +2514,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
@@ -2492,12 +2616,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);
@@ -2506,12 +2630,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);
@@ -2568,10 +2692,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
@@ -2886,13 +3024,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);
@@ -2903,13 +3041,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);
@@ -2920,13 +3058,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);
@@ -2937,13 +3075,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);
@@ -3231,13 +3369,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);
@@ -3248,13 +3386,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);
@@ -3265,13 +3403,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);
@@ -3282,13 +3420,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);