--- np2/i386c/ia32/instructions/ctrl_trans.c	2004/01/23 14:33:27	1.4
+++ np2/i386c/ia32/instructions/ctrl_trans.c	2004/02/05 16:43:45	1.7
@@ -1,4 +1,4 @@
-/*	$Id: ctrl_trans.c,v 1.4 2004/01/23 14:33:27 monaka Exp $	*/
+/*	$Id: ctrl_trans.c,v 1.7 2004/02/05 16:43:45 monaka Exp $	*/
 
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
@@ -34,9 +34,6 @@
 
 #include "ctrl_trans.h"
 
-#include "pccore.h"
-#include "iocore.h"
-
 
 /*
  * JMP
@@ -154,7 +151,7 @@ JMP16_Ep(DWORD op)
 
 	CPU_WORKCLOCK(11);
 	if (op < 0xc0) {
-		madr = get_ea(op);
+		madr = calc_ea_dst(op);
 		new_ip = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
 		new_cs = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr + 2);
 		if (!CPU_STAT_PM || CPU_STAT_VM86) {
@@ -179,7 +176,7 @@ JMP32_Ep(DWORD op)
 
 	CPU_WORKCLOCK(11);
 	if (op < 0xc0) {
-		madr = get_ea(op);
+		madr = calc_ea_dst(op);
 		new_ip = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
 		new_cs = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr + 4);
 		if (!CPU_STAT_PM || CPU_STAT_VM86) {
@@ -940,7 +937,7 @@ CALL16_Ep(DWORD op)
 
 	CPU_WORKCLOCK(16);
 	if (op < 0xc0) {
-		ad = get_ea(op);
+		ad = calc_ea_dst(op);
 		new_ip = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, ad);
 		new_cs = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, ad + 2);
 		if (!CPU_STAT_PM || CPU_STAT_VM86) {
@@ -968,7 +965,7 @@ CALL32_Ep(DWORD op)
 
 	CPU_WORKCLOCK(16);
 	if (op < 0xc0) {
-		ad = get_ea(op);
+		ad = calc_ea_dst(op);
 		new_ip = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, ad);
 		new_cs = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, ad + 4);
 		if (!CPU_STAT_PM || CPU_STAT_VM86) {
@@ -1144,48 +1141,25 @@ void
 IRET(void)
 {
 	DWORD new_ip;
-	WORD flag;
-	WORD new_cs;
-
-	extirq_pop();
-	CPU_WORKCLOCK(31);
-	if (!CPU_STAT_PM) {
-		/* Real mode */
-		POP0_16(new_ip);
-		POP0_16(new_cs);
-		POP0_16(flag);
-
-		CPU_FLAG = flag & 0x7fd5;
-		CPU_OV = CPU_FLAG & O_FLAG;
-		CPU_TRAP = (CPU_FLAG & (I_FLAG|T_FLAG)) == (I_FLAG|T_FLAG);
-
-		CPU_SET_SEGREG(CPU_CS_INDEX, new_cs);
-		SET_EIP(new_ip);
-	} else {
-		/* Protected mode */
-		IRET_pm();
-	}
-	IRQCHECKTERM();
-}
-
-void
-IRETD(void)
-{
-	DWORD new_ip;
-	DWORD flag;
+	DWORD new_flags;
+	DWORD mask;
 	WORD new_cs;
 
-	extirq_pop();
 	CPU_WORKCLOCK(31);
 	if (!CPU_STAT_PM) {
 		/* Real mode */
-		POP0_32(new_ip);
-		POP0_32(new_cs);
-		POP0_32(flag);
-
-		CPU_EFLAG = (flag & 0x00257fd5) | (CPU_EFLAG & 0x1a0000);
-		CPU_OV = CPU_FLAG & O_FLAG;
-		CPU_TRAP = (CPU_FLAG & (I_FLAG|T_FLAG)) == (I_FLAG|T_FLAG);
+		mask = I_FLAG|IOPL_FLAG;
+		if (!CPU_INST_OP32) {
+			POP0_16(new_ip);
+			POP0_16(new_cs);
+			POP0_16(new_flags);
+		} else {
+			POP0_32(new_ip);
+			POP0_32(new_cs);
+			POP0_32(new_flags);
+			mask |= RF_FLAG;
+		}
+		set_eflags(new_flags, mask);
 
 		CPU_SET_SEGREG(CPU_CS_INDEX, new_cs);
 		SET_EIP(new_ip);
@@ -1291,8 +1265,11 @@ BOUND_GdMa(void)
  * STACK
  */
 void
-ENTER_IwIb(void)
+ENTER16_IwIb(void)
 {
+	DWORD sp, bp;
+	DWORD size;
+	DWORD val;
 	WORD dimsize;
 	BYTE level;
 
@@ -1302,29 +1279,19 @@ ENTER_IwIb(void)
 
 	/* check stack room size */
 	if (CPU_STAT_PM) {
-		DWORD size = dimsize;
-		DWORD sp;
-		if (CPU_INST_OP32) {
-			size = (level + 1) * 4;
+		size = dimsize + (level + 1) * 2;
+		if (!CPU_STAT_SS32) {
+			sp = CPU_SP;
 		} else {
-			size = (level + 1) * 2;
-		}
-		if (CPU_STAT_SS32) {
 			sp = CPU_ESP;
-		} else {
-			sp = CPU_SP;
 		}
 		CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), sp, size);
 	}
 
-	XPUSH0(CPU_EBP);
+	PUSH0_16(CPU_BP);
 	if (level == 0) {			/* enter level=0 */
 		CPU_WORKCLOCK(11);
-		if (!CPU_INST_OP32) {
-			CPU_BP = CPU_SP;
-		} else {
-			CPU_EBP = CPU_ESP;
-		}
+		CPU_BP = CPU_SP;
 		if (!CPU_STAT_SS32) {
 			CPU_SP -= dimsize;
 		} else {
@@ -1334,33 +1301,20 @@ ENTER_IwIb(void)
 		--level;
 		if (level == 0) {		/* enter level=1 */
 			CPU_WORKCLOCK(15);
-			if (!CPU_INST_OP32) {
-				WORD tmp = CPU_SP;
-				PUSH0_16(tmp);
-				CPU_BP = tmp;
+			sp = CPU_SP;
+			PUSH0_16(sp);
+			CPU_BP = sp;
+			if (!CPU_STAT_SS32) {
 				CPU_SP -= dimsize;
 			} else {
-				DWORD tmp;
-				if (!CPU_STAT_SS32) {
-					tmp = CPU_SP;
-					REGPUSH0_32_16(tmp);
-					CPU_EBP = (WORD)tmp;
-					CPU_ESP -= dimsize;
-				} else {
-					tmp = CPU_ESP;
-					REGPUSH0_32(tmp);
-					CPU_EBP = tmp;
-					CPU_ESP -= dimsize;
-				}
+				CPU_ESP -= dimsize;
 			}
 		} else {			/* enter level=2-31 */
 			CPU_WORKCLOCK(12 + level * 4);
 			if (!CPU_INST_OP32) {
-				WORD bp = CPU_BP;
-				WORD val;
-
-				CPU_BP = CPU_SP;
 				if (!CPU_STAT_SS32) {
+					bp = CPU_BP;
+					CPU_BP = CPU_SP;
 					while (level--) {
 						bp -= 2;
 						CPU_SP -= 2;
@@ -1370,6 +1324,8 @@ ENTER_IwIb(void)
 					REGPUSH0(CPU_BP);
 					CPU_SP -= dimsize;
 				} else {
+					bp = CPU_EBP;
+					CPU_BP = CPU_SP;
 					while (level--) {
 						bp -= 2;
 						CPU_ESP -= 2;
@@ -1379,31 +1335,80 @@ ENTER_IwIb(void)
 					REGPUSH0_16_32(CPU_EBP);
 					CPU_ESP -= dimsize;
 				}
-			} else {
-				DWORD ebp = CPU_EBP;
-				DWORD val;
+			}
+		}
+	}
+}
 
-				if (!CPU_STAT_SS32) {
-					CPU_EBP = CPU_SP;
-					while (level--) {
-						ebp -= 4;
-						CPU_SP -= 4;
-						val = cpu_vmemoryread_d(CPU_SS_INDEX, ebp);
-						cpu_vmemorywrite_d(CPU_SS_INDEX, CPU_SP, val);
-					}
-					REGPUSH0_32_16(CPU_EBP);
-					CPU_SP -= dimsize;
-				} else {
-					CPU_EBP = CPU_ESP;
-					while (level--) {
-						ebp -= 4;
-						CPU_ESP -= 4;
-						val = cpu_vmemoryread_d(CPU_SS_INDEX, ebp);
-						cpu_vmemorywrite(CPU_SS_INDEX, CPU_ESP, val);
-					}
-					REGPUSH0_32(CPU_EBP);
-					CPU_ESP -= dimsize;
+void
+ENTER32_IwIb(void)
+{
+	DWORD sp, bp;
+	DWORD size;
+	DWORD val;
+	WORD dimsize;
+	BYTE level;
+
+	GET_PCWORD(dimsize);
+	GET_PCBYTE(level);
+	level &= 0x1f;
+
+	/* check stack room size */
+	if (CPU_STAT_PM) {
+		size = dimsize + (level + 1) * 4;
+		if (CPU_STAT_SS32) {
+			sp = CPU_ESP;
+		} else {
+			sp = CPU_SP;
+		}
+		CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), sp, size);
+	}
+
+	PUSH0_32(CPU_EBP);
+	if (level == 0) {			/* enter level=0 */
+		CPU_WORKCLOCK(11);
+		CPU_EBP = CPU_ESP;
+		if (!CPU_STAT_SS32) {
+			CPU_SP -= dimsize;
+		} else {
+			CPU_ESP -= dimsize;
+		}
+	} else {
+		--level;
+		if (level == 0) {		/* enter level=1 */
+			CPU_WORKCLOCK(15);
+			sp = CPU_ESP;
+			PUSH0_32(sp);
+			CPU_EBP = sp;
+			if (CPU_STAT_SS32) {
+				CPU_ESP -= dimsize;
+			} else {
+				CPU_SP -= dimsize;
+			}
+		} else {			/* enter level=2-31 */
+			CPU_WORKCLOCK(12 + level * 4);
+			if (CPU_STAT_SS32) {
+				bp = CPU_EBP;
+				CPU_EBP = CPU_ESP;
+				while (level--) {
+					bp -= 4;
+					CPU_ESP -= 4;
+					val = cpu_vmemoryread_d(CPU_SS_INDEX, bp);
+					cpu_vmemorywrite(CPU_SS_INDEX, CPU_ESP, val);
 				}
+				REGPUSH0_32(CPU_EBP);
+				CPU_ESP -= dimsize;
+			} else {
+				bp = CPU_BP;
+				CPU_EBP = CPU_ESP;
+				while (level--) {
+					bp -= 4;
+					CPU_SP -= 4;
+					val = cpu_vmemoryread_d(CPU_SS_INDEX, bp);
+					cpu_vmemorywrite_d(CPU_SS_INDEX, CPU_SP, val);
+				}
+				REGPUSH0_32_16(CPU_EBP);
+				CPU_SP -= dimsize;
 			}
 		}
 	}
@@ -1458,11 +1463,6 @@ LEAVE32(void)
 		CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), sp, (bp - sp) + size);
 	}
 
-	if (CPU_STAT_SS32) {
-		CPU_ESP = CPU_EBP;
-		REGPOP0_32(CPU_EBP);
-	} else {
-		CPU_SP = CPU_BP;
-		REGPOP0_32_16(CPU_EBP);
-	}
+	CPU_ESP = CPU_EBP;
+	POP0_32(CPU_EBP);
 }