--- np2/i386c/ia32/instructions/data_trans.c 2004/02/20 16:09:05 1.8 +++ np2/i386c/ia32/instructions/data_trans.c 2012/01/08 19:09:40 1.23 @@ -1,5 +1,3 @@ -/* $Id: data_trans.c,v 1.8 2004/02/20 16:09:05 monaka Exp $ */ - /* * Copyright (c) 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 @@ -138,6 +134,29 @@ MOV_EwSw(void) } void +MOV_EdSw(void) +{ + UINT32 op, src, madr; + UINT8 idx; + + GET_PCBYTE(op); + idx = (UINT8)((op >> 3) & 7); + if (idx < CPU_SEGREG_NUM) { + src = CPU_REGS_SREG(idx); + if (op >= 0xc0) { + CPU_WORKCLOCK(2); + *(reg32_b20[op]) = src; + } else { + CPU_WORKCLOCK(3); + madr = calc_ea_dst(op); + cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)src); + } + return; + } + EXCEPTION(UD_EXCEPTION, 0); +} + +void MOV_SwEw(void) { UINT32 op, src, madr; @@ -154,7 +173,7 @@ MOV_SwEw(void) madr = calc_ea_dst(op); src = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr); } - CPU_SET_SEGREG(idx, (UINT16)src); + LOAD_SEGREG(idx, (UINT16)src); if (idx == CPU_SS_INDEX) { exec_1step(); } @@ -172,11 +191,10 @@ MOV_ALOb(void) CPU_INST_SEGREG_INDEX = DS_FIX; if (!CPU_INST_AS32) { GET_PCWORD(madr); - CPU_AL = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr); } else { GET_PCDWORD(madr); - CPU_AL = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr); } + CPU_AL = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr); } void @@ -188,11 +206,10 @@ MOV_AXOw(void) CPU_INST_SEGREG_INDEX = DS_FIX; if (!CPU_INST_AS32) { GET_PCWORD(madr); - CPU_AX = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr); } else { GET_PCDWORD(madr); - CPU_AX = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr); } + CPU_AX = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr); } void @@ -204,11 +221,10 @@ MOV_EAXOd(void) CPU_INST_SEGREG_INDEX = DS_FIX; if (!CPU_INST_AS32) { GET_PCWORD(madr); - CPU_EAX = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr); } else { GET_PCDWORD(madr); - CPU_EAX = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr); } + CPU_EAX = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr); } void @@ -220,11 +236,10 @@ MOV_ObAL(void) CPU_INST_SEGREG_INDEX = DS_FIX; if (!CPU_INST_AS32) { GET_PCWORD(madr); - cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, CPU_AL); } else { GET_PCDWORD(madr); - cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, CPU_AL); } + cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, CPU_AL); } void @@ -236,11 +251,10 @@ MOV_OwAX(void) CPU_INST_SEGREG_INDEX = DS_FIX; if (!CPU_INST_AS32) { GET_PCWORD(madr); - cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, CPU_AX); } else { GET_PCDWORD(madr); - cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, CPU_AX); } + cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, CPU_AX); } void @@ -252,11 +266,10 @@ MOV_OdEAX(void) CPU_INST_SEGREG_INDEX = DS_FIX; if (!CPU_INST_AS32) { GET_PCWORD(madr); - cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, CPU_EAX); } else { GET_PCDWORD(madr); - cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, CPU_EAX); } + cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, CPU_EAX); } void @@ -350,7 +363,7 @@ CMOVO_GwEw(void) UINT32 op, src; PREPART_REG16_EA(op, src, out, 2, 5); - if (CPU_OV) { + if (CC_O) { *out = (UINT16)src; } } @@ -362,7 +375,7 @@ CMOVO_GdEd(void) UINT32 op, src; PREPART_REG32_EA(op, src, out, 2, 5); - if (CPU_OV) { + if (CC_O) { *out = src; } } @@ -374,7 +387,7 @@ CMOVNO_GwEw(void) UINT32 op, src; PREPART_REG16_EA(op, src, out, 2, 5); - if (!CPU_OV) { + if (CC_NO) { *out = (UINT16)src; } } @@ -386,7 +399,7 @@ CMOVNO_GdEd(void) UINT32 op, src; PREPART_REG32_EA(op, src, out, 2, 5); - if (!CPU_OV) { + if (CC_NO) { *out = src; } } @@ -398,7 +411,7 @@ CMOVC_GwEw(void) UINT32 op, src; PREPART_REG16_EA(op, src, out, 2, 5); - if (CPU_FLAGL & C_FLAG) { + if (CC_C) { *out = (UINT16)src; } } @@ -410,7 +423,7 @@ CMOVC_GdEd(void) UINT32 op, src; PREPART_REG32_EA(op, src, out, 2, 5); - if (CPU_FLAGL & C_FLAG) { + if (CC_C) { *out = src; } } @@ -422,7 +435,7 @@ CMOVNC_GwEw(void) UINT32 op, src; PREPART_REG16_EA(op, src, out, 2, 5); - if (!(CPU_FLAGL & C_FLAG)) { + if (CC_NC) { *out = (UINT16)src; } } @@ -434,7 +447,7 @@ CMOVNC_GdEd(void) UINT32 op, src; PREPART_REG32_EA(op, src, out, 2, 5); - if (!(CPU_FLAGL & C_FLAG)) { + if (CC_NC) { *out = src; } } @@ -446,7 +459,7 @@ CMOVZ_GwEw(void) UINT32 op, src; PREPART_REG16_EA(op, src, out, 2, 5); - if (CPU_FLAGL & Z_FLAG) { + if (CC_Z) { *out = (UINT16)src; } } @@ -458,7 +471,7 @@ CMOVZ_GdEd(void) UINT32 op, src; PREPART_REG32_EA(op, src, out, 2, 5); - if (CPU_FLAGL & Z_FLAG) { + if (CC_Z) { *out = src; } } @@ -470,7 +483,7 @@ CMOVNZ_GwEw(void) UINT32 op, src; PREPART_REG16_EA(op, src, out, 2, 5); - if (!(CPU_FLAGL & Z_FLAG)) { + if (CC_NZ) { *out = (UINT16)src; } } @@ -482,7 +495,7 @@ CMOVNZ_GdEd(void) UINT32 op, src; PREPART_REG32_EA(op, src, out, 2, 5); - if (!(CPU_FLAGL & Z_FLAG)) { + if (CC_NZ) { *out = src; } } @@ -494,7 +507,7 @@ CMOVA_GwEw(void) UINT32 op, src; PREPART_REG16_EA(op, src, out, 2, 5); - if (!(CPU_FLAGL & (Z_FLAG | C_FLAG))) { + if (CC_A) { *out = (UINT16)src; } } @@ -506,7 +519,7 @@ CMOVA_GdEd(void) UINT32 op, src; PREPART_REG32_EA(op, src, out, 2, 5); - if (!(CPU_FLAGL & (Z_FLAG | C_FLAG))) { + if (CC_A) { *out = src; } } @@ -518,7 +531,7 @@ CMOVNA_GwEw(void) UINT32 op, src; PREPART_REG16_EA(op, src, out, 2, 5); - if (CPU_FLAGL & (Z_FLAG | C_FLAG)) { + if (CC_NA) { *out = (UINT16)src; } } @@ -530,7 +543,7 @@ CMOVNA_GdEd(void) UINT32 op, src; PREPART_REG32_EA(op, src, out, 2, 5); - if (CPU_FLAGL & (Z_FLAG | C_FLAG)) { + if (CC_NA) { *out = src; } } @@ -542,7 +555,7 @@ CMOVS_GwEw(void) UINT32 op, src; PREPART_REG16_EA(op, src, out, 2, 5); - if (CPU_FLAGL & S_FLAG) { + if (CC_S) { *out = (UINT16)src; } } @@ -554,7 +567,7 @@ CMOVS_GdEd(void) UINT32 op, src; PREPART_REG32_EA(op, src, out, 2, 5); - if (CPU_FLAGL & S_FLAG) { + if (CC_S) { *out = src; } } @@ -566,7 +579,7 @@ CMOVNS_GwEw(void) UINT32 op, src; PREPART_REG16_EA(op, src, out, 2, 5); - if (!(CPU_FLAGL & S_FLAG)) { + if (CC_NS) { *out = (UINT16)src; } } @@ -578,7 +591,7 @@ CMOVNS_GdEd(void) UINT32 op, src; PREPART_REG32_EA(op, src, out, 2, 5); - if (!(CPU_FLAGL & S_FLAG)) { + if (CC_NS) { *out = src; } } @@ -590,7 +603,7 @@ CMOVP_GwEw(void) UINT32 op, src; PREPART_REG16_EA(op, src, out, 2, 5); - if (CPU_FLAGL & P_FLAG) { + if (CC_P) { *out = (UINT16)src; } } @@ -602,7 +615,7 @@ CMOVP_GdEd(void) UINT32 op, src; PREPART_REG32_EA(op, src, out, 2, 5); - if (CPU_FLAGL & P_FLAG) { + if (CC_P) { *out = src; } } @@ -614,7 +627,7 @@ CMOVNP_GwEw(void) UINT32 op, src; PREPART_REG16_EA(op, src, out, 2, 5); - if (!(CPU_FLAGL & P_FLAG)) { + if (CC_NP) { *out = (UINT16)src; } } @@ -626,7 +639,7 @@ CMOVNP_GdEd(void) UINT32 op, src; PREPART_REG32_EA(op, src, out, 2, 5); - if (!(CPU_FLAGL & P_FLAG)) { + if (CC_NP) { *out = src; } } @@ -638,7 +651,7 @@ CMOVL_GwEw(void) UINT32 op, src; PREPART_REG16_EA(op, src, out, 2, 5); - if ((!CPU_OV) != (!(CPU_FLAGL & S_FLAG))) { + if (CC_L) { *out = (UINT16)src; } } @@ -650,7 +663,7 @@ CMOVL_GdEd(void) UINT32 op, src; PREPART_REG32_EA(op, src, out, 2, 5); - if ((!CPU_OV) != (!(CPU_FLAGL & S_FLAG))) { + if (CC_L) { *out = src; } } @@ -662,7 +675,7 @@ CMOVNL_GwEw(void) UINT32 op, src; PREPART_REG16_EA(op, src, out, 2, 5); - if ((!CPU_OV) == (!(CPU_FLAGL & S_FLAG))) { + if (CC_NL) { *out = (UINT16)src; } } @@ -674,7 +687,7 @@ CMOVNL_GdEd(void) UINT32 op, src; PREPART_REG32_EA(op, src, out, 2, 5); - if ((!CPU_OV) == (!(CPU_FLAGL & S_FLAG))) { + if (CC_NL) { *out = src; } } @@ -686,7 +699,7 @@ CMOVLE_GwEw(void) UINT32 op, src; PREPART_REG16_EA(op, src, out, 2, 5); - if ((CPU_FLAGL & Z_FLAG) || ((!(CPU_FLAGL & S_FLAG)) != (!CPU_OV))) { + if (CC_LE) { *out = (UINT16)src; } } @@ -698,7 +711,7 @@ CMOVLE_GdEd(void) UINT32 op, src; PREPART_REG32_EA(op, src, out, 2, 5); - if ((CPU_FLAGL & Z_FLAG) || ((!(CPU_FLAGL & S_FLAG)) != (!CPU_OV))) { + if (CC_LE) { *out = src; } } @@ -710,7 +723,7 @@ CMOVNLE_GwEw(void) UINT32 op, src; PREPART_REG16_EA(op, src, out, 2, 5); - if ((!(CPU_FLAGL & Z_FLAG)) && ((!(CPU_FLAGL & S_FLAG)) == (!CPU_OV))) { + if (CC_NLE) { *out = (UINT16)src; } } @@ -722,7 +735,7 @@ CMOVNLE_GdEd(void) UINT32 op, src; PREPART_REG32_EA(op, src, out, 2, 5); - if ((!(CPU_FLAGL & Z_FLAG)) && ((!(CPU_FLAGL & S_FLAG)) == (!CPU_OV))) { + if (CC_NLE) { *out = src; } } @@ -730,12 +743,19 @@ CMOVNLE_GdEd(void) /* * XCHG */ +static UINT32 CPUCALL +XCHG(UINT32 dst, void *arg) +{ + UINT32 src = PTR_TO_UINT32(arg); + (void)dst; + return src; +} + void XCHG_EbGb(void) { UINT8 *out, *src; UINT32 op, madr; - UINT8 tmp; PREPART_EA_REG8P(op, src); if (op >= 0xc0) { @@ -745,9 +765,7 @@ XCHG_EbGb(void) } else { CPU_WORKCLOCK(5); madr = calc_ea_dst(op); - tmp = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr); - cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, *src); - *src = tmp; + *src = (UINT8)cpu_vmemory_RMW_b(CPU_INST_SEGREG_INDEX, madr, XCHG, UINT32_TO_PTR(*src)); } } @@ -756,7 +774,6 @@ XCHG_EwGw(void) { UINT16 *out, *src; UINT32 op, madr; - UINT16 tmp; PREPART_EA_REG16P(op, src); if (op >= 0xc0) { @@ -766,9 +783,7 @@ XCHG_EwGw(void) } else { CPU_WORKCLOCK(5); madr = calc_ea_dst(op); - tmp = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr); - cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, *src); - *src = tmp; + *src = (UINT16)cpu_vmemory_RMW_w(CPU_INST_SEGREG_INDEX, madr, XCHG, UINT32_TO_PTR(*src)); } } @@ -777,7 +792,6 @@ XCHG_EdGd(void) { UINT32 *out, *src; UINT32 op, madr; - UINT32 tmp; PREPART_EA_REG32P(op, src); if (op >= 0xc0) { @@ -787,9 +801,7 @@ XCHG_EdGd(void) } else { CPU_WORKCLOCK(5); madr = calc_ea_dst(op); - tmp = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr); - cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, *src); - *src = tmp; + *src = cpu_vmemory_RMW_d(CPU_INST_SEGREG_INDEX, madr, XCHG, UINT32_TO_PTR(*src)); } } @@ -814,33 +826,16 @@ void XCHG_EDIEAX(void) { CPU_WORKCLOCK(3 /* * BSWAP */ -#if defined(bswap32) && !defined(IA32_USE_ASM_BSWAP) -#define BSWAP_DWORD(v) bswap32(v) -#else /* !bswap32 || IA32_USE_ASM_BSWAP */ -INLINE static UINT32 +static INLINE UINT32 CPUCALL BSWAP_DWORD(UINT32 val) { -#if defined(__GNUC__) && (defined(i386) || defined(__i386__)) - __asm__ __volatile__ ( -#if defined(IA32_USE_ASM_BSWAP) - "bswap %0" -#else /* !IA32_USE_ASM_BSWAP */ - "rorw $8, %w1\n\t" - "rorl $16, %1\n\t" - "rorw $8, %w1\n\t" -#endif /* IA32_USE_ASM_BSWAP */ - : "=r" (val) : "0" (val)); - return val; -#else /* !(__GNUC__ && (i386 || __i386__)) */ UINT32 v; v = (val & 0x000000ff) << 24; v |= (val & 0x0000ff00) << 8; v |= (val & 0x00ff0000) >> 8; v |= (val & 0xff000000) >> 24; return v; -#endif /* __GNUC__ && (i386 || __i386__) */ } -#endif /* bswap32 && !IA32_USE_ASM_BSWAP */ void BSWAP_EAX(void) { CPU_WORKCLOCK(2); CPU_EAX = BSWAP_DWORD(CPU_EAX); } void BSWAP_ECX(void) { CPU_WORKCLOCK(2); CPU_ECX = BSWAP_DWORD(CPU_ECX); } @@ -854,6 +849,33 @@ void BSWAP_EDI(void) { CPU_WORKCLOCK(2); /* * XADD */ +static UINT32 CPUCALL +XADD1(UINT32 dst, void *arg) +{ + UINT32 src = PTR_TO_UINT32(arg); + UINT32 res; + BYTE_ADD(res, dst, src); + return res; +} + +static UINT32 CPUCALL +XADD2(UINT32 dst, void *arg) +{ + UINT32 src = PTR_TO_UINT32(arg); + UINT32 res; + WORD_ADD(res, dst, src); + return res; +} + +static UINT32 CPUCALL +XADD4(UINT32 dst, void *arg) +{ + UINT32 src = PTR_TO_UINT32(arg); + UINT32 res; + DWORD_ADD(res, dst, src); + return res; +} + void XADD_EbGb(void) { @@ -865,16 +887,13 @@ XADD_EbGb(void) CPU_WORKCLOCK(2); out = reg8_b20[op]; dst = *out; - ADD_BYTE(res, dst, *src); + BYTE_ADD(res, dst, *src); *src = (UINT8)dst; *out = (UINT8)res; } else { CPU_WORKCLOCK(7); madr = calc_ea_dst(op); - dst = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr); - ADD_BYTE(res, dst, *src); - *src = (UINT8)dst; - cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, (UINT8)res); + *src = (UINT8)cpu_vmemory_RMW_b(CPU_INST_SEGREG_INDEX, madr, XADD1, UINT32_TO_PTR(*src)); } } @@ -889,16 +908,13 @@ XADD_EwGw(void) CPU_WORKCLOCK(2); out = reg16_b20[op]; dst = *out; - ADD_WORD(res, dst, *src); + WORD_ADD(res, dst, *src); *src = (UINT16)dst; *out = (UINT16)res; } else { CPU_WORKCLOCK(7); madr = calc_ea_dst(op); - dst = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr); - ADD_WORD(res, dst, *src); - *src = (UINT16)dst; - cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)res); + *src = (UINT16)cpu_vmemory_RMW_w(CPU_INST_SEGREG_INDEX, madr, XADD2, UINT32_TO_PTR(*src)); } } @@ -913,16 +929,13 @@ XADD_EdGd(void) CPU_WORKCLOCK(2); out = reg32_b20[op]; dst = *out; - ADD_DWORD(res, dst, *src); + DWORD_ADD(res, dst, *src); *src = dst; *out = res; } else { CPU_WORKCLOCK(7); madr = calc_ea_dst(op); - dst = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr); - ADD_DWORD(res, dst, *src); - *src = dst; - cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, res); + *src = cpu_vmemory_RMW_d(CPU_INST_SEGREG_INDEX, madr, XADD4, UINT32_TO_PTR(*src)); } } @@ -934,13 +947,14 @@ CMPXCHG_EbGb(void) { UINT8 *out; UINT32 op, src, dst, madr, tmp; + UINT8 al; PREPART_EA_REG8(op, src); + al = CPU_AL; if (op >= 0xc0) { out = reg8_b20[op]; dst = *out; - BYTE_SUB(tmp, CPU_AL, dst); - if (CPU_FLAGL & Z_FLAG) { + if (al == dst) { *out = (UINT8)src; } else { CPU_AL = (UINT8)dst; @@ -948,13 +962,13 @@ CMPXCHG_EbGb(void) } else { madr = calc_ea_dst(op); dst = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr); - BYTE_SUB(tmp, CPU_AL, dst); - if (CPU_FLAGL & Z_FLAG) { + if (al == dst) { cpu_vmemorywrite(CPU_INST_SEGREG_INDEX, madr, (UINT8)src); } else { CPU_AL = (UINT8)dst; } } + BYTE_SUB(tmp, al, dst); } void @@ -962,13 +976,14 @@ CMPXCHG_EwGw(void) { UINT16 *out; UINT32 op, src, dst, madr, tmp; + UINT16 ax; PREPART_EA_REG16(op, src); + ax = CPU_AX; if (op >= 0xc0) { out = reg16_b20[op]; dst = *out; - WORD_SUB(tmp, CPU_AX, dst); - if (CPU_FLAGL & Z_FLAG) { + if (ax == dst) { *out = (UINT16)src; } else { CPU_AX = (UINT16)dst; @@ -976,13 +991,13 @@ CMPXCHG_EwGw(void) } else { madr = calc_ea_dst(op); dst = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr); - WORD_SUB(tmp, CPU_AX, dst); - if (CPU_FLAGL & Z_FLAG) { + if (ax == dst) { cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)src); } else { CPU_AX = (UINT16)dst; } } + WORD_SUB(tmp, ax, dst); } void @@ -990,13 +1005,14 @@ CMPXCHG_EdGd(void) { UINT32 *out; UINT32 op, src, dst, madr, tmp; + UINT32 eax; PREPART_EA_REG32(op, src); + eax = CPU_EAX; if (op >= 0xc0) { out = reg32_b20[op]; dst = *out; - WORD_SUB(tmp, CPU_EAX, dst); - if (CPU_FLAGL & Z_FLAG) { + if (eax == dst) { *out = src; } else { CPU_EAX = dst; @@ -1004,16 +1020,16 @@ CMPXCHG_EdGd(void) } else { madr = calc_ea_dst(op); dst = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr); - DWORD_SUB(tmp, CPU_AX, dst); - if (CPU_FLAGL & Z_FLAG) { + if (eax == dst) { cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, src); } else { CPU_EAX = dst; } } + DWORD_SUB(tmp, eax, dst); } -void +void CPUCALL CMPXCHG8B(UINT32 op) { UINT32 madr, dst_l, dst_h; @@ -1058,7 +1074,7 @@ void PUSH_EBP(void) { CPU_WORKCLOCK(3); void PUSH_ESI(void) { CPU_WORKCLOCK(3); PUSH0_32(CPU_ESI); } void PUSH_EDI(void) { CPU_WORKCLOCK(3); PUSH0_32(CPU_EDI); } -void +void CPUCALL PUSH_Ew(UINT32 op) { UINT32 dst, madr; @@ -1066,16 +1082,15 @@ PUSH_Ew(UINT32 op) if (op >= 0xc0) { CPU_WORKCLOCK(2); dst = *(reg16_b20[op]); - PUSH0_16(dst); } else { CPU_WORKCLOCK(5); madr = calc_ea_dst(op); dst = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr); - PUSH0_16(dst); } + PUSH0_16(dst); } -void +void CPUCALL PUSH_Ed(UINT32 op) { UINT32 dst, madr; @@ -1083,13 +1098,12 @@ PUSH_Ed(UINT32 op) if (op >= 0xc0) { CPU_WORKCLOCK(2); dst = *(reg32_b20[op]); - PUSH0_32(dst); } else { CPU_WORKCLOCK(5); madr = calc_ea_dst(op); dst = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr); - PUSH0_32(dst); } + PUSH0_32(dst); } void @@ -1165,6 +1179,7 @@ POP_Ew(void) CPU_WORKCLOCK(5); + CPU_SET_PREV_ESP(); POP0_16(src); GET_PCBYTE(op); if (op >= 0xc0) { @@ -1173,9 +1188,10 @@ POP_Ew(void) madr = calc_ea_dst(op); cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, src); } + CPU_CLEAR_PREV_ESP(); } -void +void CPUCALL POP_Ew_G5(UINT32 op) { UINT32 madr; @@ -1183,6 +1199,7 @@ POP_Ew_G5(UINT32 op) CPU_WORKCLOCK(5); + CPU_SET_PREV_ESP(); POP0_16(src); if (op >= 0xc0) { *(reg16_b20[op]) = src; @@ -1190,6 +1207,7 @@ POP_Ew_G5(UINT32 op) madr = calc_ea_dst(op); cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, src); } + CPU_CLEAR_PREV_ESP(); } void @@ -1200,6 +1218,7 @@ POP_Ed(void) CPU_WORKCLOCK(5); + CPU_SET_PREV_ESP(); POP0_32(src); GET_PCBYTE(op); if (op >= 0xc0) { @@ -1208,15 +1227,17 @@ POP_Ed(void) madr = calc_ea_dst(op); cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, src); } + CPU_CLEAR_PREV_ESP(); } -void +void CPUCALL POP_Ed_G5(UINT32 op) { UINT32 src, madr; CPU_WORKCLOCK(5); + CPU_SET_PREV_ESP(); POP0_32(src); if (op >= 0xc0) { *(reg32_b20[op]) = src; @@ -1224,6 +1245,7 @@ POP_Ed_G5(UINT32 op) madr = calc_ea_dst(op); cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr, src); } + CPU_CLEAR_PREV_ESP(); } void @@ -1233,8 +1255,10 @@ POP16_ES(void) CPU_WORKCLOCK(5); + CPU_SET_PREV_ESP(); POP0_16(src); - CPU_SET_SEGREG(CPU_ES_INDEX, src); + LOAD_SEGREG(CPU_ES_INDEX, src); + CPU_CLEAR_PREV_ESP(); } void @@ -1244,8 +1268,10 @@ POP32_ES(void) CPU_WORKCLOCK(5); + CPU_SET_PREV_ESP(); POP0_32(src); - CPU_SET_SEGREG(CPU_ES_INDEX, (UINT16)src); + LOAD_SEGREG(CPU_ES_INDEX, (UINT16)src); + CPU_CLEAR_PREV_ESP(); } void @@ -1255,8 +1281,10 @@ POP16_SS(void) CPU_WORKCLOCK(5); + CPU_SET_PREV_ESP(); POP0_16(src); - CPU_SET_SEGREG(CPU_SS_INDEX, src); + LOAD_SEGREG(CPU_SS_INDEX, src); + CPU_CLEAR_PREV_ESP(); exec_1step(); } @@ -1267,8 +1295,10 @@ POP32_SS(void) CPU_WORKCLOCK(5); + CPU_SET_PREV_ESP(); POP0_32(src); - CPU_SET_SEGREG(CPU_SS_INDEX, (UINT16)src); + LOAD_SEGREG(CPU_SS_INDEX, (UINT16)src); + CPU_CLEAR_PREV_ESP(); exec_1step(); } @@ -1279,8 +1309,10 @@ POP16_DS(void) CPU_WORKCLOCK(5); + CPU_SET_PREV_ESP(); POP0_16(src); - CPU_SET_SEGREG(CPU_DS_INDEX, src); + LOAD_SEGREG(CPU_DS_INDEX, src); + CPU_CLEAR_PREV_ESP(); } void @@ -1290,8 +1322,10 @@ POP32_DS(void) CPU_WORKCLOCK(5); + CPU_SET_PREV_ESP(); POP0_32(src); - CPU_SET_SEGREG(CPU_DS_INDEX, (UINT16)src); + LOAD_SEGREG(CPU_DS_INDEX, (UINT16)src); + CPU_CLEAR_PREV_ESP(); } void @@ -1301,8 +1335,10 @@ POP16_FS(void) CPU_WORKCLOCK(5); + CPU_SET_PREV_ESP(); POP0_16(src); - CPU_SET_SEGREG(CPU_FS_INDEX, src); + LOAD_SEGREG(CPU_FS_INDEX, src); + CPU_CLEAR_PREV_ESP(); } void @@ -1312,8 +1348,10 @@ POP32_FS(void) CPU_WORKCLOCK(5); + CPU_SET_PREV_ESP(); POP0_32(src); - CPU_SET_SEGREG(CPU_FS_INDEX, (UINT16)src); + LOAD_SEGREG(CPU_FS_INDEX, (UINT16)src); + CPU_CLEAR_PREV_ESP(); } void @@ -1323,8 +1361,10 @@ POP16_GS(void) CPU_WORKCLOCK(5); + CPU_SET_PREV_ESP(); POP0_16(src); - CPU_SET_SEGREG(CPU_GS_INDEX, src); + LOAD_SEGREG(CPU_GS_INDEX, src); + CPU_CLEAR_PREV_ESP(); } void @@ -1334,8 +1374,10 @@ POP32_GS(void) CPU_WORKCLOCK(5); + CPU_SET_PREV_ESP(); POP0_32(src); - CPU_SET_SEGREG(CPU_GS_INDEX, (UINT16)src); + LOAD_SEGREG(CPU_GS_INDEX, (UINT16)src); + CPU_CLEAR_PREV_ESP(); } /* @@ -1348,9 +1390,7 @@ PUSHA(void) CPU_WORKCLOCK(17); if (!CPU_STAT_SS32) { - if (CPU_STAT_PM) { - CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_SP, 16); - } + SS_PUSH_CHECK(CPU_SP, 16); REGPUSH0(CPU_AX); REGPUSH0(CPU_CX); REGPUSH0(CPU_DX); @@ -1360,9 +1400,7 @@ PUSHA(void) REGPUSH0(CPU_SI); REGPUSH0(CPU_DI); } else { - if (CPU_STAT_PM) { - CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 16); - } + SS_PUSH_CHECK(CPU_ESP, 16); REGPUSH0_16_32(CPU_AX); REGPUSH0_16_32(CPU_CX); REGPUSH0_16_32(CPU_DX); @@ -1381,9 +1419,7 @@ PUSHAD(void) CPU_WORKCLOCK(17); if (!CPU_STAT_SS32) { - if (CPU_STAT_PM) { - CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_SP, 32); - } + SS_PUSH_CHECK(CPU_SP, 32); REGPUSH0_32_16(CPU_EAX); REGPUSH0_32_16(CPU_ECX); REGPUSH0_32_16(CPU_EDX); @@ -1393,9 +1429,7 @@ PUSHAD(void) REGPUSH0_32_16(CPU_ESI); REGPUSH0_32_16(CPU_EDI); } else { - if (CPU_STAT_PM) { - CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 32); - } + SS_PUSH_CHECK(CPU_ESP, 32); REGPUSH0_32(CPU_EAX); REGPUSH0_32(CPU_ECX); REGPUSH0_32(CPU_EDX); @@ -1413,9 +1447,7 @@ POPA(void) CPU_WORKCLOCK(19); if (!CPU_STAT_SS32) { - if (CPU_STAT_PM) { - CHECK_STACK_POP(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_SP, 16); - } + SS_POP_CHECK(CPU_SP, 16); REGPOP0(CPU_DI); REGPOP0(CPU_SI); REGPOP0(CPU_BP); @@ -1425,9 +1457,7 @@ POPA(void) REGPOP0(CPU_CX); REGPOP0(CPU_AX); } else { - if (CPU_STAT_PM) { - CHECK_STACK_POP(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 16); - } + SS_POP_CHECK(CPU_ESP, 16); REGPOP0_16_32(CPU_DI); REGPOP0_16_32(CPU_SI); REGPOP0_16_32(CPU_BP); @@ -1445,9 +1475,7 @@ POPAD(void) CPU_WORKCLOCK(19); if (!CPU_STAT_SS32) { - if (CPU_STAT_PM) { - CHECK_STACK_POP(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_SP, 32); - } + SS_POP_CHECK(CPU_SP, 32); REGPOP0_32_16(CPU_EDI); REGPOP0_32_16(CPU_ESI); REGPOP0_32_16(CPU_EBP); @@ -1457,9 +1485,7 @@ POPAD(void) REGPOP0_32_16(CPU_ECX); REGPOP0_32_16(CPU_EAX); } else { - if (CPU_STAT_PM) { - CHECK_STACK_POP(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 32); - } + SS_POP_CHECK(CPU_ESP, 32); REGPOP0_32(CPU_EDI); REGPOP0_32(CPU_ESI); REGPOP0_32(CPU_EBP);