--- np2/i386c/ia32/instructions/data_trans.c	2004/02/19 03:04:02	1.7
+++ np2/i386c/ia32/instructions/data_trans.c	2004/05/22 16:35:07	1.16
@@ -1,4 +1,4 @@
-/*	$Id: data_trans.c,v 1.7 2004/02/19 03:04:02 yui Exp $	*/
+/*	$Id: data_trans.c,v 1.16 2004/05/22 16:35:07 monaka Exp $	*/
 
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
@@ -39,39 +39,39 @@
 void
 MOV_EbGb(void)
 {
-	DWORD op, src, madr;
+	UINT32 op, src, madr;
 
 	PREPART_EA_REG8(op, src);
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(2);
-		*(reg8_b20[op]) = (BYTE)src;
+		*(reg8_b20[op]) = (UINT8)src;
 	} else {
 		CPU_WORKCLOCK(3);
 		madr = calc_ea_dst(op);
-		cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, (BYTE)src);
+		cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, (UINT8)src);
 	}
 }
 
 void
 MOV_EwGw(void)
 {
-	DWORD op, src, madr;
+	UINT32 op, src, madr;
 
 	PREPART_EA_REG16(op, src);
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(2);
-		*(reg16_b20[op]) = (WORD)src;
+		*(reg16_b20[op]) = (UINT16)src;
 	} else {
 		CPU_WORKCLOCK(3);
 		madr = calc_ea_dst(op);
-		cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (WORD)src);
+		cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)src);
 	}
 }
 
 void
 MOV_EdGd(void)
 {
-	DWORD op, src, madr;
+	UINT32 op, src, madr;
 
 	PREPART_EA_REG32(op, src);
 	if (op >= 0xc0) {
@@ -87,28 +87,28 @@ MOV_EdGd(void)
 void
 MOV_GbEb(void)
 {
-	BYTE *out;
-	DWORD op, src;
+	UINT8 *out;
+	UINT32 op, src;
 
 	PREPART_REG8_EA(op, src, out, 2, 5);
-	*out = (BYTE)src;
+	*out = (UINT8)src;
 }
 
 void
 MOV_GwEw(void)
 {
-	WORD *out;
-	DWORD op, src;
+	UINT16 *out;
+	UINT32 op, src;
 
 	PREPART_REG16_EA(op, src, out, 2, 5);
-	*out = (WORD)src;
+	*out = (UINT16)src;
 }
 
 void
 MOV_GdEd(void)
 {
-	DWORD *out;
-	DWORD op, src;
+	UINT32 *out;
+	UINT32 op, src;
 
 	PREPART_REG32_EA(op, src, out, 2, 5);
 	*out = src;
@@ -117,20 +117,43 @@ MOV_GdEd(void)
 void
 MOV_EwSw(void)
 {
-	DWORD op, src, madr;
-	BYTE idx;
+	UINT32 op, src, madr;
+	UINT8 idx;
 
 	GET_PCBYTE(op);
-	idx = (BYTE)((op >> 3) & 7);
+	idx = (UINT8)((op >> 3) & 7);
 	if (idx < CPU_SEGREG_NUM) {
 		src = CPU_REGS_SREG(idx);
 		if (op >= 0xc0) {
 			CPU_WORKCLOCK(2);
-			*(reg16_b20[op]) = (WORD)src;
+			*(reg16_b20[op]) = (UINT16)src;
 		} else {
 			CPU_WORKCLOCK(3);
 			madr = calc_ea_dst(op);
-			cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (WORD)src);
+			cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)src);
+		}
+		return;
+	}
+	EXCEPTION(UD_EXCEPTION, 0);
+}
+
+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);
+			cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)src);
 		}
 		return;
 	}
@@ -140,11 +163,11 @@ MOV_EwSw(void)
 void
 MOV_SwEw(void)
 {
-	DWORD op, src, madr;
-	BYTE idx;
+	UINT32 op, src, madr;
+	UINT8 idx;
 
 	GET_PCBYTE(op);
-	idx = ((BYTE)(op >> 3) & 7);
+	idx = ((UINT8)(op >> 3) & 7);
 	if (idx != CPU_CS_INDEX && idx < CPU_SEGREG_NUM) {
 		if (op >= 0xc0) {
 			CPU_WORKCLOCK(2);
@@ -154,7 +177,7 @@ MOV_SwEw(void)
 			madr = calc_ea_dst(op);
 			src = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
 		}
-		CPU_SET_SEGREG(idx, (WORD)src);
+		CPU_SET_SEGREG(idx, (UINT16)src);
 		if (idx == CPU_SS_INDEX) {
 			exec_1step();
 		}
@@ -166,7 +189,7 @@ MOV_SwEw(void)
 void
 MOV_ALOb(void)
 {
-	DWORD madr;
+	UINT32 madr;
 
 	CPU_WORKCLOCK(5);
 	CPU_INST_SEGREG_INDEX = DS_FIX;
@@ -182,7 +205,7 @@ MOV_ALOb(void)
 void
 MOV_AXOw(void)
 {
-	DWORD madr;
+	UINT32 madr;
 
 	CPU_WORKCLOCK(5);
 	CPU_INST_SEGREG_INDEX = DS_FIX;
@@ -198,7 +221,7 @@ MOV_AXOw(void)
 void
 MOV_EAXOd(void)
 {
-	DWORD madr;
+	UINT32 madr;
 
 	CPU_WORKCLOCK(5);
 	CPU_INST_SEGREG_INDEX = DS_FIX;
@@ -214,7 +237,7 @@ MOV_EAXOd(void)
 void
 MOV_ObAL(void)
 {
-	DWORD madr;
+	UINT32 madr;
 
 	CPU_WORKCLOCK(3);
 	CPU_INST_SEGREG_INDEX = DS_FIX;
@@ -230,7 +253,7 @@ MOV_ObAL(void)
 void
 MOV_OwAX(void)
 {
-	DWORD madr;
+	UINT32 madr;
 
 	CPU_WORKCLOCK(3);
 	CPU_INST_SEGREG_INDEX = DS_FIX;
@@ -246,7 +269,7 @@ MOV_OwAX(void)
 void
 MOV_OdEAX(void)
 {
-	DWORD madr;
+	UINT32 madr;
 
 	CPU_WORKCLOCK(3);
 	CPU_INST_SEGREG_INDEX = DS_FIX;
@@ -262,43 +285,43 @@ MOV_OdEAX(void)
 void
 MOV_EbIb(void)
 {
-	DWORD op, src, res, madr;
+	UINT32 op, src, res, madr;
 
 	PREPART_EA_REG8(op, src);
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(2);
 		GET_PCBYTE(res);
-		*(reg8_b20[op]) = (BYTE)res;
+		*(reg8_b20[op]) = (UINT8)res;
 	} else {
 		CPU_WORKCLOCK(7);
 		madr = calc_ea_dst(op);
 		GET_PCBYTE(res);
-		cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, (BYTE)res);
+		cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, (UINT8)res);
 	}
 }
 
 void
 MOV_EwIw(void)
 {
-	DWORD op, src, res, madr;
+	UINT32 op, src, res, madr;
 
 	PREPART_EA_REG16(op, src);
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(2);
 		GET_PCWORD(res);
-		*(reg16_b20[op]) = (WORD)res;
+		*(reg16_b20[op]) = (UINT16)res;
 	} else {
 		CPU_WORKCLOCK(7);
 		madr = calc_ea_dst(op);
 		GET_PCWORD(res);
-		cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (WORD)res);
+		cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)res);
 	}
 }
 
 void
 MOV_EdId(void)
 {
-	DWORD op, src, res, madr;
+	UINT32 op, src, res, madr;
 
 	PREPART_EA_REG32(op, src);
 	if (op >= 0xc0) {
@@ -346,23 +369,23 @@ void MOV_EDIId(void) { CPU_WORKCLOCK(2);
 void
 CMOVO_GwEw(void)
 {
-	WORD *out;
-	DWORD op, src;
+	UINT16 *out;
+	UINT32 op, src;
 
 	PREPART_REG16_EA(op, src, out, 2, 5);
-	if (CPU_OV) {
-		*out = (WORD)src;
+	if (CC_O) {
+		*out = (UINT16)src;
 	}
 }
 
 void
 CMOVO_GdEd(void)
 {
-	DWORD *out;
-	DWORD op, src;
+	UINT32 *out;
+	UINT32 op, src;
 
 	PREPART_REG32_EA(op, src, out, 2, 5);
-	if (CPU_OV) {
+	if (CC_O) {
 		*out = src;
 	}
 }
@@ -370,23 +393,23 @@ CMOVO_GdEd(void)
 void
 CMOVNO_GwEw(void)
 {
-	WORD *out;
-	DWORD op, src;
+	UINT16 *out;
+	UINT32 op, src;
 
 	PREPART_REG16_EA(op, src, out, 2, 5);
-	if (!CPU_OV) {
-		*out = (WORD)src;
+	if (CC_NO) {
+		*out = (UINT16)src;
 	}
 }
 
 void
 CMOVNO_GdEd(void)
 {
-	DWORD *out;
-	DWORD op, src;
+	UINT32 *out;
+	UINT32 op, src;
 
 	PREPART_REG32_EA(op, src, out, 2, 5);
-	if (!CPU_OV) {
+	if (CC_NO) {
 		*out = src;
 	}
 }
@@ -394,23 +417,23 @@ CMOVNO_GdEd(void)
 void
 CMOVC_GwEw(void)
 {
-	WORD *out;
-	DWORD op, src;
+	UINT16 *out;
+	UINT32 op, src;
 
 	PREPART_REG16_EA(op, src, out, 2, 5);
-	if (CPU_FLAGL & C_FLAG) {
-		*out = (WORD)src;
+	if (CC_C) {
+		*out = (UINT16)src;
 	}
 }
 
 void
 CMOVC_GdEd(void)
 {
-	DWORD *out;
-	DWORD op, src;
+	UINT32 *out;
+	UINT32 op, src;
 
 	PREPART_REG32_EA(op, src, out, 2, 5);
-	if (CPU_FLAGL & C_FLAG) {
+	if (CC_C) {
 		*out = src;
 	}
 }
@@ -418,23 +441,23 @@ CMOVC_GdEd(void)
 void
 CMOVNC_GwEw(void)
 {
-	WORD *out;
-	DWORD op, src;
+	UINT16 *out;
+	UINT32 op, src;
 
 	PREPART_REG16_EA(op, src, out, 2, 5);
-	if (!(CPU_FLAGL & C_FLAG)) {
-		*out = (WORD)src;
+	if (CC_NC) {
+		*out = (UINT16)src;
 	}
 }
 
 void
 CMOVNC_GdEd(void)
 {
-	DWORD *out;
-	DWORD op, src;
+	UINT32 *out;
+	UINT32 op, src;
 
 	PREPART_REG32_EA(op, src, out, 2, 5);
-	if (!(CPU_FLAGL & C_FLAG)) {
+	if (CC_NC) {
 		*out = src;
 	}
 }
@@ -442,23 +465,23 @@ CMOVNC_GdEd(void)
 void
 CMOVZ_GwEw(void)
 {
-	WORD *out;
-	DWORD op, src;
+	UINT16 *out;
+	UINT32 op, src;
 
 	PREPART_REG16_EA(op, src, out, 2, 5);
-	if (CPU_FLAGL & Z_FLAG) {
-		*out = (WORD)src;
+	if (CC_Z) {
+		*out = (UINT16)src;
 	}
 }
 
 void
 CMOVZ_GdEd(void)
 {
-	DWORD *out;
-	DWORD op, src;
+	UINT32 *out;
+	UINT32 op, src;
 
 	PREPART_REG32_EA(op, src, out, 2, 5);
-	if (CPU_FLAGL & Z_FLAG) {
+	if (CC_Z) {
 		*out = src;
 	}
 }
@@ -466,23 +489,23 @@ CMOVZ_GdEd(void)
 void
 CMOVNZ_GwEw(void)
 {
-	WORD *out;
-	DWORD op, src;
+	UINT16 *out;
+	UINT32 op, src;
 
 	PREPART_REG16_EA(op, src, out, 2, 5);
-	if (!(CPU_FLAGL & Z_FLAG)) {
-		*out = (WORD)src;
+	if (CC_NZ) {
+		*out = (UINT16)src;
 	}
 }
 
 void
 CMOVNZ_GdEd(void)
 {
-	DWORD *out;
-	DWORD op, src;
+	UINT32 *out;
+	UINT32 op, src;
 
 	PREPART_REG32_EA(op, src, out, 2, 5);
-	if (!(CPU_FLAGL & Z_FLAG)) {
+	if (CC_NZ) {
 		*out = src;
 	}
 }
@@ -490,23 +513,23 @@ CMOVNZ_GdEd(void)
 void
 CMOVA_GwEw(void)
 {
-	WORD *out;
-	DWORD op, src;
+	UINT16 *out;
+	UINT32 op, src;
 
 	PREPART_REG16_EA(op, src, out, 2, 5);
-	if (!(CPU_FLAGL & (Z_FLAG | C_FLAG))) {
-		*out = (WORD)src;
+	if (CC_A) {
+		*out = (UINT16)src;
 	}
 }
 
 void
 CMOVA_GdEd(void)
 {
-	DWORD *out;
-	DWORD op, src;
+	UINT32 *out;
+	UINT32 op, src;
 
 	PREPART_REG32_EA(op, src, out, 2, 5);
-	if (!(CPU_FLAGL & (Z_FLAG | C_FLAG))) {
+	if (CC_A) {
 		*out = src;
 	}
 }
@@ -514,23 +537,23 @@ CMOVA_GdEd(void)
 void
 CMOVNA_GwEw(void)
 {
-	WORD *out;
-	DWORD op, src;
+	UINT16 *out;
+	UINT32 op, src;
 
 	PREPART_REG16_EA(op, src, out, 2, 5);
-	if (CPU_FLAGL & (Z_FLAG | C_FLAG)) {
-		*out = (WORD)src;
+	if (CC_NA) {
+		*out = (UINT16)src;
 	}
 }
 
 void
 CMOVNA_GdEd(void)
 {
-	DWORD *out;
-	DWORD op, src;
+	UINT32 *out;
+	UINT32 op, src;
 
 	PREPART_REG32_EA(op, src, out, 2, 5);
-	if (CPU_FLAGL & (Z_FLAG | C_FLAG)) {
+	if (CC_NA) {
 		*out = src;
 	}
 }
@@ -538,23 +561,23 @@ CMOVNA_GdEd(void)
 void
 CMOVS_GwEw(void)
 {
-	WORD *out;
-	DWORD op, src;
+	UINT16 *out;
+	UINT32 op, src;
 
 	PREPART_REG16_EA(op, src, out, 2, 5);
-	if (CPU_FLAGL & S_FLAG) {
-		*out = (WORD)src;
+	if (CC_S) {
+		*out = (UINT16)src;
 	}
 }
 
 void
 CMOVS_GdEd(void)
 {
-	DWORD *out;
-	DWORD op, src;
+	UINT32 *out;
+	UINT32 op, src;
 
 	PREPART_REG32_EA(op, src, out, 2, 5);
-	if (CPU_FLAGL & S_FLAG) {
+	if (CC_S) {
 		*out = src;
 	}
 }
@@ -562,23 +585,23 @@ CMOVS_GdEd(void)
 void
 CMOVNS_GwEw(void)
 {
-	WORD *out;
-	DWORD op, src;
+	UINT16 *out;
+	UINT32 op, src;
 
 	PREPART_REG16_EA(op, src, out, 2, 5);
-	if (!(CPU_FLAGL & S_FLAG)) {
-		*out = (WORD)src;
+	if (CC_NS) {
+		*out = (UINT16)src;
 	}
 }
 
 void
 CMOVNS_GdEd(void)
 {
-	DWORD *out;
-	DWORD op, src;
+	UINT32 *out;
+	UINT32 op, src;
 
 	PREPART_REG32_EA(op, src, out, 2, 5);
-	if (!(CPU_FLAGL & S_FLAG)) {
+	if (CC_NS) {
 		*out = src;
 	}
 }
@@ -586,23 +609,23 @@ CMOVNS_GdEd(void)
 void
 CMOVP_GwEw(void)
 {
-	WORD *out;
-	DWORD op, src;
+	UINT16 *out;
+	UINT32 op, src;
 
 	PREPART_REG16_EA(op, src, out, 2, 5);
-	if (CPU_FLAGL & P_FLAG) {
-		*out = (WORD)src;
+	if (CC_P) {
+		*out = (UINT16)src;
 	}
 }
 
 void
 CMOVP_GdEd(void)
 {
-	DWORD *out;
-	DWORD op, src;
+	UINT32 *out;
+	UINT32 op, src;
 
 	PREPART_REG32_EA(op, src, out, 2, 5);
-	if (CPU_FLAGL & P_FLAG) {
+	if (CC_P) {
 		*out = src;
 	}
 }
@@ -610,23 +633,23 @@ CMOVP_GdEd(void)
 void
 CMOVNP_GwEw(void)
 {
-	WORD *out;
-	DWORD op, src;
+	UINT16 *out;
+	UINT32 op, src;
 
 	PREPART_REG16_EA(op, src, out, 2, 5);
-	if (!(CPU_FLAGL & P_FLAG)) {
-		*out = (WORD)src;
+	if (CC_NP) {
+		*out = (UINT16)src;
 	}
 }
 
 void
 CMOVNP_GdEd(void)
 {
-	DWORD *out;
-	DWORD op, src;
+	UINT32 *out;
+	UINT32 op, src;
 
 	PREPART_REG32_EA(op, src, out, 2, 5);
-	if (!(CPU_FLAGL & P_FLAG)) {
+	if (CC_NP) {
 		*out = src;
 	}
 }
@@ -634,23 +657,23 @@ CMOVNP_GdEd(void)
 void
 CMOVL_GwEw(void)
 {
-	WORD *out;
-	DWORD op, src;
+	UINT16 *out;
+	UINT32 op, src;
 
 	PREPART_REG16_EA(op, src, out, 2, 5);
-	if ((!CPU_OV) != (!(CPU_FLAGL & S_FLAG))) {
-		*out = (WORD)src;
+	if (CC_L) {
+		*out = (UINT16)src;
 	}
 }
 
 void
 CMOVL_GdEd(void)
 {
-	DWORD *out;
-	DWORD op, src;
+	UINT32 *out;
+	UINT32 op, src;
 
 	PREPART_REG32_EA(op, src, out, 2, 5);
-	if ((!CPU_OV) != (!(CPU_FLAGL & S_FLAG))) {
+	if (CC_L) {
 		*out = src;
 	}
 }
@@ -658,23 +681,23 @@ CMOVL_GdEd(void)
 void
 CMOVNL_GwEw(void)
 {
-	WORD *out;
-	DWORD op, src;
+	UINT16 *out;
+	UINT32 op, src;
 
 	PREPART_REG16_EA(op, src, out, 2, 5);
-	if ((!CPU_OV) == (!(CPU_FLAGL & S_FLAG))) {
-		*out = (WORD)src;
+	if (CC_NL) {
+		*out = (UINT16)src;
 	}
 }
 
 void
 CMOVNL_GdEd(void)
 {
-	DWORD *out;
-	DWORD op, src;
+	UINT32 *out;
+	UINT32 op, src;
 
 	PREPART_REG32_EA(op, src, out, 2, 5);
-	if ((!CPU_OV) == (!(CPU_FLAGL & S_FLAG))) {
+	if (CC_NL) {
 		*out = src;
 	}
 }
@@ -682,23 +705,23 @@ CMOVNL_GdEd(void)
 void
 CMOVLE_GwEw(void)
 {
-	WORD *out;
-	DWORD op, src;
+	UINT16 *out;
+	UINT32 op, src;
 
 	PREPART_REG16_EA(op, src, out, 2, 5);
-	if ((CPU_FLAGL & Z_FLAG) || ((!(CPU_FLAGL & S_FLAG)) != (!CPU_OV))) {
-		*out = (WORD)src;
+	if (CC_LE) {
+		*out = (UINT16)src;
 	}
 }
 
 void
 CMOVLE_GdEd(void)
 {
-	DWORD *out;
-	DWORD op, src;
+	UINT32 *out;
+	UINT32 op, src;
 
 	PREPART_REG32_EA(op, src, out, 2, 5);
-	if ((CPU_FLAGL & Z_FLAG) || ((!(CPU_FLAGL & S_FLAG)) != (!CPU_OV))) {
+	if (CC_LE) {
 		*out = src;
 	}
 }
@@ -706,23 +729,23 @@ CMOVLE_GdEd(void)
 void
 CMOVNLE_GwEw(void)
 {
-	WORD *out;
-	DWORD op, src;
+	UINT16 *out;
+	UINT32 op, src;
 
 	PREPART_REG16_EA(op, src, out, 2, 5);
-	if ((!(CPU_FLAGL & Z_FLAG)) && ((!(CPU_FLAGL & S_FLAG)) == (!CPU_OV))) {
-		*out = (WORD)src;
+	if (CC_NLE) {
+		*out = (UINT16)src;
 	}
 }
 
 void
 CMOVNLE_GdEd(void)
 {
-	DWORD *out;
-	DWORD op, src;
+	UINT32 *out;
+	UINT32 op, src;
 
 	PREPART_REG32_EA(op, src, out, 2, 5);
-	if ((!(CPU_FLAGL & Z_FLAG)) && ((!(CPU_FLAGL & S_FLAG)) == (!CPU_OV))) {
+	if (CC_NLE) {
 		*out = src;
 	}
 }
@@ -730,86 +753,85 @@ CMOVNLE_GdEd(void)
 /*
  * XCHG
  */
+static UINT32
+XCHG(UINT32 dst, void *arg)
+{
+	UINT32 src = PTR_TO_UINT32(arg);
+	(void)dst;
+	return src;
+}
+
 void
 XCHG_EbGb(void)
 {
-	BYTE *out, *src;
-	DWORD op, madr;
-	BYTE tmp;
+	UINT8 *out, *src;
+	UINT32 op, madr;
 
 	PREPART_EA_REG8P(op, src);
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(3);
 		out = reg8_b20[op];
-		SWAPBYTE(*out, *src);
+		SWAP_BYTE(*out, *src);
 	} else {
 		CPU_WORKCLOCK(5);
 		madr = calc_ea_dst(op);
-		tmp = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr);
-		cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, *src);
-		*src = tmp;
+		*src = (UINT8)cpu_memory_access_va_RMW(CPU_INST_SEGREG_INDEX, madr, XCHG, UINT32_TO_PTR(*src));
 	}
 }
 
 void
 XCHG_EwGw(void)
 {
-	WORD *out, *src;
-	DWORD op, madr;
-	WORD tmp;
+	UINT16 *out, *src;
+	UINT32 op, madr;
 
 	PREPART_EA_REG16P(op, src);
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(3);
 		out = reg16_b20[op];
-		SWAPWORD(*out, *src);
+		SWAP_WORD(*out, *src);
 	} else {
 		CPU_WORKCLOCK(5);
 		madr = calc_ea_dst(op);
-		tmp = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
-		cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, *src);
-		*src = tmp;
+		*src = (UINT16)cpu_memory_access_va_RMW_w(CPU_INST_SEGREG_INDEX, madr, XCHG, UINT32_TO_PTR(*src));
 	}
 }
 
 void
 XCHG_EdGd(void)
 {
-	DWORD *out, *src;
-	DWORD op, madr;
-	DWORD tmp;
+	UINT32 *out, *src;
+	UINT32 op, madr;
 
 	PREPART_EA_REG32P(op, src);
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(3);
 		out = reg32_b20[op];
-		SWAPDWORD(*out, *src);
+		SWAP_DWORD(*out, *src);
 	} else {
 		CPU_WORKCLOCK(5);
 		madr = calc_ea_dst(op);
-		tmp = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
-		cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, *src);
-		*src = tmp;
+		*src = cpu_memory_access_va_RMW_d(CPU_INST_SEGREG_INDEX, madr, XCHG, UINT32_TO_PTR(*src));
 	}
 }
 
 /* void XCHG_AXAX(void) { } */
-void XCHG_CXAX(void) { CPU_WORKCLOCK(3); SWAPWORD(CPU_CX, CPU_AX); }
-void XCHG_DXAX(void) { CPU_WORKCLOCK(3); SWAPWORD(CPU_DX, CPU_AX); }
-void XCHG_BXAX(void) { CPU_WORKCLOCK(3); SWAPWORD(CPU_BX, CPU_AX); }
-void XCHG_SPAX(void) { CPU_WORKCLOCK(3); SWAPWORD(CPU_SP, CPU_AX); }
-void XCHG_BPAX(void) { CPU_WORKCLOCK(3); SWAPWORD(CPU_BP, CPU_AX); }
-void XCHG_SIAX(void) { CPU_WORKCLOCK(3); SWAPWORD(CPU_SI, CPU_AX); }
-void XCHG_DIAX(void) { CPU_WORKCLOCK(3); SWAPWORD(CPU_DI, CPU_AX); }
+void XCHG_CXAX(void) { CPU_WORKCLOCK(3); SWAP_WORD(CPU_CX, CPU_AX); }
+void XCHG_DXAX(void) { CPU_WORKCLOCK(3); SWAP_WORD(CPU_DX, CPU_AX); }
+void XCHG_BXAX(void) { CPU_WORKCLOCK(3); SWAP_WORD(CPU_BX, CPU_AX); }
+void XCHG_SPAX(void) { CPU_WORKCLOCK(3); SWAP_WORD(CPU_SP, CPU_AX); }
+void XCHG_BPAX(void) { CPU_WORKCLOCK(3); SWAP_WORD(CPU_BP, CPU_AX); }
+void XCHG_SIAX(void) { CPU_WORKCLOCK(3); SWAP_WORD(CPU_SI, CPU_AX); }
+void XCHG_DIAX(void) { CPU_WORKCLOCK(3); SWAP_WORD(CPU_DI, CPU_AX); }
 
 /* void XCHG_EAXEAX(void) { } */
-void XCHG_ECXEAX(void) { CPU_WORKCLOCK(3); SWAPDWORD(CPU_ECX, CPU_EAX); }
-void XCHG_EDXEAX(void) { CPU_WORKCLOCK(3); SWAPDWORD(CPU_EDX, CPU_EAX); }
-void XCHG_EBXEAX(void) { CPU_WORKCLOCK(3); SWAPDWORD(CPU_EBX, CPU_EAX); }
-void XCHG_ESPEAX(void) { CPU_WORKCLOCK(3); SWAPDWORD(CPU_ESP, CPU_EAX); }
-void XCHG_EBPEAX(void) { CPU_WORKCLOCK(3); SWAPDWORD(CPU_EBP, CPU_EAX); }
-void XCHG_ESIEAX(void) { CPU_WORKCLOCK(3); SWAPDWORD(CPU_ESI, CPU_EAX); }
-void XCHG_EDIEAX(void) { CPU_WORKCLOCK(3); SWAPDWORD(CPU_EDI, CPU_EAX); }
+void XCHG_ECXEAX(void) { CPU_WORKCLOCK(3); SWAP_DWORD(CPU_ECX, CPU_EAX); }
+void XCHG_EDXEAX(void) { CPU_WORKCLOCK(3); SWAP_DWORD(CPU_EDX, CPU_EAX); }
+void XCHG_EBXEAX(void) { CPU_WORKCLOCK(3); SWAP_DWORD(CPU_EBX, CPU_EAX); }
+void XCHG_ESPEAX(void) { CPU_WORKCLOCK(3); SWAP_DWORD(CPU_ESP, CPU_EAX); }
+void XCHG_EBPEAX(void) { CPU_WORKCLOCK(3); SWAP_DWORD(CPU_EBP, CPU_EAX); }
+void XCHG_ESIEAX(void) { CPU_WORKCLOCK(3); SWAP_DWORD(CPU_ESI, CPU_EAX); }
+void XCHG_EDIEAX(void) { CPU_WORKCLOCK(3); SWAP_DWORD(CPU_EDI, CPU_EAX); }
 
 /*
  * BSWAP
@@ -817,28 +839,28 @@ void XCHG_EDIEAX(void) { CPU_WORKCLOCK(3
 #if defined(bswap32) && !defined(IA32_USE_ASM_BSWAP)
 #define	BSWAP_DWORD(v)	bswap32(v)
 #else	/* !bswap32 || IA32_USE_ASM_BSWAP */
-INLINE static DWORD
-BSWAP_DWORD(DWORD val)
+INLINE static UINT32
+BSWAP_DWORD(UINT32 val)
 {
-#if defined(__GNUC__) && (defined(i386) || defined(__i386__))
+#if defined(GCC_CPU_ARCH_IA32)
 	__asm__ __volatile__ (
-#if defined(IA32_USE_ASM_BSWAP)
+#if defined(IA32_USE_ASM_BSWAP) || defined(GCC_CPU_ARCH_AMD64)
 		"bswap %0"
-#else	/* !IA32_USE_ASM_BSWAP */
+#else	/* !(IA32_USE_ASM_BSWAP || GCC_CPU_ARCH_AMD64) */
 		"rorw $8, %w1\n\t"
 		"rorl $16, %1\n\t"
 		"rorw $8, %w1\n\t"
-#endif	/* IA32_USE_ASM_BSWAP */
+#endif	/* IA32_USE_ASM_BSWAP || GCC_CPU_ARCH_AMD64 */
 		: "=r" (val) : "0" (val));
 	return val;
-#else	/* !(__GNUC__ && (i386 || __i386__)) */
-	DWORD v;
+#else	/* !(__GNUC__ && GCC_CPU_ARCH_IA32) */
+	UINT32 v;
 	v  = (val & 0x000000ff) << 24;
 	v |= (val & 0x0000ff00) << 8;
 	v |= (val & 0x00ff0000) >> 8;
 	v |= (val & 0xff000000) >> 24;
 	return v;
-#endif	/* __GNUC__ && (i386 || __i386__) */
+#endif	/* __GNUC__ && GCC_CPU_ARCH_IA32 */
 }
 #endif	/* bswap32 && !IA32_USE_ASM_BSWAP */
 
@@ -854,75 +876,93 @@ void BSWAP_EDI(void) { CPU_WORKCLOCK(2);
 /*
  * XADD
  */
+static UINT32
+XADD1(UINT32 dst, void *arg)
+{
+	UINT32 src = PTR_TO_UINT32(arg);
+	UINT32 res;
+	BYTE_ADD(res, dst, src);
+	return res;
+}
+
+static UINT32
+XADD2(UINT32 dst, void *arg)
+{
+	UINT32 src = PTR_TO_UINT32(arg);
+	UINT32 res;
+	WORD_ADD(res, dst, src);
+	return res;
+}
+
+static UINT32
+XADD4(UINT32 dst, void *arg)
+{
+	UINT32 src = PTR_TO_UINT32(arg);
+	UINT32 res;
+	DWORD_ADD(res, dst, src);
+	return res;
+}
+
 void
 XADD_EbGb(void)
 {
-	BYTE *out, *src;
-	DWORD op, dst, res, madr;
+	UINT8 *out, *src;
+	UINT32 op, dst, res, madr;
 
 	PREPART_EA_REG8P(op, src);
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(2);
 		out = reg8_b20[op];
 		dst = *out;
-		ADDBYTE(res, dst, *src);
-		*src = (BYTE)dst;
-		*out = (BYTE)res;
+		BYTE_ADD(res, dst, *src);
+		*src = (UINT8)dst;
+		*out = (UINT8)res;
 	} else {
 		CPU_WORKCLOCK(7);
 		madr = calc_ea_dst(op);
-		dst = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr);
-		ADDBYTE(res, dst, *src);
-		*src = (BYTE)dst;
-		cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, (BYTE)res);
+		*src = (UINT8)cpu_memory_access_va_RMW(CPU_INST_SEGREG_INDEX, madr, XADD1, UINT32_TO_PTR(*src));
 	}
 }
 
 void
 XADD_EwGw(void)
 {
-	WORD *out, *src;
-	DWORD op, dst, res, madr;
+	UINT16 *out, *src;
+	UINT32 op, dst, res, madr;
 
 	PREPART_EA_REG16P(op, src);
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(2);
 		out = reg16_b20[op];
 		dst = *out;
-		ADDWORD(res, dst, *src);
-		*src = (WORD)dst;
-		*out = (WORD)res;
+		WORD_ADD(res, dst, *src);
+		*src = (UINT16)dst;
+		*out = (UINT16)res;
 	} else {
 		CPU_WORKCLOCK(7);
 		madr = calc_ea_dst(op);
-		dst = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
-		ADDWORD(res, dst, *src);
-		*src = (WORD)dst;
-		cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (WORD)res);
+		*src = (UINT16)cpu_memory_access_va_RMW_w(CPU_INST_SEGREG_INDEX, madr, XADD2, UINT32_TO_PTR(*src));
 	}
 }
 
 void
 XADD_EdGd(void)
 {
-	DWORD *out, *src;
-	DWORD op, dst, res, madr;
+	UINT32 *out, *src;
+	UINT32 op, dst, res, madr;
 
 	PREPART_EA_REG32P(op, src);
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(2);
 		out = reg32_b20[op];
 		dst = *out;
-		ADDDWORD(res, dst, *src);
+		DWORD_ADD(res, dst, *src);
 		*src = dst;
 		*out = res;
 	} else {
 		CPU_WORKCLOCK(7);
 		madr = calc_ea_dst(op);
-		dst = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
-		ADDDWORD(res, dst, *src);
-		*src = dst;
-		cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, res);
+		*src = cpu_memory_access_va_RMW_d(CPU_INST_SEGREG_INDEX, madr, XADD4, UINT32_TO_PTR(*src));
 	}
 }
 
@@ -932,71 +972,74 @@ XADD_EdGd(void)
 void
 CMPXCHG_EbGb(void)
 {
-	BYTE *out;
-	DWORD op, src, dst, madr, tmp;
+	UINT8 *out;
+	UINT32 op, src, dst, madr, tmp;
+	UINT8 al;
 
 	PREPART_EA_REG8(op, src);
+	al = CPU_AL;
 	if (op >= 0xc0) {
 		out = reg8_b20[op];
 		dst = *out;
-		BYTE_SUB(tmp, CPU_AL, dst);
-		if (CPU_FLAGL & Z_FLAG) {
-			*out = (BYTE)src;
+		if (al == dst) {
+			*out = (UINT8)src;
 		} else {
-			CPU_AL = (BYTE)dst;
+			CPU_AL = (UINT8)dst;
 		}
 	} else {
 		madr = calc_ea_dst(op);
 		dst = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr);
-		BYTE_SUB(tmp, CPU_AL, dst);
-		if (CPU_FLAGL & Z_FLAG) {
-			cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, (BYTE)src);
+		if (al == dst) {
+			cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, (UINT8)src);
 		} else {
-			CPU_AL = (BYTE)dst;
+			CPU_AL = (UINT8)dst;
 		}
 	}
+	BYTE_SUB(tmp, al, dst);
 }
 
 void
 CMPXCHG_EwGw(void)
 {
-	WORD *out;
-	DWORD op, src, dst, madr, tmp;
+	UINT16 *out;
+	UINT32 op, src, dst, madr, tmp;
+	UINT16 ax;
 
 	PREPART_EA_REG16(op, src);
+	ax = CPU_AX;
 	if (op >= 0xc0) {
 		out = reg16_b20[op];
 		dst = *out;
-		WORD_SUB(tmp, CPU_AX, dst);
-		if (CPU_FLAGL & Z_FLAG) {
-			*out = (WORD)src;
+		if (ax == dst) {
+			*out = (UINT16)src;
 		} else {
-			CPU_AX = (WORD)dst;
+			CPU_AX = (UINT16)dst;
 		}
 	} else {
 		madr = calc_ea_dst(op);
 		dst = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
-		WORD_SUB(tmp, CPU_AX, dst);
-		if (CPU_FLAGL & Z_FLAG) {
-			cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (WORD)src);
+		if (ax == dst) {
+			cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)src);
 		} else {
-			CPU_AX = (WORD)dst;
+			CPU_AX = (UINT16)dst;
 		}
 	}
+	WORD_SUB(tmp, ax, dst);
 }
 
 void
 CMPXCHG_EdGd(void)
 {
-	DWORD *out;
-	DWORD op, src, dst, madr, tmp;
+	UINT32 *out;
+	UINT32 op, src, dst, madr, tmp;
+	UINT32 eax;
 
 	PREPART_EA_REG32(op, src);
+	eax = CPU_EAX;
 	if (op >= 0xc0) {
 		out = reg32_b20[op];
 		dst = *out;
-		WORD_SUB(tmp, CPU_EAX, dst);
-		if (CPU_FLAGL & Z_FLAG) {
+		if (eax == dst) {
 			*out = src;
 		} else {
 			CPU_EAX = dst;
@@ -1004,19 +1047,19 @@ CMPXCHG_EdGd(void)
 	} else {
 		madr = calc_ea_dst(op);
 		dst = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
-		DWORD_SUB(tmp, CPU_AX, dst);
-		if (CPU_FLAGL & Z_FLAG) {
+		if (eax == dst) {
 			cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, src);
 		} else {
 			CPU_EAX = dst;
 		}
 	}
+	DWORD_SUB(tmp, eax, dst);
 }
 
 void
-CMPXCHG8B(DWORD op)
+CMPXCHG8B(UINT32 op)
 {
-	DWORD madr, dst_l, dst_h;
+	UINT32 madr, dst_l, dst_h;
 
 	if (op < 0xc0) {
 		CPU_WORKCLOCK(2);
@@ -1059,9 +1102,9 @@ void PUSH_ESI(void) { CPU_WORKCLOCK(3); 
 void PUSH_EDI(void) { CPU_WORKCLOCK(3); PUSH0_32(CPU_EDI); }
 
 void
-PUSH_Ew(DWORD op)
+PUSH_Ew(UINT32 op)
 {
-	DWORD dst, madr;
+	UINT32 dst, madr;
 
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(2);
@@ -1076,9 +1119,9 @@ PUSH_Ew(DWORD op)
 }
 
 void
-PUSH_Ed(DWORD op)
+PUSH_Ed(UINT32 op)
 {
-	DWORD dst, madr;
+	UINT32 dst, madr;
 
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(2);
@@ -1095,7 +1138,7 @@ PUSH_Ed(DWORD op)
 void
 PUSH_Ib(void)
 {
-	SDWORD val;
+	SINT32 val;
 
 	CPU_WORKCLOCK(3);
 	GET_PCBYTESD(val);
@@ -1105,7 +1148,7 @@ PUSH_Ib(void)
 void
 PUSH_Iw(void)
 {
-	WORD val;
+	UINT16 val;
 
 	CPU_WORKCLOCK(3);
 	GET_PCWORD(val);
@@ -1115,7 +1158,7 @@ PUSH_Iw(void)
 void
 PUSH_Id(void)
 {
-	DWORD val;
+	UINT32 val;
 
 	CPU_WORKCLOCK(3);
 	GET_PCDWORD(val);
@@ -1160,8 +1203,8 @@ void POP_EDI(void) { CPU_WORKCLOCK(5); P
 void
 POP_Ew(void)
 {
-	DWORD op, madr;
-	WORD src;
+	UINT32 op, madr;
+	UINT16 src;
 
 	CPU_WORKCLOCK(5);
 
@@ -1176,10 +1219,10 @@ POP_Ew(void)
 }
 
 void
-POP_Ew_G5(DWORD op)
+POP_Ew_G5(UINT32 op)
 {
-	DWORD madr;
-	WORD src;
+	UINT32 madr;
+	UINT16 src;
 
 	CPU_WORKCLOCK(5);
 
@@ -1195,8 +1238,8 @@ POP_Ew_G5(DWORD op)
 void
 POP_Ed(void)
 {
-	DWORD op, madr;
-	DWORD src;
+	UINT32 op, madr;
+	UINT32 src;
 
 	CPU_WORKCLOCK(5);
 
@@ -1211,9 +1254,9 @@ POP_Ed(void)
 }
 
 void
-POP_Ed_G5(DWORD op)
+POP_Ed_G5(UINT32 op)
 {
-	DWORD src, madr;
+	UINT32 src, madr;
 
 	CPU_WORKCLOCK(5);
 
@@ -1229,7 +1272,7 @@ POP_Ed_G5(DWORD op)
 void
 POP16_ES(void)
 {
-	WORD src;
+	UINT16 src;
 
 	CPU_WORKCLOCK(5);
 
@@ -1240,18 +1283,18 @@ POP16_ES(void)
 void
 POP32_ES(void)
 {
-	DWORD src;
+	UINT32 src;
 
 	CPU_WORKCLOCK(5);
 
 	POP0_32(src);
-	CPU_SET_SEGREG(CPU_ES_INDEX, (WORD)src);
+	CPU_SET_SEGREG(CPU_ES_INDEX, (UINT16)src);
 }
 
 void
 POP16_SS(void)
 {
-	WORD src;
+	UINT16 src;
 
 	CPU_WORKCLOCK(5);
 
@@ -1263,19 +1306,19 @@ POP16_SS(void)
 void
 POP32_SS(void)
 {
-	DWORD src;
+	UINT32 src;
 
 	CPU_WORKCLOCK(5);
 
 	POP0_32(src);
-	CPU_SET_SEGREG(CPU_SS_INDEX, (WORD)src);
+	CPU_SET_SEGREG(CPU_SS_INDEX, (UINT16)src);
 	exec_1step();
 }
 
 void
 POP16_DS(void)
 {
-	WORD src;
+	UINT16 src;
 
 	CPU_WORKCLOCK(5);
 
@@ -1286,18 +1329,18 @@ POP16_DS(void)
 void
 POP32_DS(void)
 {
-	DWORD src;
+	UINT32 src;
 
 	CPU_WORKCLOCK(5);
 
 	POP0_32(src);
-	CPU_SET_SEGREG(CPU_DS_INDEX, (WORD)src);
+	CPU_SET_SEGREG(CPU_DS_INDEX, (UINT16)src);
 }
 
 void
 POP16_FS(void)
 {
-	WORD src;
+	UINT16 src;
 
 	CPU_WORKCLOCK(5);
 
@@ -1308,18 +1351,18 @@ POP16_FS(void)
 void
 POP32_FS(void)
 {
-	DWORD src;
+	UINT32 src;
 
 	CPU_WORKCLOCK(5);
 
 	POP0_32(src);
-	CPU_SET_SEGREG(CPU_FS_INDEX, (WORD)src);
+	CPU_SET_SEGREG(CPU_FS_INDEX, (UINT16)src);
 }
 
 void
 POP16_GS(void)
 {
-	WORD src;
+	UINT16 src;
 
 	CPU_WORKCLOCK(5);
 
@@ -1330,12 +1373,12 @@ POP16_GS(void)
 void
 POP32_GS(void)
 {
-	DWORD src;
+	UINT32 src;
 
 	CPU_WORKCLOCK(5);
 
 	POP0_32(src);
-	CPU_SET_SEGREG(CPU_GS_INDEX, (WORD)src);
+	CPU_SET_SEGREG(CPU_GS_INDEX, (UINT16)src);
 }
 
 /*
@@ -1344,12 +1387,12 @@ POP32_GS(void)
 void
 PUSHA(void)
 {
-	WORD sp = CPU_SP;
+	UINT16 sp = CPU_SP;
 
 	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 +1404,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);
@@ -1377,12 +1420,12 @@ PUSHA(void)
 void
 PUSHAD(void)
 {
-	DWORD esp = CPU_ESP;
+	UINT32 esp = CPU_ESP;
 
 	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 +1437,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 +1457,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 +1469,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 +1489,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 +1501,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);
@@ -1478,7 +1521,7 @@ void
 IN_ALDX(void)
 {
 
-	CPU_WORKCLOCK(5);
+	CPU_WORKCLOCK(12);
 	CPU_AL = cpu_in(CPU_DX);
 }
 
@@ -1486,7 +1529,7 @@ void
 IN_AXDX(void)
 {
 
-	CPU_WORKCLOCK(5);
+	CPU_WORKCLOCK(12);
 	CPU_AX = cpu_in_w(CPU_DX);
 }
 
@@ -1494,16 +1537,16 @@ void
 IN_EAXDX(void)
 {
 
-	CPU_WORKCLOCK(5);
+	CPU_WORKCLOCK(12);
 	CPU_EAX = cpu_in_d(CPU_DX);
 }
 
 void
 IN_ALIb(void)
 {
-	WORD port;
+	UINT port;
 
-	CPU_WORKCLOCK(5);
+	CPU_WORKCLOCK(12);
 	GET_PCBYTE(port);
 	CPU_AL = cpu_in(port);
 }
@@ -1511,9 +1554,9 @@ IN_ALIb(void)
 void
 IN_AXIb(void)
 {
-	WORD port;
+	UINT port;
 
-	CPU_WORKCLOCK(5);
+	CPU_WORKCLOCK(12);
 	GET_PCBYTE(port);
 	CPU_AX = cpu_in_w(port);
 }
@@ -1521,9 +1564,9 @@ IN_AXIb(void)
 void
 IN_EAXIb(void)
 {
-	WORD port;
+	UINT port;
 
-	CPU_WORKCLOCK(5);
+	CPU_WORKCLOCK(12);
 	GET_PCBYTE(port);
 	CPU_EAX = cpu_in_d(port);
 }
@@ -1535,7 +1578,7 @@ void
 OUT_DXAL(void)
 {
 
-	CPU_WORKCLOCK(3);
+	CPU_WORKCLOCK(10);
 	cpu_out(CPU_DX, CPU_AL);
 }
 
@@ -1543,7 +1586,7 @@ void
 OUT_DXAX(void)
 {
 
-	CPU_WORKCLOCK(3);
+	CPU_WORKCLOCK(10);
 	cpu_out_w(CPU_DX, CPU_AX);
 }
 
@@ -1551,16 +1594,16 @@ void
 OUT_DXEAX(void)
 {
 
-	CPU_WORKCLOCK(3);
+	CPU_WORKCLOCK(10);
 	cpu_out_d(CPU_DX, CPU_EAX);
 }
 
 void
 OUT_IbAL(void)
 {
-	WORD port;
+	UINT port;
 
-	CPU_WORKCLOCK(3);
+	CPU_WORKCLOCK(10);
 	GET_PCBYTE(port);
 	cpu_out(port, CPU_AL);
 }
@@ -1568,9 +1611,9 @@ OUT_IbAL(void)
 void
 OUT_IbAX(void)
 {
-	WORD port;
+	UINT port;
 
-	CPU_WORKCLOCK(3);
+	CPU_WORKCLOCK(10);
 	GET_PCBYTE(port);
 	cpu_out_w(port, CPU_AX);
 }
@@ -1578,9 +1621,9 @@ OUT_IbAX(void)
 void
 OUT_IbEAX(void)
 {
-	WORD port;
+	UINT port;
 
-	CPU_WORKCLOCK(3);
+	CPU_WORKCLOCK(10);
 	GET_PCBYTE(port);
 	cpu_out_d(port, CPU_EAX);
 }
@@ -1615,7 +1658,7 @@ CDQ(void)
 void
 CBW(void)
 {
-	WORD tmp;
+	UINT16 tmp;
 
 	CPU_WORKCLOCK(2);
 	tmp = __CBW(CPU_AL);
@@ -1625,7 +1668,7 @@ CBW(void)
 void
 CWDE(void)
 {
-	DWORD tmp;
+	UINT32 tmp;
 
 	CPU_WORKCLOCK(2);
 	tmp = __CWDE(CPU_AX);
@@ -1638,8 +1681,8 @@ CWDE(void)
 void
 MOVSX_GwEb(void)
 {
-	WORD *out;
-	DWORD op, src;
+	UINT16 *out;
+	UINT32 op, src;
 
 	PREPART_REG16_EA8(op, src, out, 2, 5);
 	*out = __CBW(src);
@@ -1648,18 +1691,18 @@ MOVSX_GwEb(void)
 void
 MOVSX_GwEw(void)
 {
-	WORD *out;
-	DWORD op, src;
+	UINT16 *out;
+	UINT32 op, src;
 
 	PREPART_REG16_EA(op, src, out, 2, 5);
-	*out = (WORD)src;
+	*out = (UINT16)src;
 }
 
 void
 MOVSX_GdEb(void)
 {
-	DWORD *out;
-	DWORD op, src;
+	UINT32 *out;
+	UINT32 op, src;
 
 	PREPART_REG32_EA8(op, src, out, 2, 5);
 	*out = __CBD(src);
@@ -1668,8 +1711,8 @@ MOVSX_GdEb(void)
 void
 MOVSX_GdEw(void)
 {
-	DWORD *out;
-	DWORD op, src;
+	UINT32 *out;
+	UINT32 op, src;
 
 	PREPART_REG32_EA16(op, src, out, 2, 5);
 	*out = __CWDE(src);
@@ -1681,39 +1724,39 @@ MOVSX_GdEw(void)
 void
 MOVZX_GwEb(void)
 {
-	WORD *out;
-	DWORD op, src;
+	UINT16 *out;
+	UINT32 op, src;
 
 	PREPART_REG16_EA8(op, src, out, 2, 5);
-	*out = (BYTE)src;
+	*out = (UINT8)src;
 }
 
 void
 MOVZX_GwEw(void)
 {
-	WORD *out;
-	DWORD op, src;
+	UINT16 *out;
+	UINT32 op, src;
 
 	PREPART_REG16_EA(op, src, out, 2, 5);
-	*out = (WORD)src;
+	*out = (UINT16)src;
 }
 
 void
 MOVZX_GdEb(void)
 {
-	DWORD *out;
-	DWORD op, src;
+	UINT32 *out;
+	UINT32 op, src;
 
 	PREPART_REG32_EA8(op, src, out, 2, 5);
-	*out = (BYTE)src;
+	*out = (UINT8)src;
 }
 
 void
 MOVZX_GdEw(void)
 {
-	DWORD *out;
-	DWORD op, src;
+	UINT32 *out;
+	UINT32 op, src;
 
 	PREPART_REG32_EA16(op, src, out, 2, 5);
-	*out = (WORD)src;
+	*out = (UINT16)src;
 }