--- np2/i386c/ia32/instructions/flag_ctrl.c	2004/01/15 15:50:33	1.4
+++ np2/i386c/ia32/instructions/flag_ctrl.c	2011/12/20 01:17:30	1.13
@@ -1,5 +1,3 @@
-/*	$Id: flag_ctrl.c,v 1.4 2004/01/15 15:50:33 monaka Exp $	*/
-
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
  * All rights reserved.
@@ -12,8 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -101,8 +97,8 @@ PUSHF_Fw(void)
 {
 
 	CPU_WORKCLOCK(3);
-	if (!CPU_STAT_PM || !CPU_STAT_VM86 || (CPU_STAT_IOPL == 3)) {
-		WORD flags = REAL_FLAGREG;
+	if (!CPU_STAT_PM || !CPU_STAT_VM86 || (CPU_STAT_IOPL == CPU_IOPL3)) {
+		UINT16 flags = REAL_FLAGREG;
 		flags = (flags & ALL_FLAG) | 2;
 		PUSH0_16(flags);
 		return;
@@ -116,8 +112,8 @@ PUSHFD_Fd(void)
 {
 
 	CPU_WORKCLOCK(3);
-	if (!CPU_STAT_PM || !CPU_STAT_VM86 || (CPU_STAT_IOPL == 3)) {
-		DWORD flags = REAL_EFLAGREG;
+	if (!CPU_STAT_PM || !CPU_STAT_VM86 || (CPU_STAT_IOPL == CPU_IOPL3)) {
+		UINT32 flags = REAL_EFLAGREG & ~(RF_FLAG|VM_FLAG);
 		flags = (flags & ALL_EFLAG) | 2;
 		PUSH0_32(flags);
 		return;
@@ -129,9 +125,10 @@ PUSHFD_Fd(void)
 void
 POPF_Fw(void)
 {
-	WORD flags, mask = 0;
+	UINT16 flags, mask;
 
 	CPU_WORKCLOCK(3);
+	CPU_SET_PREV_ESP();
 	if (!CPU_STAT_PM) {
 		/* Real Mode */
 		POP0_16(flags);
@@ -143,6 +140,8 @@ POPF_Fw(void)
 			mask = I_FLAG|IOPL_FLAG;
 		} else if (CPU_STAT_CPL <= CPU_STAT_IOPL) {
 			mask = I_FLAG;
+		} else {
+			mask = 0;
 		}
 	} else if (CPU_STAT_IOPL == CPU_IOPL3) {
 		/* Virtual-8086 Mode, IOPL == 3 */
@@ -151,32 +150,38 @@ POPF_Fw(void)
 	} else {
 		EXCEPTION(GP_EXCEPTION, 0);
 		flags = 0;
+		mask = 0;
 		/* compiler happy */
 	}
-	set_flags(flags, mask);
+	set_eflags(flags, mask);
+	CPU_CLEAR_PREV_ESP();
 	IRQCHECKTERM();
 }
 
 void
 POPFD_Fd(void)
 {
-	DWORD flags, mask = 0;
+	UINT32 flags, mask;
 
 	CPU_WORKCLOCK(3);
+	CPU_SET_PREV_ESP();
 	if (!CPU_STAT_PM) {
 		/* Real Mode */
 		POP0_32(flags);
-		flags &= ~(VIF_FLAG|VIP_FLAG);
+		flags &= ~(RF_FLAG|VIF_FLAG|VIP_FLAG);
 		mask = I_FLAG|IOPL_FLAG|RF_FLAG|VIF_FLAG|VIP_FLAG;
 	} else if (!CPU_STAT_VM86) {
 		/* Protected Mode */
 		POP0_32(flags);
+		flags &= ~RF_FLAG;
 		if (CPU_STAT_CPL == 0) {
 			flags &= ~(VIP_FLAG|VIF_FLAG);
 			mask = I_FLAG|IOPL_FLAG|RF_FLAG|VIF_FLAG|VIP_FLAG;
 		} else if (CPU_STAT_CPL <= CPU_STAT_IOPL) {
 			flags &= ~(VIP_FLAG|VIF_FLAG);
 			mask = I_FLAG|RF_FLAG|VIF_FLAG|VIP_FLAG;
+		} else {
+			mask = RF_FLAG;
 		}
 	} else if (CPU_STAT_IOPL == CPU_IOPL3) {
 		/* Virtual-8086 Mode, IOPL == 3 */
@@ -185,9 +190,11 @@ POPFD_Fd(void)
 	} else {
 		EXCEPTION(GP_EXCEPTION, 0);
 		flags = 0;
+		mask = 0;
 		/* compiler happy */
 	}
 	set_eflags(flags, mask);
+	CPU_CLEAR_PREV_ESP();
 	IRQCHECKTERM();
 }
 
@@ -196,19 +203,21 @@ STI(void)
 {
 
 	CPU_WORKCLOCK(2);
-	if ((!CPU_STAT_PM)
-	 || (!CPU_STAT_VM86 && (CPU_STAT_CPL <= CPU_STAT_IOPL))
-	 || (CPU_STAT_VM86 && (CPU_STAT_CPL == 3 && CPU_STAT_IOPL == CPU_IOPL3))) {
-		CPU_FLAG |= I_FLAG;
-		CPU_TRAP = (CPU_FLAG & (I_FLAG|T_FLAG)) == (I_FLAG|T_FLAG);
-		exec_1step();
-		IRQCHECKTERM();
-	} else if (!CPU_STAT_VM86 && (CPU_STAT_CPL > CPU_STAT_IOPL)) {
-		/* !VM86 && CPL > IOPL */
-		EXCEPTION(GP_EXCEPTION, 0);
-	} else {
-		/* Nothing to do */
+	if (CPU_STAT_PM) {
+		if (!CPU_STAT_VM86) {
+			if (CPU_STAT_CPL > CPU_STAT_IOPL) {
+				EXCEPTION(GP_EXCEPTION, 0);
+			}
+		} else {
+			if (CPU_STAT_IOPL < 3) {
+				EXCEPTION(GP_EXCEPTION, 0);
+			}
+		}
 	}
+	CPU_FLAG |= I_FLAG;
+	CPU_TRAP = (CPU_FLAG & (I_FLAG|T_FLAG)) == (I_FLAG|T_FLAG);
+	exec_1step();
+	IRQCHECKTERM();
 }
 
 void
@@ -216,17 +225,17 @@ CLI(void)
 {
 
 	CPU_WORKCLOCK(2);
-	if ((!CPU_STAT_PM)
-	 || (!CPU_STAT_VM86 && (CPU_STAT_CPL <= CPU_STAT_IOPL))
-	 || (CPU_STAT_IOPL == CPU_IOPL3)) {
-		/* Real-mode or (!VM86 && CPL <= IOPL) or (IOPL == 3) */
-		CPU_FLAG &= ~I_FLAG;
-		CPU_TRAP = 0;
-	} else if ((!CPU_STAT_VM86 && (CPU_STAT_CPL > CPU_STAT_IOPL))
-	        || (CPU_STAT_VM86 && (CPU_STAT_IOPL < 3))) {
-		/* (!VM86 && CPL > IOPL) or (VM86 && IOPL < 3) */
-		EXCEPTION(GP_EXCEPTION, 0);
-	} else {
-		/* Nothing to do */
+	if (CPU_STAT_PM) {
+		if (!CPU_STAT_VM86) {
+			if (CPU_STAT_CPL > CPU_STAT_IOPL) {
+				EXCEPTION(GP_EXCEPTION, 0);
+			}
+		} else {
+			if (CPU_STAT_IOPL < 3) {
+				EXCEPTION(GP_EXCEPTION, 0);
+			}
+		}
 	}
+	CPU_FLAG &= ~I_FLAG;
+	CPU_TRAP = 0;
 }