--- np2/i386c/ia32/instructions/ctrl_trans.c	2004/03/12 13:34:08	1.15
+++ np2/i386c/ia32/instructions/ctrl_trans.c	2012/01/31 22:06:24	1.30
@@ -1,5 +1,3 @@
-/*	$Id: ctrl_trans.c,v 1.15 2004/03/12 13:34:08 monaka Exp $	*/
-
 /*
  * Copyright (c) 2002-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
@@ -34,6 +30,10 @@
 
 #include "ctrl_trans.h"
 
+#if defined(ENABLE_TRAP)
+#include "inttrap.h"
+#endif
+
 
 /*
  * JMP
@@ -41,55 +41,45 @@
 void
 JMP_Jb(void)
 {
-	UINT32 ip;
 
-	CPU_WORKCLOCK(7);
-	GET_PCBYTESD(ip);
-	ADD_EIP(ip);
-	CPU_PREFETCH_CLEAR();
+	JMPSHORT(7);
 }
 
 void
 JMP_Jw(void)
 {
-	UINT32 ip;
 
-	CPU_WORKCLOCK(7);
-	GET_PCWORDS(ip);
-	ADD_EIP(ip);
-	CPU_PREFETCH_CLEAR();
+	JMPNEAR(7);
 }
 
 void
 JMP_Jd(void)
 {
-	UINT32 ip;
 
-	CPU_WORKCLOCK(7);
-	GET_PCDWORD(ip);
-	ADD_EIP(ip);
-	CPU_PREFETCH_CLEAR();
+	JMPNEAR32(7);
 }
 
-void
+void CPUCALL
 JMP_Ew(UINT32 op)
 {
 	UINT32 madr;
-	UINT32 new_ip;
+	UINT16 new_ip;
 
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(7);
 		new_ip = *(reg16_b20[op]);
-		SET_EIP(new_ip);
 	} else {
 		CPU_WORKCLOCK(11);
 		madr = calc_ea_dst(op);
 		new_ip = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
-		SET_EIP(new_ip);
 	}
+	if (new_ip > CPU_STAT_CS_LIMIT) {
+		EXCEPTION(GP_EXCEPTION, 0);
+	}
+	CPU_EIP = new_ip;
 }
 
-void
+void CPUCALL
 JMP_Ed(UINT32 op)
 {
 	UINT32 madr;
@@ -98,28 +88,37 @@ JMP_Ed(UINT32 op)
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(7);
 		new_ip = *(reg32_b20[op]);
-		SET_EIP(new_ip);
 	} else {
 		CPU_WORKCLOCK(11);
 		madr = calc_ea_dst(op);
 		new_ip = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
-		SET_EIP(new_ip);
 	}
+	if (new_ip > CPU_STAT_CS_LIMIT) {
+		EXCEPTION(GP_EXCEPTION, 0);
+	}
+	CPU_EIP = new_ip;
 }
 
 void
 JMP16_Ap(void)
 {
-	UINT32 new_ip;
+	descriptor_t sd;
+	UINT16 new_ip;
 	UINT16 new_cs;
+	UINT16 sreg;
 
 	CPU_WORKCLOCK(11);
 	GET_PCWORD(new_ip);
 	GET_PCWORD(new_cs);
 	if (!CPU_STAT_PM || CPU_STAT_VM86) {
 		/* Real mode or VM86 mode */
-		CPU_SET_SEGREG(CPU_CS_INDEX, new_cs);
-		SET_EIP(new_ip);
+		/* check new instrunction pointer with new code segment */
+		load_segreg(CPU_CS_INDEX, new_cs, &sreg, &sd, GP_EXCEPTION);
+		if (new_ip > sd.u.seg.limit) {
+			EXCEPTION(GP_EXCEPTION, 0);
+		}
+		LOAD_SEGREG(CPU_CS_INDEX, new_cs);
+		CPU_EIP = new_ip;
 	} else {
 		/* Protected mode */
 		JMPfar_pm(new_cs, new_ip);
@@ -129,28 +128,37 @@ JMP16_Ap(void)
 void
 JMP32_Ap(void)
 {
+	descriptor_t sd;
 	UINT32 new_ip;
 	UINT16 new_cs;
+	UINT16 sreg;
 
 	CPU_WORKCLOCK(11);
 	GET_PCDWORD(new_ip);
 	GET_PCWORD(new_cs);
 	if (!CPU_STAT_PM || CPU_STAT_VM86) {
 		/* Real mode or VM86 mode */
-		CPU_SET_SEGREG(CPU_CS_INDEX, new_cs);
-		SET_EIP(new_ip);
+		/* check new instrunction pointer with new code segment */
+		load_segreg(CPU_CS_INDEX, new_cs, &sreg, &sd, GP_EXCEPTION);
+		if (new_ip > sd.u.seg.limit) {
+			EXCEPTION(GP_EXCEPTION, 0);
+		}
+		LOAD_SEGREG(CPU_CS_INDEX, new_cs);
+		CPU_EIP = new_ip;
 	} else {
 		/* Protected mode */
 		JMPfar_pm(new_cs, new_ip);
 	}
 }
 
-void
+void CPUCALL
 JMP16_Ep(UINT32 op)
 {
+	descriptor_t sd;
 	UINT32 madr;
-	UINT32 new_ip;
+	UINT16 new_ip;
 	UINT16 new_cs;
+	UINT16 sreg;
 
 	CPU_WORKCLOCK(11);
 	if (op < 0xc0) {
@@ -159,8 +167,13 @@ JMP16_Ep(UINT32 op)
 		new_cs = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr + 2);
 		if (!CPU_STAT_PM || CPU_STAT_VM86) {
 			/* Real mode or VM86 mode */
-			CPU_SET_SEGREG(CPU_CS_INDEX, new_cs);
-			SET_EIP(new_ip);
+			/* check new instrunction pointer with new code segment */
+			load_segreg(CPU_CS_INDEX, new_cs, &sreg, &sd, GP_EXCEPTION);
+			if (new_ip > sd.u.seg.limit) {
+				EXCEPTION(GP_EXCEPTION, 0);
+			}
+			LOAD_SEGREG(CPU_CS_INDEX, new_cs);
+			CPU_EIP = new_ip;
 		} else {
 			/* Protected mode */
 			JMPfar_pm(new_cs, new_ip);
@@ -170,12 +183,14 @@ JMP16_Ep(UINT32 op)
 	EXCEPTION(UD_EXCEPTION, 0);
 }
 
-void
+void CPUCALL
 JMP32_Ep(UINT32 op)
 {
+	descriptor_t sd;
 	UINT32 madr;
 	UINT32 new_ip;
 	UINT16 new_cs;
+	UINT16 sreg;
 
 	CPU_WORKCLOCK(11);
 	if (op < 0xc0) {
@@ -184,8 +199,13 @@ JMP32_Ep(UINT32 op)
 		new_cs = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr + 4);
 		if (!CPU_STAT_PM || CPU_STAT_VM86) {
 			/* Real mode or VM86 mode */
-			CPU_SET_SEGREG(CPU_CS_INDEX, new_cs);
-			SET_EIP(new_ip);
+			/* check new instrunction pointer with new code segment */
+			load_segreg(CPU_CS_INDEX, new_cs, &sreg, &sd, GP_EXCEPTION);
+			if (new_ip > sd.u.seg.limit) {
+				EXCEPTION(GP_EXCEPTION, 0);
+			}
+			LOAD_SEGREG(CPU_CS_INDEX, new_cs);
+			CPU_EIP = new_ip;
 		} else {
 			/* Protected mode */
 			JMPfar_pm(new_cs, new_ip);
@@ -200,7 +220,7 @@ void
 JO_Jb(void)
 {
 
-	if (!CPU_OV) {
+	if (CC_NO) {
 		JMPNOP(2, 1);
 	} else {
 		JMPSHORT(7);
@@ -211,7 +231,7 @@ void
 JO_Jw(void)
 {
 
-	if (!CPU_OV) {
+	if (CC_NO) {
 		JMPNOP(2, 2);
 	} else {
 		JMPNEAR(7);
@@ -222,10 +242,10 @@ void
 JO_Jd(void)
 {
 
-	if (!CPU_OV) {
+	if (CC_NO) {
 		JMPNOP(2, 4);
 	} else {
-		JMPNEAR_4(7);
+		JMPNEAR32(7);
 	}
 }
 
@@ -234,7 +254,7 @@ void
 JNO_Jb(void)
 {
 
-	if (CPU_OV) {
+	if (CC_O) {
 		JMPNOP(2, 1);
 	} else {
 		JMPSHORT(7);
@@ -245,7 +265,7 @@ void
 JNO_Jw(void)
 {
 
-	if (CPU_OV) {
+	if (CC_O) {
 		JMPNOP(2, 2);
 	} else {
 		JMPNEAR(7);
@@ -256,10 +276,10 @@ void
 JNO_Jd(void)
 {
 
-	if (CPU_OV) {
+	if (CC_O) {
 		JMPNOP(2, 4);
 	} else {
-		JMPNEAR_4(7);
+		JMPNEAR32(7);
 	}
 }
 
@@ -268,7 +288,7 @@ void
 JC_Jb(void)
 {
 
-	if (!(CPU_FLAGL & C_FLAG)) {
+	if (CC_NC) {
 		JMPNOP(2, 1);
 	} else {
 		JMPSHORT(7);
@@ -279,7 +299,7 @@ void
 JC_Jw(void)
 {
 
-	if (!(CPU_FLAGL & C_FLAG)) {
+	if (CC_NC) {
 		JMPNOP(2, 2);
 	} else {
 		JMPNEAR(7);
@@ -290,10 +310,10 @@ void
 JC_Jd(void)
 {
 
-	if (!(CPU_FLAGL & C_FLAG)) {
+	if (CC_NC) {
 		JMPNOP(2, 4);
 	} else {
-		JMPNEAR_4(7);
+		JMPNEAR32(7);
 	}
 }
 
@@ -302,7 +322,7 @@ void
 JNC_Jb(void)
 {
 
-	if (CPU_FLAGL & C_FLAG) {
+	if (CC_C) {
 		JMPNOP(2, 1);
 	} else {
 		JMPSHORT(7);
@@ -312,7 +332,7 @@ void
 JNC_Jw(void)
 {
 
-	if (CPU_FLAGL & C_FLAG) {
+	if (CC_C) {
 		JMPNOP(2, 2);
 	} else {
 		JMPNEAR(7);
@@ -322,10 +342,10 @@ void
 JNC_Jd(void)
 {
 
-	if (CPU_FLAGL & C_FLAG) {
+	if (CC_C) {
 		JMPNOP(2, 4);
 	} else {
-		JMPNEAR_4(7);
+		JMPNEAR32(7);
 	}
 }
 
@@ -334,7 +354,7 @@ void
 JZ_Jb(void)
 {
 
-	if (!(CPU_FLAGL & Z_FLAG)) {
+	if (CC_NZ) {
 		JMPNOP(2, 1);
 	} else {
 		JMPSHORT(7);
@@ -345,7 +365,7 @@ void
 JZ_Jw(void)
 {
 
-	if (!(CPU_FLAGL & Z_FLAG)) {
+	if (CC_NZ) {
 		JMPNOP(2, 2);
 	} else {
 		JMPNEAR(7);
@@ -356,10 +376,10 @@ void
 JZ_Jd(void)
 {
 
-	if (!(CPU_FLAGL & Z_FLAG)) {
+	if (CC_NZ) {
 		JMPNOP(2, 4);
 	} else {
-		JMPNEAR_4(7);
+		JMPNEAR32(7);
 	}
 }
 
@@ -368,7 +388,7 @@ void
 JNZ_Jb(void)
 {
 
-	if (CPU_FLAGL & Z_FLAG) {
+	if (CC_Z) {
 		JMPNOP(2, 1);
 	} else {
 		JMPSHORT(7);
@@ -379,7 +399,7 @@ void
 JNZ_Jw(void)
 {
 
-	if (CPU_FLAGL & Z_FLAG) {
+	if (CC_Z) {
 		JMPNOP(2, 2);
 	} else {
 		JMPNEAR(7);
@@ -390,10 +410,10 @@ void
 JNZ_Jd(void)
 {
 
-	if (CPU_FLAGL & Z_FLAG) {
+	if (CC_Z) {
 		JMPNOP(2, 4);
 	} else {
-		JMPNEAR_4(7);
+		JMPNEAR32(7);
 	}
 }
 
@@ -402,7 +422,7 @@ void
 JNA_Jb(void)
 {
 
-	if (!(CPU_FLAGL & (Z_FLAG | C_FLAG))) {
+	if (CC_A) {
 		JMPNOP(2, 1);
 	} else {
 		JMPSHORT(7);
@@ -413,7 +433,7 @@ void
 JNA_Jw(void)
 {
 
-	if (!(CPU_FLAGL & (Z_FLAG | C_FLAG))) {
+	if (CC_A) {
 		JMPNOP(2, 2);
 	} else {
 		JMPNEAR(7);
@@ -424,10 +444,10 @@ void
 JNA_Jd(void)
 {
 
-	if (!(CPU_FLAGL & (Z_FLAG | C_FLAG))) {
+	if (CC_A) {
 		JMPNOP(2, 4);
 	} else {
-		JMPNEAR_4(7);
+		JMPNEAR32(7);
 	}
 }
 
@@ -436,7 +456,7 @@ void
 JA_Jb(void)
 {
 
-	if (CPU_FLAGL & (Z_FLAG | C_FLAG)) {
+	if (CC_NA) {
 		JMPNOP(2, 1);
 	} else {
 		JMPSHORT(7);
@@ -447,7 +467,7 @@ void
 JA_Jw(void)
 {
 
-	if (CPU_FLAGL & (Z_FLAG | C_FLAG)) {
+	if (CC_NA) {
 		JMPNOP(2, 2);
 	} else {
 		JMPNEAR(7);
@@ -458,10 +478,10 @@ void
 JA_Jd(void)
 {
 
-	if (CPU_FLAGL & (Z_FLAG | C_FLAG)) {
+	if (CC_NA) {
 		JMPNOP(2, 4);
 	} else {
-		JMPNEAR_4(7);
+		JMPNEAR32(7);
 	}
 }
 
@@ -470,7 +490,7 @@ void
 JS_Jb(void)
 {
 
-	if (!(CPU_FLAGL & S_FLAG)) {
+	if (CC_NS) {
 		JMPNOP(2, 1);
 	} else {
 		JMPSHORT(7);
@@ -481,7 +501,7 @@ void
 JS_Jw(void)
 {
 
-	if (!(CPU_FLAGL & S_FLAG)) {
+	if (CC_NS) {
 		JMPNOP(2, 2);
 	} else {
 		JMPNEAR(7);
@@ -492,10 +512,10 @@ void
 JS_Jd(void)
 {
 
-	if (!(CPU_FLAGL & S_FLAG)) {
+	if (CC_NS) {
 		JMPNOP(2, 4);
 	} else {
-		JMPNEAR_4(7);
+		JMPNEAR32(7);
 	}
 }
 
@@ -504,7 +524,7 @@ void
 JNS_Jb(void)
 {
 
-	if (CPU_FLAGL & S_FLAG) {
+	if (CC_S) {
 		JMPNOP(2, 1);
 	} else {
 		JMPSHORT(7);
@@ -515,7 +535,7 @@ void
 JNS_Jw(void)
 {
 
-	if (CPU_FLAGL & S_FLAG) {
+	if (CC_S) {
 		JMPNOP(2, 2);
 	} else {
 		JMPNEAR(7);
@@ -526,10 +546,10 @@ void
 JNS_Jd(void)
 {
 
-	if (CPU_FLAGL & S_FLAG) {
+	if (CC_S) {
 		JMPNOP(2, 4);
 	} else {
-		JMPNEAR_4(7);
+		JMPNEAR32(7);
 	}
 }
 
@@ -538,7 +558,7 @@ void
 JP_Jb(void)
 {
 
-	if (!(CPU_FLAGL & P_FLAG)) {
+	if (CC_NP) {
 		JMPNOP(2, 1);
 	} else {
 		JMPSHORT(7);
@@ -549,7 +569,7 @@ void
 JP_Jw(void)
 {
 
-	if (!(CPU_FLAGL & P_FLAG)) {
+	if (CC_NP) {
 		JMPNOP(2, 2);
 	} else {
 		JMPNEAR(7);
@@ -560,10 +580,10 @@ void
 JP_Jd(void)
 {
 
-	if (!(CPU_FLAGL & P_FLAG)) {
+	if (CC_NP) {
 		JMPNOP(2, 4);
 	} else {
-		JMPNEAR_4(7);
+		JMPNEAR32(7);
 	}
 }
 
@@ -572,7 +592,7 @@ void
 JNP_Jb(void)
 {
 
-	if (CPU_FLAGL & P_FLAG) {
+	if (CC_P) {
 		JMPNOP(2, 1);
 	} else {
 		JMPSHORT(7);
@@ -583,7 +603,7 @@ void
 JNP_Jw(void)
 {
 
-	if (CPU_FLAGL & P_FLAG) {
+	if (CC_P) {
 		JMPNOP(2, 2);
 	} else {
 		JMPNEAR(7);
@@ -594,10 +614,10 @@ void
 JNP_Jd(void)
 {
 
-	if (CPU_FLAGL & P_FLAG) {
+	if (CC_P) {
 		JMPNOP(2, 4);
 	} else {
-		JMPNEAR_4(7);
+		JMPNEAR32(7);
 	}
 }
 
@@ -606,7 +626,7 @@ void
 JL_Jb(void)
 {
 
-	if ((!(CPU_FLAGL & S_FLAG)) == (!CPU_OV)) {
+	if (CC_NL) {
 		JMPNOP(2, 1);
 	} else {
 		JMPSHORT(7);
@@ -617,7 +637,7 @@ void
 JL_Jw(void)
 {
 
-	if ((!(CPU_FLAGL & S_FLAG)) == (!CPU_OV)) {
+	if (CC_NL) {
 		JMPNOP(2, 2);
 	} else {
 		JMPNEAR(7);
@@ -628,10 +648,10 @@ void
 JL_Jd(void)
 {
 
-	if ((!(CPU_FLAGL & S_FLAG)) == (!CPU_OV)) {
+	if (CC_NL) {
 		JMPNOP(2, 4);
 	} else {
-		JMPNEAR_4(7);
+		JMPNEAR32(7);
 	}
 }
 
@@ -640,7 +660,7 @@ void
 JNL_Jb(void)
 {
 
-	if ((!(CPU_FLAGL & S_FLAG)) != (!CPU_OV)) {
+	if (CC_L) {
 		JMPNOP(2, 1);
 	} else {
 		JMPSHORT(7);
@@ -651,7 +671,7 @@ void
 JNL_Jw(void)
 {
 
-	if ((!(CPU_FLAGL & S_FLAG)) != (!CPU_OV)) {
+	if (CC_L) {
 		JMPNOP(2, 2);
 	} else {
 		JMPNEAR(7);
@@ -662,10 +682,10 @@ void
 JNL_Jd(void)
 {
 
-	if ((!(CPU_FLAGL & S_FLAG)) != (!CPU_OV)) {
+	if (CC_L) {
 		JMPNOP(2, 4);
 	} else {
-		JMPNEAR_4(7);
+		JMPNEAR32(7);
 	}
 }
 
@@ -674,7 +694,7 @@ void
 JLE_Jb(void)
 {
 
-	if ((!(CPU_FLAGL & Z_FLAG)) && ((!(CPU_FLAGL & S_FLAG)) == (!CPU_OV))) {
+	if (CC_NLE) {
 		JMPNOP(2, 1);
 	} else {
 		JMPSHORT(7);
@@ -685,7 +705,7 @@ void
 JLE_Jw(void)
 {
 
-	if ((!(CPU_FLAGL & Z_FLAG)) && ((!(CPU_FLAGL & S_FLAG)) == (!CPU_OV))) {
+	if (CC_NLE) {
 		JMPNOP(2, 2);
 	} else {
 		JMPNEAR(7);
@@ -696,10 +716,10 @@ void
 JLE_Jd(void)
 {
 
-	if ((!(CPU_FLAGL & Z_FLAG)) && ((!(CPU_FLAGL & S_FLAG)) == (!CPU_OV))) {
+	if (CC_NLE) {
 		JMPNOP(2, 4);
 	} else {
-		JMPNEAR_4(7);
+		JMPNEAR32(7);
 	}
 }
 
@@ -708,7 +728,7 @@ void
 JNLE_Jb(void)
 {
 
-	if ((CPU_FLAGL & Z_FLAG) || ((!(CPU_FLAGL & S_FLAG)) != (!CPU_OV))) {
+	if (CC_LE) {
 		JMPNOP(2, 1);
 	} else {
 		JMPSHORT(7);
@@ -719,7 +739,7 @@ void
 JNLE_Jw(void)
 {
 
-	if ((CPU_FLAGL & Z_FLAG) || ((!(CPU_FLAGL & S_FLAG)) != (!CPU_OV))) {
+	if (CC_LE) {
 		JMPNOP(2, 2);
 	} else {
 		JMPNEAR(7);
@@ -730,10 +750,10 @@ void
 JNLE_Jd(void)
 {
 
-	if ((CPU_FLAGL & Z_FLAG) || ((!(CPU_FLAGL & S_FLAG)) != (!CPU_OV))) {
+	if (CC_LE) {
 		JMPNOP(2, 4);
 	} else {
-		JMPNEAR_4(7);
+		JMPNEAR32(7);
 	}
 }
 
@@ -743,16 +763,16 @@ JeCXZ_Jb(void)
 {
 
 	if (!CPU_INST_AS32) {
-		if (CPU_CX) {
-			JMPNOP(4, 1);
-		} else {
+		if (CPU_CX == 0) {
 			JMPSHORT(8);
+		} else {
+			JMPNOP(4, 1);
 		}
 	} else {
-		if (CPU_ECX) {
-			JMPNOP(4, 1);
-		} else {
+		if (CPU_ECX == 0) {
 			JMPSHORT(8);
+		} else {
+			JMPNOP(4, 1);
 		}
 	}
 }
@@ -764,21 +784,24 @@ JeCXZ_Jb(void)
 void
 LOOPNE_Jb(void)
 {
+	UINT32 cx;
 
 	if (!CPU_INST_AS32) {
-		CPU_CX--;
-		if (CPU_CX == 0 || (CPU_FLAGL & Z_FLAG)) {
-			JMPNOP(4, 1);
-		} else {
+		cx = CPU_CX;
+		if (--cx != 0 && CC_NZ) {
 			JMPSHORT(8);
+		} else {
+			JMPNOP(4, 1);
 		}
+		CPU_CX--;
 	} else {
-		CPU_ECX--;
-		if (CPU_ECX == 0 || (CPU_FLAGL & Z_FLAG)) {
-			JMPNOP(4, 1);
-		} else {
+		cx = CPU_ECX;
+		if (--cx != 0 && CC_NZ) {
 			JMPSHORT(8);
+		} else {
+			JMPNOP(4, 1);
 		}
+		CPU_ECX--;
 	}
 }
 
@@ -786,21 +809,24 @@ LOOPNE_Jb(void)
 void
 LOOPE_Jb(void)
 {
+	UINT32 cx;
 
 	if (!CPU_INST_AS32) {
-		CPU_CX--;
-		if (CPU_CX == 0 || !(CPU_FLAGL & Z_FLAG)) {
-			JMPNOP(4, 1);
-		} else {
+		cx = CPU_CX;
+		if (--cx != 0 && CC_Z) {
 			JMPSHORT(8);
+		} else {
+			JMPNOP(4, 1);
 		}
+		CPU_CX--;
 	} else {
-		CPU_ECX--;
-		if (CPU_ECX == 0 || !(CPU_FLAGL & Z_FLAG)) {
-			JMPNOP(4, 1);
-		} else {
+		cx = CPU_ECX;
+		if (--cx != 0 && CC_Z) {
 			JMPSHORT(8);
+		} else {
+			JMPNOP(4, 1);
 		}
+		CPU_ECX--;
 	}
 }
 
@@ -808,21 +834,24 @@ LOOPE_Jb(void)
 void
 LOOP_Jb(void)
 {
+	UINT32 cx;
 
 	if (!CPU_INST_AS32) {
-		CPU_CX--;
-		if (CPU_CX == 0) {
-			JMPNOP(4, 1);
-		} else {
+		cx = CPU_CX;
+		if (--cx != 0) {
 			JMPSHORT(8);
+		} else {
+			JMPNOP(4, 1);
 		}
+		CPU_CX--;
 	} else {
-		CPU_ECX--;
-		if (CPU_ECX == 0) {
-			JMPNOP(4, 1);
-		} else {
+		cx = CPU_ECX;
+		if (--cx != 0) {
 			JMPSHORT(8);
+		} else {
+			JMPNOP(4, 1);
 		}
+		CPU_ECX--;
 	}
 }
 
@@ -832,33 +861,46 @@ LOOP_Jb(void)
 void
 CALL_Aw(void)
 {
-	SINT32 ip;
+	UINT16 new_ip;
+	SINT16 dest;
 
 	CPU_WORKCLOCK(7);
-	GET_PCWORDS(ip);
+	CPU_SET_PREV_ESP();
+	GET_PCWORDS(dest);
+	new_ip = CPU_EIP + dest;
+	if (new_ip > CPU_STAT_CS_LIMIT) {
+		EXCEPTION(GP_EXCEPTION, 0);
+	}
 	PUSH0_16(CPU_IP);
-	ADD_EIP(ip);
-	CPU_PREFETCH_CLEAR();
+	CPU_EIP = new_ip;
+	CPU_CLEAR_PREV_ESP();
 }
 
 void
 CALL_Ad(void)
 {
-	UINT32 ip;
+	UINT32 new_ip;
+	UINT32 dest;
 
 	CPU_WORKCLOCK(7);
-	GET_PCDWORD(ip);
+	CPU_SET_PREV_ESP();
+	GET_PCDWORD(dest);
+	new_ip = CPU_EIP + dest;
+	if (new_ip > CPU_STAT_CS_LIMIT) {
+		EXCEPTION(GP_EXCEPTION, 0);
+	}
 	PUSH0_32(CPU_EIP);
-	ADD_EIP(ip);
-	CPU_PREFETCH_CLEAR();
+	CPU_EIP = new_ip;
+	CPU_CLEAR_PREV_ESP();
 }
 
-void
+void CPUCALL
 CALL_Ew(UINT32 op)
 {
 	UINT32 madr;
-	UINT32 new_ip;
+	UINT16 new_ip;
 
+	CPU_SET_PREV_ESP();
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(7);
 		new_ip = *(reg16_b20[op]);
@@ -867,16 +909,21 @@ CALL_Ew(UINT32 op)
 		madr = calc_ea_dst(op);
 		new_ip = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
 	}
+	if (new_ip > CPU_STAT_CS_LIMIT) {
+		EXCEPTION(GP_EXCEPTION, 0);
+	}
 	PUSH0_16(CPU_IP);
-	SET_EIP(new_ip);
+	CPU_EIP = new_ip;
+	CPU_CLEAR_PREV_ESP();
 }
 
-void
+void CPUCALL
 CALL_Ed(UINT32 op)
 {
 	UINT32 madr;
 	UINT32 new_ip;
 
+	CPU_SET_PREV_ESP();
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(7);
 		new_ip = *(reg32_b20[op]);
@@ -885,26 +932,39 @@ CALL_Ed(UINT32 op)
 		madr = calc_ea_dst(op);
 		new_ip = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
 	}
+	if (new_ip > CPU_STAT_CS_LIMIT) {
+		EXCEPTION(GP_EXCEPTION, 0);
+	}
 	PUSH0_32(CPU_EIP);
-	SET_EIP(new_ip);
+	CPU_EIP = new_ip;
+	CPU_CLEAR_PREV_ESP();
 }
 
 void
 CALL16_Ap(void)
 {
-	UINT32 new_ip;
+	descriptor_t sd;
+	UINT16 new_ip;
 	UINT16 new_cs;
+	UINT16 sreg;
 
 	CPU_WORKCLOCK(13);
 	GET_PCWORD(new_ip);
 	GET_PCWORD(new_cs);
 	if (!CPU_STAT_PM || CPU_STAT_VM86) {
 		/* Real mode or VM86 mode */
+		CPU_SET_PREV_ESP();
+		load_segreg(CPU_CS_INDEX, new_cs, &sreg, &sd, GP_EXCEPTION);
+		if (new_ip > sd.u.seg.limit) {
+			EXCEPTION(GP_EXCEPTION, 0);
+		}
+
 		PUSH0_16(CPU_CS);
 		PUSH0_16(CPU_IP);
 
-		CPU_SET_SEGREG(CPU_CS_INDEX, new_cs);
-		SET_EIP(new_ip);
+		LOAD_SEGREG(CPU_CS_INDEX, new_cs);
+		CPU_EIP = new_ip;
+		CPU_CLEAR_PREV_ESP();
 	} else {
 		/* Protected mode */
 		CALLfar_pm(new_cs, new_ip);
@@ -914,44 +974,62 @@ CALL16_Ap(void)
 void
 CALL32_Ap(void)
 {
+	descriptor_t sd;
 	UINT32 new_ip;
 	UINT16 new_cs;
+	UINT16 sreg;
 
 	CPU_WORKCLOCK(13);
 	GET_PCDWORD(new_ip);
 	GET_PCWORD(new_cs);
 	if (!CPU_STAT_PM || CPU_STAT_VM86) {
 		/* Real mode or VM86 mode */
+		CPU_SET_PREV_ESP();
+		load_segreg(CPU_CS_INDEX, new_cs, &sreg, &sd, GP_EXCEPTION);
+		if (new_ip > sd.u.seg.limit) {
+			EXCEPTION(GP_EXCEPTION, 0);
+		}
+
 		PUSH0_32(CPU_CS);
 		PUSH0_32(CPU_EIP);
 
-		CPU_SET_SEGREG(CPU_CS_INDEX, new_cs);
-		SET_EIP(new_ip);
+		LOAD_SEGREG(CPU_CS_INDEX, new_cs);
+		CPU_EIP = new_ip;
+		CPU_CLEAR_PREV_ESP();
 	} else {
 		/* Protected mode */
 		CALLfar_pm(new_cs, new_ip);
 	}
 }
 
-void
+void CPUCALL
 CALL16_Ep(UINT32 op)
 {
-	UINT32 ad;
-	UINT32 new_ip;
+	descriptor_t sd;
+	UINT32 madr;
+	UINT16 new_ip;
 	UINT16 new_cs;
+	UINT16 sreg;
 
 	CPU_WORKCLOCK(16);
 	if (op < 0xc0) {
-		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);
+		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) {
 			/* Real mode or VM86 mode */
+			CPU_SET_PREV_ESP();
+			load_segreg(CPU_CS_INDEX, new_cs, &sreg, &sd, GP_EXCEPTION);
+			if (new_ip > sd.u.seg.limit) {
+				EXCEPTION(GP_EXCEPTION, 0);
+			}
+
 			PUSH0_16(CPU_CS);
 			PUSH0_16(CPU_IP);
 
-			CPU_SET_SEGREG(CPU_CS_INDEX, new_cs);
-			SET_EIP(new_ip);
+			LOAD_SEGREG(CPU_CS_INDEX, new_cs);
+			CPU_EIP = new_ip;
+			CPU_CLEAR_PREV_ESP();
 		} else {
 			/* Protected mode */
 			CALLfar_pm(new_cs, new_ip);
@@ -961,25 +1039,34 @@ CALL16_Ep(UINT32 op)
 	EXCEPTION(UD_EXCEPTION, 0);
 }
 
-void
+void CPUCALL
 CALL32_Ep(UINT32 op)
 {
-	UINT32 ad;
+	descriptor_t sd;
+	UINT32 madr;
 	UINT32 new_ip;
 	UINT16 new_cs;
+	UINT16 sreg;
 
 	CPU_WORKCLOCK(16);
 	if (op < 0xc0) {
-		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);
+		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) {
 			/* Real mode or VM86 mode */
+			CPU_SET_PREV_ESP();
+			load_segreg(CPU_CS_INDEX, new_cs, &sreg, &sd, GP_EXCEPTION);
+			if (new_ip > sd.u.seg.limit) {
+				EXCEPTION(GP_EXCEPTION, 0);
+			}
+
 			PUSH0_32(CPU_CS);
 			PUSH0_32(CPU_EIP);
 
-			CPU_SET_SEGREG(CPU_CS_INDEX, new_cs);
-			SET_EIP(new_ip);
+			LOAD_SEGREG(CPU_CS_INDEX, new_cs);
+			CPU_EIP = new_ip;
+			CPU_CLEAR_PREV_ESP();
 		} else {
 			/* Protected mode */
 			CALLfar_pm(new_cs, new_ip);
@@ -995,11 +1082,16 @@ CALL32_Ep(UINT32 op)
 void
 RETnear16(void)
 {
-	UINT32 new_ip;
+	UINT16 new_ip;
 
 	CPU_WORKCLOCK(11);
+	CPU_SET_PREV_ESP();
 	POP0_16(new_ip);
-	SET_EIP(new_ip);
+	if (new_ip > CPU_STAT_CS_LIMIT) {
+		EXCEPTION(GP_EXCEPTION, 0);
+	}
+	CPU_EIP = new_ip;
+	CPU_CLEAR_PREV_ESP();
 }
 
 void
@@ -1008,25 +1100,35 @@ RETnear32(void)
 	UINT32 new_ip;
 
 	CPU_WORKCLOCK(11);
+	CPU_SET_PREV_ESP();
 	POP0_32(new_ip);
-	SET_EIP(new_ip);
+	if (new_ip > CPU_STAT_CS_LIMIT) {
+		EXCEPTION(GP_EXCEPTION, 0);
+	}
+	CPU_EIP = new_ip;
+	CPU_CLEAR_PREV_ESP();
 }
 
 void
 RETnear16_Iw(void)
 {
-	UINT32 new_ip;
+	UINT16 new_ip;
 	UINT16 size;
 
 	CPU_WORKCLOCK(11);
+	CPU_SET_PREV_ESP();
 	GET_PCWORD(size);
 	POP0_16(new_ip);
-	SET_EIP(new_ip);
+	if (new_ip > CPU_STAT_CS_LIMIT) {
+		EXCEPTION(GP_EXCEPTION, 0);
+	}
+	CPU_EIP = new_ip;
 	if (!CPU_STAT_SS32) {
 		CPU_SP += size;
 	} else {
 		CPU_ESP += size;
 	}
+	CPU_CLEAR_PREV_ESP();
 }
 
 void
@@ -1036,30 +1138,45 @@ RETnear32_Iw(void)
 	UINT16 size;
 
 	CPU_WORKCLOCK(11);
+	CPU_SET_PREV_ESP();
 	GET_PCWORD(size);
 	POP0_32(new_ip);
-	SET_EIP(new_ip);
+	if (new_ip > CPU_STAT_CS_LIMIT) {
+		EXCEPTION(GP_EXCEPTION, 0);
+	}
+	CPU_EIP = new_ip;
 	if (!CPU_STAT_SS32) {
 		CPU_SP += size;
 	} else {
 		CPU_ESP += size;
 	}
+	CPU_CLEAR_PREV_ESP();
 }
 
 void
 RETfar16(void)
 {
-	UINT32 new_ip;
+	descriptor_t sd;
+	UINT16 new_ip;
 	UINT16 new_cs;
+	UINT16 sreg;
 
 	CPU_WORKCLOCK(15);
 	if (!CPU_STAT_PM || CPU_STAT_VM86) {
 		/* Real mode or VM86 mode */
+		CPU_SET_PREV_ESP();
 		POP0_16(new_ip);
 		POP0_16(new_cs);
 
-		CPU_SET_SEGREG(CPU_CS_INDEX, new_cs);
-		SET_EIP(new_ip);
+		/* check new instrunction pointer with new code segment */
+		load_segreg(CPU_CS_INDEX, new_cs, &sreg, &sd, GP_EXCEPTION);
+		if (new_ip > sd.u.seg.limit) {
+			EXCEPTION(GP_EXCEPTION, 0);
+		}
+
+		LOAD_SEGREG(CPU_CS_INDEX, new_cs);
+		CPU_EIP = new_ip;
+		CPU_CLEAR_PREV_ESP();
 	} else {
 		/* Protected mode */
 		RETfar_pm(0);
@@ -1069,17 +1186,27 @@ RETfar16(void)
 void
 RETfar32(void)
 {
+	descriptor_t sd;
 	UINT32 new_ip;
 	UINT32 new_cs;
+	UINT16 sreg;
 
 	CPU_WORKCLOCK(15);
 	if (!CPU_STAT_PM || CPU_STAT_VM86) {
 		/* Real mode or VM86 mode */
+		CPU_SET_PREV_ESP();
 		POP0_32(new_ip);
 		POP0_32(new_cs);
 
-		CPU_SET_SEGREG(CPU_CS_INDEX, (UINT16)new_cs);
-		SET_EIP(new_ip);
+		/* check new instrunction pointer with new code segment */
+		load_segreg(CPU_CS_INDEX, new_cs, &sreg, &sd, GP_EXCEPTION);
+		if (new_ip > sd.u.seg.limit) {
+			EXCEPTION(GP_EXCEPTION, 0);
+		}
+
+		LOAD_SEGREG(CPU_CS_INDEX, (UINT16)new_cs);
+		CPU_EIP = new_ip;
+		CPU_CLEAR_PREV_ESP();
 	} else {
 		/* Protected mode */
 		RETfar_pm(0);
@@ -1089,25 +1216,34 @@ RETfar32(void)
 void
 RETfar16_Iw(void)
 {
-	UINT32 new_ip;
+	descriptor_t sd;
+	UINT16 new_ip;
 	UINT16 new_cs;
+	UINT16 sreg;
 	UINT16 size;
 
 	CPU_WORKCLOCK(15);
 	GET_PCWORD(size);
 	if (!CPU_STAT_PM || CPU_STAT_VM86) {
 		/* Real mode or VM86 mode */
+		CPU_SET_PREV_ESP();
 		POP0_16(new_ip);
 		POP0_16(new_cs);
 
-		CPU_SET_SEGREG(CPU_CS_INDEX, new_cs);
-		SET_EIP(new_ip);
+		/* check new instrunction pointer with new code segment */
+		load_segreg(CPU_CS_INDEX, new_cs, &sreg, &sd, GP_EXCEPTION);
+		if (new_ip > sd.u.seg.limit) {
+			EXCEPTION(GP_EXCEPTION, 0);
+		}
 
+		LOAD_SEGREG(CPU_CS_INDEX, new_cs);
+		CPU_EIP = new_ip;
 		if (!CPU_STAT_SS32) {
 			CPU_SP += size;
 		} else {
 			CPU_ESP += size;
 		}
+		CPU_CLEAR_PREV_ESP();
 	} else {
 		/* Protected mode */
 		RETfar_pm(size);
@@ -1117,25 +1253,34 @@ RETfar16_Iw(void)
 void
 RETfar32_Iw(void)
 {
+	descriptor_t sd;
 	UINT32 new_ip;
 	UINT32 new_cs;
+	UINT16 sreg;
 	UINT16 size;
 
 	CPU_WORKCLOCK(15);
 	GET_PCWORD(size);
 	if (!CPU_STAT_PM || CPU_STAT_VM86) {
 		/* Real mode or VM86 mode */
+		CPU_SET_PREV_ESP();
 		POP0_32(new_ip);
 		POP0_32(new_cs);
 
-		CPU_SET_SEGREG(CPU_CS_INDEX, (UINT16)new_cs);
-		SET_EIP(new_ip);
+		/* check new instrunction pointer with new code segment */
+		load_segreg(CPU_CS_INDEX, new_cs, &sreg, &sd, GP_EXCEPTION);
+		if (new_ip > sd.u.seg.limit) {
+			EXCEPTION(GP_EXCEPTION, 0);
+		}
 
+		LOAD_SEGREG(CPU_CS_INDEX, (UINT16)new_cs);
+		CPU_EIP = new_ip;
 		if (!CPU_STAT_SS32) {
 			CPU_SP += size;
 		} else {
 			CPU_ESP += size;
 		}
+		CPU_CLEAR_PREV_ESP();
 	} else {
 		/* Protected mode */
 		RETfar_pm(size);
@@ -1145,31 +1290,17 @@ RETfar32_Iw(void)
 void
 IRET(void)
 {
+	descriptor_t sd;
 	UINT32 new_ip;
 	UINT32 new_flags;
 	UINT32 new_cs;
-#if !defined(IA32_DONT_USE_SET_EFLAGS_FUNCTION)
 	UINT32 mask;
-#endif
+	UINT16 sreg;
 
+	CPU_WORKCLOCK(22);
 	if (!CPU_STAT_PM) {
 		/* Real mode */
-		CPU_WORKCLOCK(22);
-#if defined(IA32_DONT_USE_SET_EFLAGS_FUNCTION)
-		if (!CPU_INST_OP32) {
-			POP0_16(new_ip);
-			POP0_16(new_cs);
-			POP0_16(new_flags);
-			CPU_FLAG = new_flags & ALL_FLAG;
-		} else {
-			POP0_32(new_ip);
-			POP0_32(new_cs);
-			POP0_32(new_flags);
-			CPU_EFLAG = (new_flags & (ALL_FLAG|RF_FLAG|AC_FLAG|ID_FLAG)) | (CPU_EFLAG & (VM_FLAG|VIF_FLAG|VIP_FLAG));
-		}
-		CPU_OV = CPU_FLAG & O_FLAG;
-		CPU_TRAP = (CPU_FLAG & (I_FLAG|T_FLAG)) == (I_FLAG|T_FLAG);
-#else
+		CPU_SET_PREV_ESP();
 		mask = I_FLAG|IOPL_FLAG;
 		if (!CPU_INST_OP32) {
 			POP0_16(new_ip);
@@ -1182,20 +1313,21 @@ IRET(void)
 			mask |= RF_FLAG;
 		}
 
-		set_eflags(new_flags, mask);
-#endif
+		/* check new instrunction pointer with new code segment */
+		load_segreg(CPU_CS_INDEX, new_cs, &sreg, &sd, GP_EXCEPTION);
+		if (new_ip > sd.u.seg.limit) {
+			EXCEPTION(GP_EXCEPTION, 0);
+		}
 
-		CPU_SET_SEGREG(CPU_CS_INDEX, (UINT16)new_cs);
-		SET_EIP(new_ip);
+		LOAD_SEGREG(CPU_CS_INDEX, (UINT16)new_cs);
+		CPU_EIP = new_ip;
+
+		set_eflags(new_flags, mask);
+		CPU_CLEAR_PREV_ESP();
 	} else {
 		/* Protected mode */
 		IRET_pm();
 	}
-#if defined(IA32_SUPPORT_DEBUG_REGISTER)
-	if (CPU_EFLAG & RF_FLAG) {
-		CPU_STAT_BP_EVENT |= CPU_STAT_BP_EVENT_RF;
-	}
-#endif
 	IRQCHECKTERM();
 }
 
@@ -1207,7 +1339,7 @@ INT1(void)
 {
 
 	CPU_WORKCLOCK(33);
-	INTERRUPT(1, 1, 0, 0);
+	INTERRUPT(1, INTR_TYPE_SOFTINTR);
 }
 
 void
@@ -1215,7 +1347,7 @@ INT3(void)
 {
 
 	CPU_WORKCLOCK(33);
-	INTERRUPT(3, 2, 0, 0);
+	INTERRUPT(3, INTR_TYPE_SOFTINTR);
 }
 
 void
@@ -1227,7 +1359,7 @@ INTO(void)
 		return;
 	}
 	CPU_WORKCLOCK(35);
-	INTERRUPT(4, 3, 0, 0);
+	INTERRUPT(4, INTR_TYPE_SOFTINTR);
 }
 
 void
@@ -1238,9 +1370,13 @@ INT_Ib(void)
 	CPU_WORKCLOCK(37);
 	if (!CPU_STAT_PM || !CPU_STAT_VM86 || (CPU_STAT_IOPL == CPU_IOPL3)) {
 		GET_PCBYTE(vect);
-		INTERRUPT(vect, -1, 0, 0);
+#if defined(ENABLE_TRAP)
+		softinttrap(CPU_CS, CPU_EIP - 2, vect);
+#endif
+		INTERRUPT(vect, INTR_TYPE_SOFTINTR);
 		return;
 	}
+	VERBOSE(("INT_Ib: VM86 && IOPL < 3 && INTn"));
 	EXCEPTION(GP_EXCEPTION, 0);
 }
 
@@ -1249,7 +1385,6 @@ BOUND_GwMa(void)
 {
 	UINT32 op, madr;
 	UINT16 reg;
-	int vect;
 
 	CPU_WORKCLOCK(13);
 	GET_PCBYTE(op);
@@ -1260,11 +1395,10 @@ BOUND_GwMa(void)
 		    reg <= cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr + 2)) {
 				return;
 		}
-		vect = BR_EXCEPTION;
-	} else {
-		vect = UD_EXCEPTION;
+		EXCEPTION(BR_EXCEPTION, 0);
+		return;
 	}
-	EXCEPTION(vect, 0);
+	EXCEPTION(UD_EXCEPTION, 0);
 }
 
 void
@@ -1272,7 +1406,6 @@ BOUND_GdMa(void)
 {
 	UINT32 op, madr;
 	UINT32 reg;
-	int vect;
 
 	CPU_WORKCLOCK(13);
 	GET_PCBYTE(op);
@@ -1283,11 +1416,10 @@ BOUND_GdMa(void)
 		    reg <= cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr + 4)) {
 				return;
 		}
-		vect = BR_EXCEPTION;
-	} else {
-		vect = UD_EXCEPTION;
+		EXCEPTION(BR_EXCEPTION, 0);
+		return;
 	}
-	EXCEPTION(vect, 0);
+	EXCEPTION(UD_EXCEPTION, 0);
 }
 
 /*
@@ -1297,26 +1429,16 @@ void
 ENTER16_IwIb(void)
 {
 	UINT32 sp, bp;
-	UINT32 size;
 	UINT32 val;
 	UINT16 dimsize;
+	UINT16 new_bp;
 	UINT8 level;
 
 	GET_PCWORD(dimsize);
 	GET_PCBYTE(level);
 	level &= 0x1f;
 
-	/* check stack room size */
-	if (CPU_STAT_PM) {
-		size = dimsize + (level + 1) * 2;
-		if (!CPU_STAT_SS32) {
-			sp = CPU_SP;
-		} else {
-			sp = CPU_ESP;
-		}
-		STACK_PUSH_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), sp, size);
-	}
-
+	CPU_SET_PREV_ESP();
 	PUSH0_16(CPU_BP);
 	if (level == 0) {			/* enter level=0 */
 		CPU_WORKCLOCK(11);
@@ -1342,36 +1464,39 @@ ENTER16_IwIb(void)
 			CPU_WORKCLOCK(12 + level * 4);
 			if (!CPU_STAT_SS32) {
 				bp = CPU_BP;
-				CPU_BP = CPU_SP;
+				new_bp = CPU_SP;
 				while (level--) {
 					bp -= 2;
 					CPU_SP -= 2;
 					val = cpu_vmemoryread_w(CPU_SS_INDEX, bp);
 					cpu_vmemorywrite_w(CPU_SS_INDEX, CPU_SP, (UINT16)val);
 				}
-				REGPUSH0(CPU_BP);
+				REGPUSH0(new_bp);
+				CPU_BP = new_bp;
 				CPU_SP -= dimsize;
 			} else {
 				bp = CPU_EBP;
-				CPU_BP = CPU_SP;
+				new_bp = CPU_SP;
 				while (level--) {
 					bp -= 2;
 					CPU_ESP -= 2;
 					val = cpu_vmemoryread_w(CPU_SS_INDEX, bp);
 					cpu_vmemorywrite_w(CPU_SS_INDEX, CPU_ESP, (UINT16)val);
 				}
-				REGPUSH0_16_32(CPU_BP);
+				REGPUSH0_16_32(new_bp);
+				CPU_BP = new_bp;
 				CPU_ESP -= dimsize;
 			}
 		}
 	}
+	CPU_CLEAR_PREV_ESP();
 }
 
 void
 ENTER32_IwIb(void)
 {
 	UINT32 sp, bp;
-	UINT32 size;
+	UINT32 new_bp;
 	UINT32 val;
 	UINT16 dimsize;
 	UINT8 level;
@@ -1380,17 +1505,7 @@ ENTER32_IwIb(void)
 	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;
-		}
-		STACK_PUSH_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), sp, size);
-	}
-
+	CPU_SET_PREV_ESP();
 	PUSH0_32(CPU_EBP);
 	if (level == 0) {			/* enter level=0 */
 		CPU_WORKCLOCK(11);
@@ -1416,63 +1531,50 @@ ENTER32_IwIb(void)
 			CPU_WORKCLOCK(12 + level * 4);
 			if (CPU_STAT_SS32) {
 				bp = CPU_EBP;
-				CPU_EBP = CPU_ESP;
+				new_bp = CPU_ESP;
 				while (level--) {
 					bp -= 4;
 					CPU_ESP -= 4;
 					val = cpu_vmemoryread_d(CPU_SS_INDEX, bp);
 					cpu_vmemorywrite_d(CPU_SS_INDEX, CPU_ESP, val);
 				}
-				REGPUSH0_32(CPU_EBP);
+				REGPUSH0_32(new_bp);
+				CPU_EBP = new_bp;
 				CPU_ESP -= dimsize;
 			} else {
 				bp = CPU_BP;
-				CPU_EBP = CPU_ESP;
+				new_bp = 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);
+				REGPUSH0_32_16(new_bp);
+				CPU_EBP = new_bp;
 				CPU_SP -= dimsize;
 			}
 		}
 	}
+	CPU_CLEAR_PREV_ESP();
 }
 
 void
 LEAVE(void)
 {
-	UINT32 sp, bp;
-	UINT s;
 
 	CPU_WORKCLOCK(4);
 
-	if (CPU_STAT_PM) {
-		if (!CPU_INST_OP32) {
-			s = 2;
-		} else {
-			s = 4;
-		}
-		if (!CPU_STAT_SS32) {
-			sp = CPU_SP;
-			bp = CPU_BP;
-		} else {
-			sp = CPU_ESP;
-			bp = CPU_EBP;
-		}
-		STACK_POP_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), sp, (bp - sp) + s);
-	}
-
+	CPU_SET_PREV_ESP();
 	if (!CPU_STAT_SS32) {
 		CPU_SP = CPU_BP;
 	} else {
 		CPU_ESP = CPU_EBP;
 	}
 	if (!CPU_INST_OP32) {
-		REGPOP0(CPU_BP);
+		POP0_16(CPU_BP);
 	} else {
 		POP0_32(CPU_EBP);
 	}
+	CPU_CLEAR_PREV_ESP();
 }