--- np2/i386c/ia32/instructions/data_trans.c	2004/02/20 16:09:05	1.8
+++ np2/i386c/ia32/instructions/data_trans.c	2004/03/12 13:34:08	1.13
@@ -1,4 +1,4 @@
-/*	$Id: data_trans.c,v 1.8 2004/02/20 16:09:05 monaka Exp $	*/
+/*	$Id: data_trans.c,v 1.13 2004/03/12 13:34:08 monaka Exp $	*/
 
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
@@ -138,6 +138,30 @@ MOV_EwSw(void)
 }
 
 void
+MOV_EdSw(void)
+{
+	UINT32 op, src, madr;
+	UINT8 idx;
+
+	GET_PCBYTE(op);
+	idx = (UINT8)((op >> 3) & 7);
+	if (idx < CPU_SEGREG_NUM) {
+		src = CPU_REGS_SREG(idx);
+		if (op >= 0xc0) {
+			CPU_WORKCLOCK(2);
+			*(reg32_b20[op]) = src;
+		} else {
+			CPU_WORKCLOCK(3);
+			madr = calc_ea_dst(op);
+			// LSB only...
+			cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)src);
+		}
+		return;
+	}
+	EXCEPTION(UD_EXCEPTION, 0);
+}
+
+void
 MOV_SwEw(void)
 {
 	UINT32 op, src, madr;
@@ -929,6 +953,7 @@ XADD_EdGd(void)
 /*
  * CMPXCHG
  */
+#if 1
 void
 CMPXCHG_EbGb(void)
 {
@@ -995,7 +1020,7 @@ CMPXCHG_EdGd(void)
 	if (op >= 0xc0) {
 		out = reg32_b20[op];
 		dst = *out;
-		WORD_SUB(tmp, CPU_EAX, dst);
+		DWORD_SUB(tmp, CPU_EAX, dst);
 		if (CPU_FLAGL & Z_FLAG) {
 			*out = src;
 		} else {
@@ -1004,7 +1029,7 @@ CMPXCHG_EdGd(void)
 	} else {
 		madr = calc_ea_dst(op);
 		dst = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
-		DWORD_SUB(tmp, CPU_AX, dst);
+		DWORD_SUB(tmp, CPU_EAX, dst);
 		if (CPU_FLAGL & Z_FLAG) {
 			cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, src);
 		} else {
@@ -1012,6 +1037,97 @@ CMPXCHG_EdGd(void)
 		}
 	}
 }
+#else
+void
+CMPXCHG_EbGb(void)
+{
+	UINT8 *out;
+	UINT32 op, src, dst, madr, tmp;
+
+	PREPART_EA_REG8(op, src);
+	if (op >= 0xc0) {
+		out = reg8_b20[op];
+		dst = *out;
+		if (CPU_AL == dst) {
+			CPU_FLAGL |= Z_FLAG;
+			*out = (UINT8)src;
+		} else {
+			CPU_FLAGL &= ~Z_FLAG;
+			CPU_AL = (UINT8)dst;
+		}
+	} else {
+		madr = calc_ea_dst(op);
+		dst = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr);
+		if (CPU_AL == dst) {
+			CPU_FLAGL |= Z_FLAG;
+			cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, (UINT8)src);
+		} else {
+			CPU_FLAGL &= ~Z_FLAG;
+			CPU_AL = (UINT8)dst;
+		}
+	}
+}
+
+void
+CMPXCHG_EwGw(void)
+{
+	UINT16 *out;
+	UINT32 op, src, dst, madr, tmp;
+
+	PREPART_EA_REG16(op, src);
+	if (op >= 0xc0) {
+		out = reg16_b20[op];
+		dst = *out;
+		if (CPU_AX == dst) {
+			CPU_FLAGL |= Z_FLAG;
+			*out = (UINT16)src;
+		} else {
+			CPU_FLAGL &= ~Z_FLAG;
+			CPU_AX = (UINT16)dst;
+		}
+	} else {
+		madr = calc_ea_dst(op);
+		dst = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
+		if (CPU_AX == dst) {
+			CPU_FLAGL |= Z_FLAG;
+			cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)src);
+		} else {
+			CPU_FLAGL &= ~Z_FLAG;
+			CPU_AX = (UINT16)dst;
+		}
+	}
+}
+
+void
+CMPXCHG_EdGd(void)
+{
+	UINT32 *out;
+	UINT32 op, src, dst, madr, tmp;
+
+	PREPART_EA_REG32(op, src);
+	if (op >= 0xc0) {
+		out = reg32_b20[op];
+		dst = *out;
+		if (CPU_EAX == dst) {
+			CPU_FLAGL |= Z_FLAG;
+			*out = src;
+		} else {
+			CPU_FLAGL &= ~Z_FLAG;
+			CPU_EAX = dst;
+		}
+	} else {
+		madr = calc_ea_dst(op);
+		dst = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
+		if (CPU_EAX == dst) {
+			CPU_FLAGL |= Z_FLAG;
+			cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, src);
+		} else {
+			CPU_FLAGL &= ~Z_FLAG;
+			CPU_EAX = dst;
+		}
+	}
+}
+#endif
 
 void
 CMPXCHG8B(UINT32 op)
@@ -1349,7 +1465,7 @@ PUSHA(void)
 	CPU_WORKCLOCK(17);
 	if (!CPU_STAT_SS32) {
 		if (CPU_STAT_PM) {
-			CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_SP, 16);
+			STACK_PUSH_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), CPU_SP, 16);
 		}
 		REGPUSH0(CPU_AX);
 		REGPUSH0(CPU_CX);
@@ -1361,7 +1477,7 @@ PUSHA(void)
 		REGPUSH0(CPU_DI);
 	} else {
 		if (CPU_STAT_PM) {
-			CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 16);
+			STACK_PUSH_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 16);
 		}
 		REGPUSH0_16_32(CPU_AX);
 		REGPUSH0_16_32(CPU_CX);
@@ -1382,7 +1498,7 @@ PUSHAD(void)
 	CPU_WORKCLOCK(17);
 	if (!CPU_STAT_SS32) {
 		if (CPU_STAT_PM) {
-			CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_SP, 32);
+			STACK_PUSH_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), CPU_SP, 32);
 		}
 		REGPUSH0_32_16(CPU_EAX);
 		REGPUSH0_32_16(CPU_ECX);
@@ -1394,7 +1510,7 @@ PUSHAD(void)
 		REGPUSH0_32_16(CPU_EDI);
 	} else {
 		if (CPU_STAT_PM) {
-			CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 32);
+			STACK_PUSH_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 32);
 		}
 		REGPUSH0_32(CPU_EAX);
 		REGPUSH0_32(CPU_ECX);
@@ -1414,7 +1530,7 @@ POPA(void)
 	CPU_WORKCLOCK(19);
 	if (!CPU_STAT_SS32) {
 		if (CPU_STAT_PM) {
-			CHECK_STACK_POP(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_SP, 16);
+			STACK_POP_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), CPU_SP, 16);
 		}
 		REGPOP0(CPU_DI);
 		REGPOP0(CPU_SI);
@@ -1426,7 +1542,7 @@ POPA(void)
 		REGPOP0(CPU_AX);
 	} else {
 		if (CPU_STAT_PM) {
-			CHECK_STACK_POP(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 16);
+			STACK_POP_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 16);
 		}
 		REGPOP0_16_32(CPU_DI);
 		REGPOP0_16_32(CPU_SI);
@@ -1446,7 +1562,7 @@ POPAD(void)
 	CPU_WORKCLOCK(19);
 	if (!CPU_STAT_SS32) {
 		if (CPU_STAT_PM) {
-			CHECK_STACK_POP(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_SP, 32);
+			STACK_POP_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), CPU_SP, 32);
 		}
 		REGPOP0_32_16(CPU_EDI);
 		REGPOP0_32_16(CPU_ESI);
@@ -1458,7 +1574,7 @@ POPAD(void)
 		REGPOP0_32_16(CPU_EAX);
 	} else {
 		if (CPU_STAT_PM) {
-			CHECK_STACK_POP(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 32);
+			STACK_POP_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 32);
 		}
 		REGPOP0_32(CPU_EDI);
 		REGPOP0_32(CPU_ESI);