--- np2/i386c/ia32/instructions/ctrl_trans.c	2011/12/20 01:17:30	1.26
+++ np2/i386c/ia32/instructions/ctrl_trans.c	2012/01/31 14:30:16	1.29
@@ -59,7 +59,7 @@ JMP_Jd(void)
 	JMPNEAR32(7);
 }
 
-void
+void CPUCALL
 JMP_Ew(UINT32 op)
 {
 	UINT32 madr;
@@ -79,7 +79,7 @@ JMP_Ew(UINT32 op)
 	CPU_EIP = new_ip;
 }
 
-void
+void CPUCALL
 JMP_Ed(UINT32 op)
 {
 	UINT32 madr;
@@ -151,7 +151,7 @@ JMP32_Ap(void)
 	}
 }
 
-void
+void CPUCALL
 JMP16_Ep(UINT32 op)
 {
 	descriptor_t sd;
@@ -183,7 +183,7 @@ JMP16_Ep(UINT32 op)
 	EXCEPTION(UD_EXCEPTION, 0);
 }
 
-void
+void CPUCALL
 JMP32_Ep(UINT32 op)
 {
 	descriptor_t sd;
@@ -894,7 +894,7 @@ CALL_Ad(void)
 	CPU_CLEAR_PREV_ESP();
 }
 
-void
+void CPUCALL
 CALL_Ew(UINT32 op)
 {
 	UINT32 madr;
@@ -917,7 +917,7 @@ CALL_Ew(UINT32 op)
 	CPU_CLEAR_PREV_ESP();
 }
 
-void
+void CPUCALL
 CALL_Ed(UINT32 op)
 {
 	UINT32 madr;
@@ -1004,7 +1004,7 @@ CALL32_Ap(void)
 	}
 }
 
-void
+void CPUCALL
 CALL16_Ep(UINT32 op)
 {
 	descriptor_t sd;
@@ -1042,7 +1042,7 @@ CALL16_Ep(UINT32 op)
 	EXCEPTION(UD_EXCEPTION, 0);
 }
 
-void
+void CPUCALL
 CALL32_Ep(UINT32 op)
 {
 	descriptor_t sd;
@@ -1332,11 +1332,6 @@ IRET(void)
 		/* 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();
 }
 
@@ -1587,26 +1582,17 @@ ENTER32_IwIb(void)
 void
 LEAVE(void)
 {
-	UINT s;
 
 	CPU_WORKCLOCK(4);
 
 	CPU_SET_PREV_ESP();
-	/* check stack room size */
-	if (!CPU_INST_OP32) {
-		s = 2;
-	} else {
-		s = 4;
-	}
 	if (!CPU_STAT_SS32) {
-		SS_POP_CHECK(CPU_SP, (CPU_BP - CPU_SP) + s);
 		CPU_SP = CPU_BP;
 	} else {
-		SS_POP_CHECK(CPU_ESP, (CPU_EBP - CPU_ESP) + s);
 		CPU_ESP = CPU_EBP;
 	}
 	if (!CPU_INST_OP32) {
-		REGPOP0(CPU_BP);
+		POP0_16(CPU_BP);
 	} else {
 		POP0_32(CPU_EBP);
 	}