--- np2/i286c/i286c_mn.c	2003/12/01 17:13:36	1.19
+++ np2/i286c/i286c_mn.c	2003/12/25 19:26:55	1.26
@@ -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"
@@ -23,12 +22,27 @@
 			I286_REMCLOCK = (c);								\
 		}
 
+// ---- select...
+
+static UINT32 segselect(UINT sel) {
+
+	I286DTR	*dtr;
+	UINT32	addr;
+	UINT32	ret;
+
+	dtr = (sel & 4)?&I286_IDTR:&I286_GDTR;
+	addr = (dtr->base24 << 16) + dtr->base + (sel & (~7));
+	ret = i286_memoryread_w(addr+2);
+	ret += i286_memoryread(addr+4) << 16;
+	TRACEOUT(("PE - select %.4x %.8x", sel, ret));
+	return(ret);
+}
+
 
 // ----
 
 I286FN _reserved(void) {
 
-	I286_WORKCLOCK(23);							// ToDo
 	INT_NUM(6, I286_IP - 1);
 }
 
@@ -149,8 +163,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 & 1)) {
+		ES_BASE = tmp << 4;
+		NEXT_OPCODE
+	}
+	else {
+		ES_BASE = segselect(tmp);
+	}
 }
 
 I286FN _or_ea_r8(void) {						// 08: or EA, REG8
@@ -383,10 +406,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 & 1)) {
+		SS_BASE = tmp << 4;
+		SS_FIX = tmp << 4;
+		NEXT_OPCODE
+	}
+	else {
+		base = segselect(tmp);
+		SS_BASE = base;
+		SS_FIX = base;
+		NEXT_OPCODE
+	}
 }
 
 I286FN _sbb_ea_r8(void) {						// 18: sbb EA, REG8
@@ -506,9 +541,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 & 1)) {
+		DS_BASE = tmp << 4;
+		DS_FIX = tmp << 4;
+		NEXT_OPCODE
+	}
+	else {
+		base = segselect(tmp);
+		DS_BASE = base;
+		DS_FIX = base;
+		NEXT_OPCODE
+	}
 }
 
 I286FN _and_ea_r8(void) {						// 20: and EA, REG8
@@ -623,13 +671,13 @@ I286FN _segprefix_es(void) {					// 26: 
 
 	SS_FIX = ES_BASE;
 	DS_FIX = ES_BASE;
-	i286core.s.prefix++;
-	if (i286core.s.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op[op]();
 		REMOVE_PREFIX
-		i286core.s.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -769,13 +817,13 @@ I286FN _segprefix_cs(void) {					// 2e: 
 
 	SS_FIX = CS_BASE;
 	DS_FIX = CS_BASE;
-	i286core.s.prefix++;
-	if (i286core.s.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op[op]();
 		REMOVE_PREFIX
-		i286core.s.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -910,13 +958,13 @@ I286FN _segprefix_ss(void) {					// 36: 
 
 	SS_FIX = SS_BASE;
 	DS_FIX = SS_BASE;
-	i286core.s.prefix++;
-	if (i286core.s.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op[op]();
 		REMOVE_PREFIX
-		i286core.s.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -934,6 +982,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
@@ -1026,13 +1075,13 @@ I286FN _segprefix_ds(void) {					// 3e: 
 
 	SS_FIX = DS_BASE;
 	DS_FIX = DS_BASE;
-	i286core.s.prefix++;
-	if (i286core.s.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op[op]();
 		REMOVE_PREFIX
-		i286core.s.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -1659,6 +1708,7 @@ I286FN _mov_seg_ea(void) {					// 8E:	mo
 
 	UINT	op;
 	UINT	tmp;
+	UINT32	base;
 	UINT16	ipbak;
 
 	ipbak = I286_IP;
@@ -1671,23 +1721,30 @@ I286FN _mov_seg_ea(void) {					// 8E:	mo
 		I286_WORKCLOCK(5);
 		tmp = i286_memoryread_w(CALC_EA(op));
 	}
+	if (!(I286_MSW & 1)) {
+		base = tmp << 4;
+	}
+	else {
+		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
@@ -1813,13 +1870,13 @@ I286FN _popf(void) {						// 9D:	popf
 
 	UINT	flag;
 
-	I286_WORKCLOCK(5);
 	REGPOP0(flag)
 	I286_OV = flag & O_FLAG;
 	I286_FLAG = flag & (0xfff ^ O_FLAG);
 	I286_TRAP = ((flag & 0x300) == 0x300);
+	I286_WORKCLOCK(5);
 #if defined(INTR_FAST)
-	if ((flag & I_FLAG) && (PICEXISTINTR)) {
+	if ((I286_TRAP) || ((flag & I_FLAG) && (PICEXISTINTR))) {
 		I286IRQCHECKTERM
 	}
 #else
@@ -2245,7 +2302,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);
 }
 
@@ -2253,7 +2310,7 @@ I286FN _int_data8(void) {					// CD:	int
 
 	UINT	vect;
 
-	I286_WORKCLOCK(23);
+	I286_WORKCLOCK(3);
 	GET_PCBYTE(vect)
 	INT_NUM(vect, I286_IP);
 }
@@ -2262,7 +2319,6 @@ I286FN _into(void) {						// CE:	into
 
 	I286_WORKCLOCK(4);
 	if (I286_OV) {
-		I286_WORKCLOCK(24 - 4);
 		INT_NUM(4, I286_IP);
 	}
 }
@@ -2272,7 +2328,6 @@ I286FN _iret(void) {						// CF:	iret
 	UINT	flag;
 
 	extirq_pop();
-	I286_WORKCLOCK(31);
 	REGPOP0(I286_IP)
 	REGPOP0(I286_CS)
 	REGPOP0(flag)
@@ -2280,8 +2335,9 @@ I286FN _iret(void) {						// CF:	iret
 	I286_FLAG = flag & (0xfff ^ O_FLAG);
 	I286_TRAP = ((flag & 0x300) == 0x300);
 	CS_BASE = I286_CS << 4;
+	I286_WORKCLOCK(31);
 #if defined(INTR_FAST)
-	if ((flag & I_FLAG) && (PICEXISTINTR)) {
+	if ((I286_TRAP) || ((flag & I_FLAG) && (PICEXISTINTR))) {
 		I286IRQCHECKTERM
 	}
 #else
@@ -2340,7 +2396,7 @@ I286FN _shift_ea8_cl(void) {			// D2:	sh
 	BYTE	*out;
 	UINT	op;
 	UINT32	madr;
-	BYTE	cl;
+	REG8	cl;
 
 	GET_PCBYTE(op)
 	if (op >= 0xc0) {
@@ -2368,7 +2424,7 @@ I286FN _shift_ea16_cl(void) {			// D3:	s
 	UINT16	*out;
 	UINT	op;
 	UINT32	madr;
-	BYTE	cl;
+	REG8	cl;
 
 	GET_PCBYTE(op)
 	if (op >= 0xc0) {
@@ -2474,9 +2530,9 @@ I286FN _in_al_data8(void) {					// E4:	i
 
 	I286_WORKCLOCK(5);
 	GET_PCBYTE(port)
-	i286core.s.inport = CS_BASE + I286_IP;
+	I286_INPADRS = CS_BASE + I286_IP;
 	I286_AL = iocore_inp8(port);
-	i286core.s.inport = 0;
+	I286_INPADRS = 0;
 }
 
 I286FN _in_ax_data8(void) {					// E5:	in		ax, DATA8
@@ -2576,12 +2632,12 @@ I286FN _lock(void) {						// F0:	lock
 
 I286FN _repne(void) {						// F2:	repne
 
-	i286core.s.prefix++;
-	if (i286core.s.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repne[op]();
-		i286core.s.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -2590,12 +2646,12 @@ I286FN _repne(void) {						// F2:	repne
 
 I286FN _repe(void) {						// F3:	repe
 
-	i286core.s.prefix++;
-	if (i286core.s.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repe[op]();
-		i286core.s.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -2654,15 +2710,19 @@ 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;
 #if defined(INTR_FAST)
-	if (PICEXISTINTR) {
+	if ((I286_TRAP) || (PICEXISTINTR)) {
 		REMAIN_ADJUST(1)
 	}
+	else {
+		NEXT_OPCODE;
+	}
 #else
 	REMAIN_ADJUST(1)
 #endif
@@ -2980,13 +3040,13 @@ I286FN _repe_segprefix_es(void) {
 
 	DS_FIX = ES_BASE;
 	SS_FIX = ES_BASE;
-	i286core.s.prefix++;
-	if (i286core.s.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repe[op]();
 		REMOVE_PREFIX
-		i286core.s.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -2997,13 +3057,13 @@ I286FN _repe_segprefix_cs(void) {
 
 	DS_FIX = CS_BASE;
 	SS_FIX = CS_BASE;
-	i286core.s.prefix++;
-	if (i286core.s.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repe[op]();
 		REMOVE_PREFIX
-		i286core.s.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -3014,13 +3074,13 @@ I286FN _repe_segprefix_ss(void) {
 
 	DS_FIX = SS_BASE;
 	SS_FIX = SS_BASE;
-	i286core.s.prefix++;
-	if (i286core.s.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repe[op]();
 		REMOVE_PREFIX
-		i286core.s.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -3031,13 +3091,13 @@ I286FN _repe_segprefix_ds(void) {
 
 	DS_FIX = DS_BASE;
 	SS_FIX = DS_BASE;
-	i286core.s.prefix++;
-	if (i286core.s.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repe[op]();
 		REMOVE_PREFIX
-		i286core.s.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -3325,13 +3385,13 @@ I286FN _repne_segprefix_es(void) {
 
 	DS_FIX = ES_BASE;
 	SS_FIX = ES_BASE;
-	i286core.s.prefix++;
-	if (i286core.s.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repne[op]();
 		REMOVE_PREFIX
-		i286core.s.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -3342,13 +3402,13 @@ I286FN _repne_segprefix_cs(void) {
 
 	DS_FIX = CS_BASE;
 	SS_FIX = CS_BASE;
-	i286core.s.prefix++;
-	if (i286core.s.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repne[op]();
 		REMOVE_PREFIX
-		i286core.s.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -3359,13 +3419,13 @@ I286FN _repne_segprefix_ss(void) {
 
 	DS_FIX = SS_BASE;
 	SS_FIX = SS_BASE;
-	i286core.s.prefix++;
-	if (i286core.s.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repne[op]();
 		REMOVE_PREFIX
-		i286core.s.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);
@@ -3376,13 +3436,13 @@ I286FN _repne_segprefix_ds(void) {
 
 	DS_FIX = DS_BASE;
 	SS_FIX = DS_BASE;
-	i286core.s.prefix++;
-	if (i286core.s.prefix < MAX_PREFIX) {
+	I286_PREFIX++;
+	if (I286_PREFIX < MAX_PREFIX) {
 		UINT op;
 		GET_PCBYTE(op);
 		i286op_repne[op]();
 		REMOVE_PREFIX
-		i286core.s.prefix = 0;
+		I286_PREFIX = 0;
 	}
 	else {
 		INT_NUM(6, I286_IP);