--- np2/i386c/ia32/instructions/ctrl_trans.c 2004/02/09 16:12:54 1.9 +++ np2/i386c/ia32/instructions/ctrl_trans.c 2005/03/12 12:33:47 1.20 @@ -1,4 +1,4 @@ -/* $Id: ctrl_trans.c,v 1.9 2004/02/09 16:12:54 monaka Exp $ */ +/* $Id: ctrl_trans.c,v 1.20 2005/03/12 12:33:47 monaka Exp $ */ /* * Copyright (c) 2002-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 @@ -34,6 +32,10 @@ #include "ctrl_trans.h" +#if defined(ENABLE_TRAP) +#include "inttrap.h" +#endif + /* * JMP @@ -41,38 +43,41 @@ void JMP_Jb(void) { - DWORD ip; + UINT32 ip; CPU_WORKCLOCK(7); GET_PCBYTESD(ip); ADD_EIP(ip); + CPU_PREFETCH_CLEAR(); } void JMP_Jw(void) { - DWORD ip; + UINT32 ip; CPU_WORKCLOCK(7); GET_PCWORDS(ip); ADD_EIP(ip); + CPU_PREFETCH_CLEAR(); } void JMP_Jd(void) { - DWORD ip; + UINT32 ip; CPU_WORKCLOCK(7); GET_PCDWORD(ip); ADD_EIP(ip); + CPU_PREFETCH_CLEAR(); } void -JMP_Ew(DWORD op) +JMP_Ew(UINT32 op) { - DWORD madr; - DWORD new_ip; + UINT32 madr; + UINT32 new_ip; if (op >= 0xc0) { CPU_WORKCLOCK(7); @@ -87,10 +92,10 @@ JMP_Ew(DWORD op) } void -JMP_Ed(DWORD op) +JMP_Ed(UINT32 op) { - DWORD madr; - DWORD new_ip; + UINT32 madr; + UINT32 new_ip; if (op >= 0xc0) { CPU_WORKCLOCK(7); @@ -107,8 +112,8 @@ JMP_Ed(DWORD op) void JMP16_Ap(void) { - DWORD new_ip; - WORD new_cs; + UINT32 new_ip; + UINT16 new_cs; CPU_WORKCLOCK(11); GET_PCWORD(new_ip); @@ -126,8 +131,8 @@ JMP16_Ap(void) void JMP32_Ap(void) { - DWORD new_ip; - WORD new_cs; + UINT32 new_ip; + UINT16 new_cs; CPU_WORKCLOCK(11); GET_PCDWORD(new_ip); @@ -143,11 +148,11 @@ JMP32_Ap(void) } void -JMP16_Ep(DWORD op) +JMP16_Ep(UINT32 op) { - DWORD madr; - DWORD new_ip; - WORD new_cs; + UINT32 madr; + UINT32 new_ip; + UINT16 new_cs; CPU_WORKCLOCK(11); if (op < 0xc0) { @@ -168,11 +173,11 @@ JMP16_Ep(DWORD op) } void -JMP32_Ep(DWORD op) +JMP32_Ep(UINT32 op) { - DWORD madr; - DWORD new_ip; - WORD new_cs; + UINT32 madr; + UINT32 new_ip; + UINT16 new_cs; CPU_WORKCLOCK(11); if (op < 0xc0) { @@ -197,7 +202,7 @@ void JO_Jb(void) { - if (!CPU_OV) { + if (CC_NO) { JMPNOP(2, 1); } else { JMPSHORT(7); @@ -208,7 +213,7 @@ void JO_Jw(void) { - if (!CPU_OV) { + if (CC_NO) { JMPNOP(2, 2); } else { JMPNEAR(7); @@ -219,7 +224,7 @@ void JO_Jd(void) { - if (!CPU_OV) { + if (CC_NO) { JMPNOP(2, 4); } else { JMPNEAR_4(7); @@ -231,7 +236,7 @@ void JNO_Jb(void) { - if (CPU_OV) { + if (CC_O) { JMPNOP(2, 1); } else { JMPSHORT(7); @@ -242,7 +247,7 @@ void JNO_Jw(void) { - if (CPU_OV) { + if (CC_O) { JMPNOP(2, 2); } else { JMPNEAR(7); @@ -253,7 +258,7 @@ void JNO_Jd(void) { - if (CPU_OV) { + if (CC_O) { JMPNOP(2, 4); } else { JMPNEAR_4(7); @@ -265,7 +270,7 @@ void JC_Jb(void) { - if (!(CPU_FLAGL & C_FLAG)) { + if (CC_NC) { JMPNOP(2, 1); } else { JMPSHORT(7); @@ -276,7 +281,7 @@ void JC_Jw(void) { - if (!(CPU_FLAGL & C_FLAG)) { + if (CC_NC) { JMPNOP(2, 2); } else { JMPNEAR(7); @@ -287,7 +292,7 @@ void JC_Jd(void) { - if (!(CPU_FLAGL & C_FLAG)) { + if (CC_NC) { JMPNOP(2, 4); } else { JMPNEAR_4(7); @@ -299,7 +304,7 @@ void JNC_Jb(void) { - if (CPU_FLAGL & C_FLAG) { + if (CC_C) { JMPNOP(2, 1); } else { JMPSHORT(7); @@ -309,7 +314,7 @@ void JNC_Jw(void) { - if (CPU_FLAGL & C_FLAG) { + if (CC_C) { JMPNOP(2, 2); } else { JMPNEAR(7); @@ -319,7 +324,7 @@ void JNC_Jd(void) { - if (CPU_FLAGL & C_FLAG) { + if (CC_C) { JMPNOP(2, 4); } else { JMPNEAR_4(7); @@ -331,7 +336,7 @@ void JZ_Jb(void) { - if (!(CPU_FLAGL & Z_FLAG)) { + if (CC_NZ) { JMPNOP(2, 1); } else { JMPSHORT(7); @@ -342,7 +347,7 @@ void JZ_Jw(void) { - if (!(CPU_FLAGL & Z_FLAG)) { + if (CC_NZ) { JMPNOP(2, 2); } else { JMPNEAR(7); @@ -353,7 +358,7 @@ void JZ_Jd(void) { - if (!(CPU_FLAGL & Z_FLAG)) { + if (CC_NZ) { JMPNOP(2, 4); } else { JMPNEAR_4(7); @@ -365,7 +370,7 @@ void JNZ_Jb(void) { - if (CPU_FLAGL & Z_FLAG) { + if (CC_Z) { JMPNOP(2, 1); } else { JMPSHORT(7); @@ -376,7 +381,7 @@ void JNZ_Jw(void) { - if (CPU_FLAGL & Z_FLAG) { + if (CC_Z) { JMPNOP(2, 2); } else { JMPNEAR(7); @@ -387,7 +392,7 @@ void JNZ_Jd(void) { - if (CPU_FLAGL & Z_FLAG) { + if (CC_Z) { JMPNOP(2, 4); } else { JMPNEAR_4(7); @@ -399,7 +404,7 @@ void JNA_Jb(void) { - if (!(CPU_FLAGL & (Z_FLAG | C_FLAG))) { + if (CC_A) { JMPNOP(2, 1); } else { JMPSHORT(7); @@ -410,7 +415,7 @@ void JNA_Jw(void) { - if (!(CPU_FLAGL & (Z_FLAG | C_FLAG))) { + if (CC_A) { JMPNOP(2, 2); } else { JMPNEAR(7); @@ -421,7 +426,7 @@ void JNA_Jd(void) { - if (!(CPU_FLAGL & (Z_FLAG | C_FLAG))) { + if (CC_A) { JMPNOP(2, 4); } else { JMPNEAR_4(7); @@ -433,7 +438,7 @@ void JA_Jb(void) { - if (CPU_FLAGL & (Z_FLAG | C_FLAG)) { + if (CC_NA) { JMPNOP(2, 1); } else { JMPSHORT(7); @@ -444,7 +449,7 @@ void JA_Jw(void) { - if (CPU_FLAGL & (Z_FLAG | C_FLAG)) { + if (CC_NA) { JMPNOP(2, 2); } else { JMPNEAR(7); @@ -455,7 +460,7 @@ void JA_Jd(void) { - if (CPU_FLAGL & (Z_FLAG | C_FLAG)) { + if (CC_NA) { JMPNOP(2, 4); } else { JMPNEAR_4(7); @@ -467,7 +472,7 @@ void JS_Jb(void) { - if (!(CPU_FLAGL & S_FLAG)) { + if (CC_NS) { JMPNOP(2, 1); } else { JMPSHORT(7); @@ -478,7 +483,7 @@ void JS_Jw(void) { - if (!(CPU_FLAGL & S_FLAG)) { + if (CC_NS) { JMPNOP(2, 2); } else { JMPNEAR(7); @@ -489,7 +494,7 @@ void JS_Jd(void) { - if (!(CPU_FLAGL & S_FLAG)) { + if (CC_NS) { JMPNOP(2, 4); } else { JMPNEAR_4(7); @@ -501,7 +506,7 @@ void JNS_Jb(void) { - if (CPU_FLAGL & S_FLAG) { + if (CC_S) { JMPNOP(2, 1); } else { JMPSHORT(7); @@ -512,7 +517,7 @@ void JNS_Jw(void) { - if (CPU_FLAGL & S_FLAG) { + if (CC_S) { JMPNOP(2, 2); } else { JMPNEAR(7); @@ -523,7 +528,7 @@ void JNS_Jd(void) { - if (CPU_FLAGL & S_FLAG) { + if (CC_S) { JMPNOP(2, 4); } else { JMPNEAR_4(7); @@ -535,7 +540,7 @@ void JP_Jb(void) { - if (!(CPU_FLAGL & P_FLAG)) { + if (CC_NP) { JMPNOP(2, 1); } else { JMPSHORT(7); @@ -546,7 +551,7 @@ void JP_Jw(void) { - if (!(CPU_FLAGL & P_FLAG)) { + if (CC_NP) { JMPNOP(2, 2); } else { JMPNEAR(7); @@ -557,7 +562,7 @@ void JP_Jd(void) { - if (!(CPU_FLAGL & P_FLAG)) { + if (CC_NP) { JMPNOP(2, 4); } else { JMPNEAR_4(7); @@ -569,7 +574,7 @@ void JNP_Jb(void) { - if (CPU_FLAGL & P_FLAG) { + if (CC_P) { JMPNOP(2, 1); } else { JMPSHORT(7); @@ -580,7 +585,7 @@ void JNP_Jw(void) { - if (CPU_FLAGL & P_FLAG) { + if (CC_P) { JMPNOP(2, 2); } else { JMPNEAR(7); @@ -591,7 +596,7 @@ void JNP_Jd(void) { - if (CPU_FLAGL & P_FLAG) { + if (CC_P) { JMPNOP(2, 4); } else { JMPNEAR_4(7); @@ -603,7 +608,7 @@ void JL_Jb(void) { - if ((!(CPU_FLAGL & S_FLAG)) == (!CPU_OV)) { + if (CC_NL) { JMPNOP(2, 1); } else { JMPSHORT(7); @@ -614,7 +619,7 @@ void JL_Jw(void) { - if ((!(CPU_FLAGL & S_FLAG)) == (!CPU_OV)) { + if (CC_NL) { JMPNOP(2, 2); } else { JMPNEAR(7); @@ -625,7 +630,7 @@ void JL_Jd(void) { - if ((!(CPU_FLAGL & S_FLAG)) == (!CPU_OV)) { + if (CC_NL) { JMPNOP(2, 4); } else { JMPNEAR_4(7); @@ -637,7 +642,7 @@ void JNL_Jb(void) { - if ((!(CPU_FLAGL & S_FLAG)) != (!CPU_OV)) { + if (CC_L) { JMPNOP(2, 1); } else { JMPSHORT(7); @@ -648,7 +653,7 @@ void JNL_Jw(void) { - if ((!(CPU_FLAGL & S_FLAG)) != (!CPU_OV)) { + if (CC_L) { JMPNOP(2, 2); } else { JMPNEAR(7); @@ -659,7 +664,7 @@ void JNL_Jd(void) { - if ((!(CPU_FLAGL & S_FLAG)) != (!CPU_OV)) { + if (CC_L) { JMPNOP(2, 4); } else { JMPNEAR_4(7); @@ -671,7 +676,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); @@ -682,7 +687,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); @@ -693,7 +698,7 @@ 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); @@ -705,7 +710,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); @@ -716,7 +721,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); @@ -727,7 +732,7 @@ 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); @@ -829,30 +834,32 @@ LOOP_Jb(void) void CALL_Aw(void) { - DWORD ip; + SINT32 ip; CPU_WORKCLOCK(7); GET_PCWORDS(ip); PUSH0_16(CPU_IP); ADD_EIP(ip); + CPU_PREFETCH_CLEAR(); } void CALL_Ad(void) { - DWORD ip; + UINT32 ip; CPU_WORKCLOCK(7); GET_PCDWORD(ip); PUSH0_32(CPU_EIP); ADD_EIP(ip); + CPU_PREFETCH_CLEAR(); } void -CALL_Ew(DWORD op) +CALL_Ew(UINT32 op) { - DWORD madr; - DWORD new_ip; + UINT32 madr; + UINT32 new_ip; if (op >= 0xc0) { CPU_WORKCLOCK(7); @@ -867,10 +874,10 @@ CALL_Ew(DWORD op) } void -CALL_Ed(DWORD op) +CALL_Ed(UINT32 op) { - DWORD madr; - DWORD new_ip; + UINT32 madr; + UINT32 new_ip; if (op >= 0xc0) { CPU_WORKCLOCK(7); @@ -887,8 +894,8 @@ CALL_Ed(DWORD op) void CALL16_Ap(void) { - DWORD new_ip; - WORD new_cs; + UINT32 new_ip; + UINT16 new_cs; CPU_WORKCLOCK(13); GET_PCWORD(new_ip); @@ -909,8 +916,8 @@ CALL16_Ap(void) void CALL32_Ap(void) { - DWORD new_ip; - WORD new_cs; + UINT32 new_ip; + UINT16 new_cs; CPU_WORKCLOCK(13); GET_PCDWORD(new_ip); @@ -929,11 +936,11 @@ CALL32_Ap(void) } void -CALL16_Ep(DWORD op) +CALL16_Ep(UINT32 op) { - DWORD ad; - DWORD new_ip; - WORD new_cs; + UINT32 ad; + UINT32 new_ip; + UINT16 new_cs; CPU_WORKCLOCK(16); if (op < 0xc0) { @@ -957,11 +964,11 @@ CALL16_Ep(DWORD op) } void -CALL32_Ep(DWORD op) +CALL32_Ep(UINT32 op) { - DWORD ad; - DWORD new_ip; - WORD new_cs; + UINT32 ad; + UINT32 new_ip; + UINT16 new_cs; CPU_WORKCLOCK(16); if (op < 0xc0) { @@ -990,7 +997,7 @@ CALL32_Ep(DWORD op) void RETnear16(void) { - DWORD new_ip; + UINT32 new_ip; CPU_WORKCLOCK(11); POP0_16(new_ip); @@ -1000,7 +1007,7 @@ RETnear16(void) void RETnear32(void) { - DWORD new_ip; + UINT32 new_ip; CPU_WORKCLOCK(11); POP0_32(new_ip); @@ -1010,42 +1017,42 @@ RETnear32(void) void RETnear16_Iw(void) { - DWORD new_ip; - WORD ad; + UINT32 new_ip; + UINT16 size; CPU_WORKCLOCK(11); - GET_PCWORD(ad); + GET_PCWORD(size); POP0_16(new_ip); SET_EIP(new_ip); if (!CPU_STAT_SS32) { - CPU_SP += ad; + CPU_SP += size; } else { - CPU_ESP += ad; + CPU_ESP += size; } } void RETnear32_Iw(void) { - DWORD new_ip; - DWORD ad; + UINT32 new_ip; + UINT16 size; CPU_WORKCLOCK(11); - GET_PCWORD(ad); + GET_PCWORD(size); POP0_32(new_ip); SET_EIP(new_ip); - if (CPU_STAT_SS32) { - CPU_ESP += ad; + if (!CPU_STAT_SS32) { + CPU_SP += size; } else { - CPU_SP += ad; + CPU_ESP += size; } } void RETfar16(void) { - DWORD new_ip; - WORD new_cs; + UINT32 new_ip; + UINT16 new_cs; CPU_WORKCLOCK(15); if (!CPU_STAT_PM || CPU_STAT_VM86) { @@ -1064,8 +1071,8 @@ RETfar16(void) void RETfar32(void) { - DWORD new_ip; - WORD new_cs; + UINT32 new_ip; + UINT32 new_cs; CPU_WORKCLOCK(15); if (!CPU_STAT_PM || CPU_STAT_VM86) { @@ -1073,7 +1080,7 @@ RETfar32(void) POP0_32(new_ip); POP0_32(new_cs); - CPU_SET_SEGREG(CPU_CS_INDEX, new_cs); + CPU_SET_SEGREG(CPU_CS_INDEX, (UINT16)new_cs); SET_EIP(new_ip); } else { /* Protected mode */ @@ -1084,12 +1091,12 @@ RETfar32(void) void RETfar16_Iw(void) { - DWORD ad; - DWORD new_ip; - WORD new_cs; + UINT32 new_ip; + UINT16 new_cs; + UINT16 size; CPU_WORKCLOCK(15); - GET_PCWORD(ad); + GET_PCWORD(size); if (!CPU_STAT_PM || CPU_STAT_VM86) { /* Real mode or VM86 mode */ POP0_16(new_ip); @@ -1099,55 +1106,72 @@ RETfar16_Iw(void) SET_EIP(new_ip); if (!CPU_STAT_SS32) { - CPU_SP += ad; + CPU_SP += size; } else { - CPU_ESP += ad; + CPU_ESP += size; } } else { /* Protected mode */ - RETfar_pm(ad); + RETfar_pm(size); } } void RETfar32_Iw(void) { - DWORD ad; - DWORD new_ip; - WORD new_cs; + UINT32 new_ip; + UINT32 new_cs; + UINT16 size; CPU_WORKCLOCK(15); - GET_PCWORD(ad); + GET_PCWORD(size); if (!CPU_STAT_PM || CPU_STAT_VM86) { /* Real mode or VM86 mode */ POP0_32(new_ip); POP0_32(new_cs); - CPU_SET_SEGREG(CPU_CS_INDEX, new_cs); + CPU_SET_SEGREG(CPU_CS_INDEX, (UINT16)new_cs); SET_EIP(new_ip); - if (CPU_STAT_SS32) { - CPU_ESP += ad; + if (!CPU_STAT_SS32) { + CPU_SP += size; } else { - CPU_SP += ad; + CPU_ESP += size; } } else { /* Protected mode */ - RETfar_pm(ad); + RETfar_pm(size); } } void IRET(void) { - DWORD new_ip; - DWORD new_flags; - DWORD mask; - WORD new_cs; + UINT32 new_ip; + UINT32 new_flags; + UINT32 new_cs; +#if !defined(IA32_DONT_USE_SET_EFLAGS_FUNCTION) + UINT32 mask; +#endif - CPU_WORKCLOCK(31); 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 mask = I_FLAG|IOPL_FLAG; if (!CPU_INST_OP32) { POP0_16(new_ip); @@ -1159,14 +1183,21 @@ IRET(void) POP0_32(new_flags); mask |= RF_FLAG; } + set_eflags(new_flags, mask); +#endif - CPU_SET_SEGREG(CPU_CS_INDEX, new_cs); + CPU_SET_SEGREG(CPU_CS_INDEX, (UINT16)new_cs); SET_EIP(new_ip); } 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(); } @@ -1177,7 +1208,7 @@ void INT1(void) { - CPU_WORKCLOCK(23); + CPU_WORKCLOCK(33); INTERRUPT(1, 1, 0, 0); } @@ -1185,7 +1216,7 @@ void INT3(void) { - CPU_WORKCLOCK(23); + CPU_WORKCLOCK(33); INTERRUPT(3, 2, 0, 0); } @@ -1194,21 +1225,24 @@ INTO(void) { if (!CPU_OV) { - CPU_WORKCLOCK(4); + CPU_WORKCLOCK(3); return; } - CPU_WORKCLOCK(24); + CPU_WORKCLOCK(35); INTERRUPT(4, 3, 0, 0); } void INT_Ib(void) { - BYTE vect; + UINT8 vect; - CPU_WORKCLOCK(23); + CPU_WORKCLOCK(37); if (!CPU_STAT_PM || !CPU_STAT_VM86 || (CPU_STAT_IOPL == CPU_IOPL3)) { GET_PCBYTE(vect); +#if defined(ENABLE_TRAP) + softinttrap(CPU_CS, CPU_EIP - 2, vect); +#endif INTERRUPT(vect, -1, 0, 0); return; } @@ -1218,8 +1252,8 @@ INT_Ib(void) void BOUND_GwMa(void) { - DWORD op, madr; - WORD reg; + UINT32 op, madr; + UINT16 reg; int vect; CPU_WORKCLOCK(13); @@ -1241,8 +1275,8 @@ BOUND_GwMa(void) void BOUND_GdMa(void) { - DWORD op, madr; - DWORD reg; + UINT32 op, madr; + UINT32 reg; int vect; CPU_WORKCLOCK(13); @@ -1267,11 +1301,11 @@ BOUND_GdMa(void) void ENTER16_IwIb(void) { - DWORD sp, bp; - DWORD size; - DWORD val; - WORD dimsize; - BYTE level; + UINT32 sp, bp; + UINT32 size; + UINT32 val; + UINT16 dimsize; + UINT8 level; GET_PCWORD(dimsize); GET_PCBYTE(level); @@ -1285,7 +1319,7 @@ ENTER16_IwIb(void) } else { sp = CPU_ESP; } - CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), sp, size); + STACK_PUSH_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), sp, size); } PUSH0_16(CPU_BP); @@ -1303,7 +1337,7 @@ ENTER16_IwIb(void) CPU_WORKCLOCK(15); sp = CPU_SP; PUSH0_16(sp); - CPU_BP = sp; + CPU_BP = (UINT16)sp; if (!CPU_STAT_SS32) { CPU_SP -= dimsize; } else { @@ -1318,7 +1352,7 @@ ENTER16_IwIb(void) bp -= 2; CPU_SP -= 2; val = cpu_vmemoryread_w(CPU_SS_INDEX, bp); - cpu_vmemorywrite_w(CPU_SS_INDEX, CPU_SP, val); + cpu_vmemorywrite_w(CPU_SS_INDEX, CPU_SP, (UINT16)val); } REGPUSH0(CPU_BP); CPU_SP -= dimsize; @@ -1329,7 +1363,7 @@ ENTER16_IwIb(void) bp -= 2; CPU_ESP -= 2; val = cpu_vmemoryread_w(CPU_SS_INDEX, bp); - cpu_vmemorywrite_w(CPU_SS_INDEX, CPU_ESP, val); + cpu_vmemorywrite_w(CPU_SS_INDEX, CPU_ESP, (UINT16)val); } REGPUSH0_16_32(CPU_BP); CPU_ESP -= dimsize; @@ -1341,11 +1375,11 @@ ENTER16_IwIb(void) void ENTER32_IwIb(void) { - DWORD sp, bp; - DWORD size; - DWORD val; - WORD dimsize; - BYTE level; + UINT32 sp, bp; + UINT32 size; + UINT32 val; + UINT16 dimsize; + UINT8 level; GET_PCWORD(dimsize); GET_PCBYTE(level); @@ -1359,7 +1393,7 @@ ENTER32_IwIb(void) } else { sp = CPU_SP; } - CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), sp, size); + STACK_PUSH_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), sp, size); } PUSH0_32(CPU_EBP); @@ -1392,7 +1426,7 @@ ENTER32_IwIb(void) bp -= 4; CPU_ESP -= 4; val = cpu_vmemoryread_d(CPU_SS_INDEX, bp); - cpu_vmemorywrite(CPU_SS_INDEX, CPU_ESP, val); + cpu_vmemorywrite_d(CPU_SS_INDEX, CPU_ESP, val); } REGPUSH0_32(CPU_EBP); CPU_ESP -= dimsize; @@ -1413,51 +1447,37 @@ ENTER32_IwIb(void) } void -LEAVE16(void) +LEAVE(void) { - DWORD sp, size; + UINT32 sp, bp; + UINT s; - CPU_WORKCLOCK(5); + CPU_WORKCLOCK(4); if (CPU_STAT_PM) { + if (!CPU_INST_OP32) { + s = 2; + } else { + s = 4; + } if (!CPU_STAT_SS32) { sp = CPU_SP; - size = 2; + bp = CPU_BP; } else { sp = CPU_ESP; - size = 4; - } - if (CPU_BP < CPU_SP) { - ia32_panic("LEAVE16: BP(%04x) < SP(%04x)", CPU_BP, CPU_SP); + bp = CPU_EBP; } - CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), sp, (CPU_BP - CPU_SP) + size); + STACK_POP_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), sp, (bp - sp) + s); } - CPU_SP = CPU_BP; - REGPOP0(CPU_BP); -} - -void -LEAVE32(void) -{ - DWORD sp, size; - - CPU_WORKCLOCK(5); - - if (CPU_STAT_PM) { - if (CPU_STAT_SS32) { - sp = CPU_ESP; - size = 4; - } else { - sp = CPU_SP; - size = 2; - } - if (CPU_EBP < CPU_ESP) { - ia32_panic("LEAVE32: EBP(%08x) < ESP(%08x)", CPU_EBP, CPU_ESP); - } - CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), sp, (CPU_EBP - CPU_ESP) + size); + if (!CPU_STAT_SS32) { + CPU_SP = CPU_BP; + } else { + CPU_ESP = CPU_EBP; + } + if (!CPU_INST_OP32) { + REGPOP0(CPU_BP); + } else { + POP0_32(CPU_EBP); } - - CPU_ESP = CPU_EBP; - POP0_32(CPU_EBP); }