--- np2/i386c/ia32/instructions/flag_ctrl.c	2004/03/08 12:56:22	1.7
+++ np2/i386c/ia32/instructions/flag_ctrl.c	2008/01/25 17:49:46	1.11
@@ -1,4 +1,4 @@
-/*	$Id: flag_ctrl.c,v 1.7 2004/03/08 12:56:22 monaka Exp $	*/
+/*	$Id: flag_ctrl.c,v 1.11 2008/01/25 17:49:46 monaka Exp $	*/
 
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
@@ -12,8 +12,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
@@ -117,7 +115,7 @@ PUSHFD_Fd(void)
 
 	CPU_WORKCLOCK(3);
 	if (!CPU_STAT_PM || !CPU_STAT_VM86 || (CPU_STAT_IOPL == CPU_IOPL3)) {
-		UINT32 flags = REAL_EFLAGREG;
+		UINT32 flags = REAL_EFLAGREG & ~(RF_FLAG|VM_FLAG);
 		flags = (flags & ALL_EFLAG) | 2;
 		PUSH0_32(flags);
 		return;
@@ -156,7 +154,7 @@ POPF_Fw(void)
 		mask = 0;
 		/* compiler happy */
 	}
-	set_flags(flags, mask);
+	set_eflags(flags, mask);
 	IRQCHECKTERM();
 }
 
@@ -203,19 +201,21 @@ STI(void)
 {
 
 	CPU_WORKCLOCK(2);
-	if ((!CPU_STAT_PM)
-	 || (!CPU_STAT_VM86 && (CPU_STAT_CPL <= CPU_STAT_IOPL))
-	 || (CPU_STAT_VM86 && (CPU_STAT_USER_MODE && 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
@@ -223,17 +223,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;
 }