--- np2/i386c/ia32/instructions/flag_ctrl.c	2003/12/08 00:55:32	1.1
+++ np2/i386c/ia32/instructions/flag_ctrl.c	2004/02/20 16:09:05	1.6
@@ -1,4 +1,4 @@
-/*	$Id: flag_ctrl.c,v 1.1 2003/12/08 00:55:32 yui Exp $	*/
+/*	$Id: flag_ctrl.c,v 1.6 2004/02/20 16:09:05 monaka Exp $	*/
 
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
@@ -101,8 +101,8 @@ PUSHF_Fw(void)
 {
 
 	CPU_WORKCLOCK(3);
-	if (!CPU_STAT_PM || !CPU_STAT_VM86 || (CPU_STAT_CPL == 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 +116,8 @@ PUSHFD_Fd(void)
 {
 
 	CPU_WORKCLOCK(3);
-	if (!CPU_STAT_PM || !CPU_STAT_VM86 || (CPU_STAT_CPL == 3)) {
-		DWORD flags = REAL_EFLAGREG;
+	if (!CPU_STAT_PM || !CPU_STAT_VM86 || (CPU_STAT_IOPL == CPU_IOPL3)) {
+		UINT32 flags = REAL_EFLAGREG;
 		flags = (flags & ALL_EFLAG) | 2;
 		PUSH0_32(flags);
 		return;
@@ -129,7 +129,7 @@ PUSHFD_Fd(void)
 void
 POPF_Fw(void)
 {
-	WORD flags, mask = 0;
+	UINT16 flags, mask;
 
 	CPU_WORKCLOCK(3);
 	if (!CPU_STAT_PM) {
@@ -143,6 +143,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,6 +153,7 @@ POPF_Fw(void)
 	} else {
 		EXCEPTION(GP_EXCEPTION, 0);
 		flags = 0;
+		mask = 0;
 		/* compiler happy */
 	}
 	set_flags(flags, mask);
@@ -160,7 +163,7 @@ POPF_Fw(void)
 void
 POPFD_Fd(void)
 {
-	DWORD flags, mask = 0;
+	UINT32 flags, mask;
 
 	CPU_WORKCLOCK(3);
 	if (!CPU_STAT_PM) {
@@ -168,7 +171,7 @@ POPFD_Fd(void)
 		POP0_32(flags);
 		flags &= ~(VIF_FLAG|VIP_FLAG);
 		mask = I_FLAG|IOPL_FLAG|RF_FLAG|VIF_FLAG|VIP_FLAG;
-	} if (!CPU_STAT_VM86) {
+	} else if (!CPU_STAT_VM86) {
 		/* Protected Mode */
 		POP0_32(flags);
 		if (CPU_STAT_CPL == 0) {
@@ -177,6 +180,8 @@ POPFD_Fd(void)
 		} else if (CPU_STAT_CPL <= CPU_STAT_IOPL) {
 			flags &= ~(VIP_FLAG|VIF_FLAG);
 			mask = I_FLAG|RF_FLAG|VIF_FLAG|VIP_FLAG;
+		} else {
+			mask = 0;
 		}
 	} else if (CPU_STAT_IOPL == CPU_IOPL3) {
 		/* Virtual-8086 Mode, IOPL == 3 */
@@ -185,6 +190,7 @@ POPFD_Fd(void)
 	} else {
 		EXCEPTION(GP_EXCEPTION, 0);
 		flags = 0;
+		mask = 0;
 		/* compiler happy */
 	}
 	set_eflags(flags, mask);
@@ -196,10 +202,19 @@ STI(void)
 {
 
 	CPU_WORKCLOCK(2);
-	CPU_FLAG |= I_FLAG;
-	CPU_TRAP = (CPU_FLAG & (I_FLAG|T_FLAG)) == (I_FLAG|T_FLAG);
-	exec_1step();
-	IRQCHECKTERM();
+	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 */
+	}
 }
 
 void
@@ -207,6 +222,17 @@ CLI(void)
 {
 
 	CPU_WORKCLOCK(2);
-	CPU_FLAG &= ~I_FLAG;
-	CPU_TRAP = 0;
+	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 */
+	}
 }