--- np2/i386c/ia32/instructions/data_trans.c 2004/03/07 23:04:51 1.9 +++ np2/i386c/ia32/instructions/data_trans.c 2005/03/12 12:33:47 1.17 @@ -1,4 +1,4 @@ -/* $Id: data_trans.c,v 1.9 2004/03/07 23:04:51 yui Exp $ */ +/* $Id: data_trans.c,v 1.17 2005/03/12 12:33:47 monaka Exp $ */ /* * Copyright (c) 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 @@ -153,7 +151,6 @@ MOV_EdSw(void) } else { CPU_WORKCLOCK(3); madr = calc_ea_dst(op); - // LSB only... cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)src); } return; @@ -374,7 +371,7 @@ CMOVO_GwEw(void) UINT32 op, src; PREPART_REG16_EA(op, src, out, 2, 5); - if (CPU_OV) { + if (CC_O) { *out = (UINT16)src; } } @@ -386,7 +383,7 @@ CMOVO_GdEd(void) UINT32 op, src; PREPART_REG32_EA(op, src, out, 2, 5); - if (CPU_OV) { + if (CC_O) { *out = src; } } @@ -398,7 +395,7 @@ CMOVNO_GwEw(void) UINT32 op, src; PREPART_REG16_EA(op, src, out, 2, 5); - if (!CPU_OV) { + if (CC_NO) { *out = (UINT16)src; } } @@ -410,7 +407,7 @@ CMOVNO_GdEd(void) UINT32 op, src; PREPART_REG32_EA(op, src, out, 2, 5); - if (!CPU_OV) { + if (CC_NO) { *out = src; } } @@ -422,7 +419,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; } } @@ -434,7 +431,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; } } @@ -446,7 +443,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; } } @@ -458,7 +455,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; } } @@ -470,7 +467,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; } } @@ -482,7 +479,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; } } @@ -494,7 +491,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; } } @@ -506,7 +503,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; } } @@ -518,7 +515,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; } } @@ -530,7 +527,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; } } @@ -542,7 +539,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; } } @@ -554,7 +551,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; } } @@ -566,7 +563,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; } } @@ -578,7 +575,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; } } @@ -590,7 +587,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; } } @@ -602,7 +599,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; } } @@ -614,7 +611,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; } } @@ -626,7 +623,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; } } @@ -638,7 +635,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; } } @@ -650,7 +647,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; } } @@ -662,7 +659,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; } } @@ -674,7 +671,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; } } @@ -686,7 +683,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; } } @@ -698,7 +695,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; } } @@ -710,7 +707,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; } } @@ -722,7 +719,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; } } @@ -734,7 +731,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; } } @@ -746,7 +743,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; } } @@ -754,12 +751,19 @@ CMOVNLE_GdEd(void) /* * XCHG */ +static UINT32 +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) { @@ -769,9 +773,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_memory_access_va_RMW(CPU_INST_SEGREG_INDEX, madr, XCHG, UINT32_TO_PTR(*src)); } } @@ -780,7 +782,6 @@ XCHG_EwGw(void) { UINT16 *out, *src; UINT32 op, madr; - UINT16 tmp; PREPART_EA_REG16P(op, src); if (op >= 0xc0) { @@ -790,9 +791,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_memory_access_va_RMW_w(CPU_INST_SEGREG_INDEX, madr, XCHG, UINT32_TO_PTR(*src)); } } @@ -801,7 +800,6 @@ XCHG_EdGd(void) { UINT32 *out, *src; UINT32 op, madr; - UINT32 tmp; PREPART_EA_REG32P(op, src); if (op >= 0xc0) { @@ -811,9 +809,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_memory_access_va_RMW_d(CPU_INST_SEGREG_INDEX, madr, XCHG, UINT32_TO_PTR(*src)); } } @@ -838,33 +834,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 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); } @@ -878,6 +857,33 @@ void BSWAP_EDI(void) { CPU_WORKCLOCK(2); /* * XADD */ +static UINT32 +XADD1(UINT32 dst, void *arg) +{ + UINT32 src = PTR_TO_UINT32(arg); + UINT32 res; + BYTE_ADD(res, dst, src); + return res; +} + +static UINT32 +XADD2(UINT32 dst, void *arg) +{ + UINT32 src = PTR_TO_UINT32(arg); + UINT32 res; + WORD_ADD(res, dst, src); + return res; +} + +static UINT32 +XADD4(UINT32 dst, void *arg) +{ + UINT32 src = PTR_TO_UINT32(arg); + UINT32 res; + DWORD_ADD(res, dst, src); + return res; +} + void XADD_EbGb(void) { @@ -889,16 +895,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_memory_access_va_RMW(CPU_INST_SEGREG_INDEX, madr, XADD1, UINT32_TO_PTR(*src)); } } @@ -913,16 +916,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_memory_access_va_RMW_w(CPU_INST_SEGREG_INDEX, madr, XADD2, UINT32_TO_PTR(*src)); } } @@ -937,16 +937,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_memory_access_va_RMW_d(CPU_INST_SEGREG_INDEX, madr, XADD4, UINT32_TO_PTR(*src)); } } @@ -958,13 +955,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; @@ -972,13 +970,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 @@ -986,13 +984,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; @@ -1000,13 +999,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 @@ -1014,13 +1013,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; @@ -1028,13 +1028,13 @@ 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 @@ -1373,7 +1373,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); + STACK_PUSH_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), CPU_SP, 16); } REGPUSH0(CPU_AX); REGPUSH0(CPU_CX); @@ -1385,7 +1385,7 @@ PUSHA(void) REGPUSH0(CPU_DI); } else { if (CPU_STAT_PM) { - CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 16); + STACK_PUSH_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 16); } REGPUSH0_16_32(CPU_AX); REGPUSH0_16_32(CPU_CX); @@ -1406,7 +1406,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); + STACK_PUSH_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), CPU_SP, 32); } REGPUSH0_32_16(CPU_EAX); REGPUSH0_32_16(CPU_ECX); @@ -1418,7 +1418,7 @@ PUSHAD(void) REGPUSH0_32_16(CPU_EDI); } else { if (CPU_STAT_PM) { - CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 32); + STACK_PUSH_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 32); } REGPUSH0_32(CPU_EAX); REGPUSH0_32(CPU_ECX); @@ -1438,7 +1438,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); + STACK_POP_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), CPU_SP, 16); } REGPOP0(CPU_DI); REGPOP0(CPU_SI); @@ -1450,7 +1450,7 @@ POPA(void) REGPOP0(CPU_AX); } else { if (CPU_STAT_PM) { - CHECK_STACK_POP(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 16); + STACK_POP_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 16); } REGPOP0_16_32(CPU_DI); REGPOP0_16_32(CPU_SI); @@ -1470,7 +1470,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); + STACK_POP_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), CPU_SP, 32); } REGPOP0_32_16(CPU_EDI); REGPOP0_32_16(CPU_ESI); @@ -1482,7 +1482,7 @@ POPAD(void) REGPOP0_32_16(CPU_EAX); } else { if (CPU_STAT_PM) { - CHECK_STACK_POP(&CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 32); + STACK_POP_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP, 32); } REGPOP0_32(CPU_EDI); REGPOP0_32(CPU_ESI);