--- np2/i386c/ia32/instructions/flag_ctrl.c	2008/01/25 17:49:46	1.11
+++ 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.11 2008/01/25 17:49:46 monaka Exp $	*/
-
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
  * All rights reserved.
@@ -130,6 +128,7 @@ POPF_Fw(void)
 	UINT16 flags, mask;
 
 	CPU_WORKCLOCK(3);
+	CPU_SET_PREV_ESP();
 	if (!CPU_STAT_PM) {
 		/* Real Mode */
 		POP0_16(flags);
@@ -155,6 +154,7 @@ POPF_Fw(void)
 		/* compiler happy */
 	}
 	set_eflags(flags, mask);
+	CPU_CLEAR_PREV_ESP();
 	IRQCHECKTERM();
 }
 
@@ -164,6 +164,7 @@ POPFD_Fd(void)
 	UINT32 flags, mask;
 
 	CPU_WORKCLOCK(3);
+	CPU_SET_PREV_ESP();
 	if (!CPU_STAT_PM) {
 		/* Real Mode */
 		POP0_32(flags);
@@ -193,6 +194,7 @@ POPFD_Fd(void)
 		/* compiler happy */
 	}
 	set_eflags(flags, mask);
+	CPU_CLEAR_PREV_ESP();
 	IRQCHECKTERM();
 }