--- np2/i386c/ia32/instructions/bit_byte.c 2004/01/14 16:11:54 1.2 +++ np2/i386c/ia32/instructions/bit_byte.c 2005/03/12 12:33:47 1.11 @@ -1,4 +1,4 @@ -/* $Id: bit_byte.c,v 1.2 2004/01/14 16:11:54 monaka Exp $ */ +/* $Id: bit_byte.c,v 1.11 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 @@ -33,11 +31,13 @@ #include "bit_byte.h" -#define BIT_OFFSET16(v) (2 * (((SWORD)(v)) / 16)) -#define BIT_MAKEBIT16(v) (1 << ((v) & 0x0000000f)) - -#define BIT_OFFSET32(v) (4 * (((SDWORD)(v)) / 32)) -#define BIT_MAKEBIT32(v) (1 << ((v) & 0x0000001f)) +#define BIT_OFFSET16(v) (2 * (((SINT16)(v)) >> 4)) +#define BIT_INDEX16(v) ((v) & 0xf) +#define BIT_MAKEBIT16(v) (1 << BIT_INDEX16(v)) + +#define BIT_OFFSET32(v) (4 * (((SINT32)(v)) >> 5)) +#define BIT_INDEX32(v) ((v) & 0x1f) +#define BIT_MAKEBIT32(v) (1 << BIT_INDEX32(v)) /* @@ -46,8 +46,7 @@ void BT_EwGw(void) { - DWORD op, src, dst, madr; - WORD bit; + UINT32 op, src, dst, madr; PREPART_EA_REG16(op, src); if (op >= 0xc0) { @@ -59,19 +58,14 @@ BT_EwGw(void) madr += BIT_OFFSET16(src); dst = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr); } - bit = BIT_MAKEBIT16(src); - if (dst & bit) { - CPU_FLAGL |= C_FLAG; - } else { - CPU_FLAGL &= ~C_FLAG; - } + CPU_FLAGL &= ~C_FLAG; + CPU_FLAGL |= (dst >> BIT_INDEX16(src)) & 1; } void BT_EdGd(void) { - DWORD op, src, dst, madr; - DWORD bit; + UINT32 op, src, dst, madr; PREPART_EA_REG32(op, src); if (op >= 0xc0) { @@ -83,19 +77,14 @@ BT_EdGd(void) madr += BIT_OFFSET32(src); dst = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr); } - bit = BIT_MAKEBIT32(src); - if (dst & bit) { - CPU_FLAGL |= C_FLAG; - } else { - CPU_FLAGL &= ~C_FLAG; - } + CPU_FLAGL &= ~C_FLAG; + CPU_FLAGL |= (dst >> BIT_INDEX32(src)) & 1; } void -BT_EwIb(DWORD op) +BT_EwIb(UINT32 op) { - DWORD src, dst, madr; - WORD bit; + UINT32 src, dst, madr; if (op >= 0xc0) { CPU_WORKCLOCK(2); @@ -105,22 +94,16 @@ BT_EwIb(DWORD op) CPU_WORKCLOCK(6); madr = calc_ea_dst(op); GET_PCBYTE(src); - madr += BIT_OFFSET16(src); dst = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr); } - bit = BIT_MAKEBIT16(src); - if (dst & bit) { - CPU_FLAGL |= C_FLAG; - } else { - CPU_FLAGL &= ~C_FLAG; - } + CPU_FLAGL &= ~C_FLAG; + CPU_FLAGL |= (dst >> BIT_INDEX16(src)) & 1; } void -BT_EdIb(DWORD op) +BT_EdIb(UINT32 op) { - DWORD src, dst, madr; - DWORD bit; + UINT32 src, dst, madr; if (op >= 0xc0) { CPU_WORKCLOCK(2); @@ -130,15 +113,10 @@ BT_EdIb(DWORD op) CPU_WORKCLOCK(6); madr = calc_ea_dst(op); GET_PCBYTE(src); - madr += BIT_OFFSET32(src); dst = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr); } - bit = BIT_MAKEBIT32(src); - if (dst & bit) { - CPU_FLAGL |= C_FLAG; - } else { - CPU_FLAGL &= ~C_FLAG; - } + CPU_FLAGL &= ~C_FLAG; + CPU_FLAGL |= (dst >> BIT_INDEX32(src)) & 1; } /* @@ -147,9 +125,9 @@ BT_EdIb(DWORD op) void BTS_EwGw(void) { - WORD *out; - DWORD op, src, dst, res, madr; - WORD bit; + UINT16 *out; + UINT32 op, src, dst, res, madr; + UINT16 bit; PREPART_EA_REG16(op, src); bit = BIT_MAKEBIT16(src); @@ -162,7 +140,7 @@ BTS_EwGw(void) } else { CPU_FLAGL &= ~C_FLAG; res = dst | bit; - *out = res; + *out = (UINT16)res; } } else { CPU_WORKCLOCK(7); @@ -175,16 +153,16 @@ BTS_EwGw(void) CPU_FLAGL &= ~C_FLAG; } res = dst | bit; - cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (WORD)res); + cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)res); } } void BTS_EdGd(void) { - DWORD *out; - DWORD op, src, dst, res, madr; - DWORD bit; + UINT32 *out; + UINT32 op, src, dst, res, madr; + UINT32 bit; PREPART_EA_REG32(op, src); bit = BIT_MAKEBIT32(src); @@ -215,11 +193,11 @@ BTS_EdGd(void) } void -BTS_EwIb(DWORD op) +BTS_EwIb(UINT32 op) { - WORD *out; - DWORD src, dst, res, madr; - WORD bit; + UINT16 *out; + UINT32 src, dst, res, madr; + UINT16 bit; if (op >= 0xc0) { CPU_WORKCLOCK(2); @@ -232,13 +210,12 @@ BTS_EwIb(DWORD op) } else { CPU_FLAGL &= ~C_FLAG; res = dst | bit; - *out = res; + *out = (UINT16)res; } } else { CPU_WORKCLOCK(6); madr = calc_ea_dst(op); GET_PCBYTE(src); - madr += BIT_OFFSET16(src); dst = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr); bit = BIT_MAKEBIT16(src); if (dst & bit) { @@ -247,16 +224,16 @@ BTS_EwIb(DWORD op) CPU_FLAGL &= ~C_FLAG; } res = dst | bit; - cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (WORD)res); + cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)res); } } void -BTS_EdIb(DWORD op) +BTS_EdIb(UINT32 op) { - DWORD *out; - DWORD src, dst, res, madr; - DWORD bit; + UINT32 *out; + UINT32 src, dst, res, madr; + UINT32 bit; if (op >= 0xc0) { CPU_WORKCLOCK(2); @@ -275,7 +252,6 @@ BTS_EdIb(DWORD op) CPU_WORKCLOCK(6); madr = calc_ea_dst(op); GET_PCBYTE(src); - madr += BIT_OFFSET32(src); dst = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr); bit = BIT_MAKEBIT32(src); if (dst & bit) { @@ -294,9 +270,9 @@ BTS_EdIb(DWORD op) void BTR_EwGw(void) { - WORD *out; - DWORD op, src, dst, res, madr; - WORD bit; + UINT16 *out; + UINT32 op, src, dst, res, madr; + UINT16 bit; PREPART_EA_REG16(op, src); bit = BIT_MAKEBIT16(src); @@ -307,7 +283,7 @@ BTR_EwGw(void) if (dst & bit) { CPU_FLAGL |= C_FLAG; res = dst & ~bit; - *out = res; + *out = (UINT16)res; } else { CPU_FLAGL &= ~C_FLAG; } @@ -322,16 +298,16 @@ BTR_EwGw(void) CPU_FLAGL &= ~C_FLAG; } res = dst & ~bit; - cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (WORD)res); + cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)res); } } void BTR_EdGd(void) { - DWORD *out; - DWORD op, src, dst, res, madr; - DWORD bit; + UINT32 *out; + UINT32 op, src, dst, res, madr; + UINT32 bit; PREPART_EA_REG32(op, src); bit = BIT_MAKEBIT32(src); @@ -362,11 +338,11 @@ BTR_EdGd(void) } void -BTR_EwIb(DWORD op) +BTR_EwIb(UINT32 op) { - WORD *out; - DWORD src, dst, res, madr; - WORD bit; + UINT16 *out; + UINT32 src, dst, res, madr; + UINT16 bit; if (op >= 0xc0) { CPU_WORKCLOCK(2); @@ -377,7 +353,7 @@ BTR_EwIb(DWORD op) if (dst & bit) { CPU_FLAGL |= C_FLAG; res = dst & ~bit; - *out = res; + *out = (UINT16)res; } else { CPU_FLAGL &= ~C_FLAG; } @@ -385,7 +361,6 @@ BTR_EwIb(DWORD op) CPU_WORKCLOCK(6); madr = calc_ea_dst(op); GET_PCBYTE(src); - madr += BIT_OFFSET16(src); dst = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr); bit = BIT_MAKEBIT16(src); if (dst & bit) { @@ -394,16 +369,16 @@ BTR_EwIb(DWORD op) CPU_FLAGL &= ~C_FLAG; } res = dst & ~bit; - cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (WORD)res); + cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)res); } } void -BTR_EdIb(DWORD op) +BTR_EdIb(UINT32 op) { - DWORD *out; - DWORD src, dst, res, madr; - DWORD bit; + UINT32 *out; + UINT32 src, dst, res, madr; + UINT32 bit; if (op >= 0xc0) { CPU_WORKCLOCK(2); @@ -422,7 +397,6 @@ BTR_EdIb(DWORD op) CPU_WORKCLOCK(6); madr = calc_ea_dst(op); GET_PCBYTE(src); - madr += BIT_OFFSET32(src); dst = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr); bit = BIT_MAKEBIT32(src); if (dst & bit) { @@ -441,9 +415,9 @@ BTR_EdIb(DWORD op) void BTC_EwGw(void) { - WORD *out; - DWORD op, src, dst, res, madr; - WORD bit; + UINT16 *out; + UINT32 op, src, dst, res, madr; + UINT16 bit; PREPART_EA_REG16(op, src); bit = BIT_MAKEBIT16(src); @@ -457,7 +431,7 @@ BTC_EwGw(void) CPU_FLAGL &= ~C_FLAG; } res = dst ^ bit; - *out = res; + *out = (UINT16)res; } else { CPU_WORKCLOCK(7); madr = calc_ea_dst(op); @@ -469,16 +443,16 @@ BTC_EwGw(void) CPU_FLAGL &= ~C_FLAG; } res = dst ^ bit; - cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (WORD)res); + cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)res); } } void BTC_EdGd(void) { - DWORD *out; - DWORD op, src, dst, res, madr; - DWORD bit; + UINT32 *out; + UINT32 op, src, dst, res, madr; + UINT32 bit; PREPART_EA_REG32(op, src); bit = BIT_MAKEBIT32(src); @@ -509,11 +483,11 @@ BTC_EdGd(void) } void -BTC_EwIb(DWORD op) +BTC_EwIb(UINT32 op) { - WORD *out; - DWORD src, dst, res, madr; - WORD bit; + UINT16 *out; + UINT32 src, dst, res, madr; + UINT16 bit; if (op >= 0xc0) { CPU_WORKCLOCK(2); @@ -527,12 +501,11 @@ BTC_EwIb(DWORD op) CPU_FLAGL &= ~C_FLAG; } res = dst ^ bit; - *out = res; + *out = (UINT16)res; } else { CPU_WORKCLOCK(6); madr = calc_ea_dst(op); GET_PCBYTE(src); - madr += BIT_OFFSET16(src); dst = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr); bit = BIT_MAKEBIT16(src); if (dst & bit) { @@ -541,16 +514,16 @@ BTC_EwIb(DWORD op) CPU_FLAGL &= ~C_FLAG; } res = dst ^ bit; - cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (WORD)res); + cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)res); } } void -BTC_EdIb(DWORD op) +BTC_EdIb(UINT32 op) { - DWORD *out; - DWORD src, dst, res, madr; - DWORD bit; + UINT32 *out; + UINT32 src, dst, res, madr; + UINT32 bit; if (op >= 0xc0) { CPU_WORKCLOCK(2); @@ -569,7 +542,6 @@ BTC_EdIb(DWORD op) CPU_WORKCLOCK(6); madr = calc_ea_dst(op); GET_PCBYTE(src); - madr += BIT_OFFSET32(src); dst = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr); bit = BIT_MAKEBIT32(src); if (dst & bit) { @@ -588,8 +560,8 @@ BTC_EdIb(DWORD op) void BSF_GwEw(void) { - WORD *out; - DWORD op, src; + UINT16 *out; + UINT32 op, src; int bit; PREPART_REG16_EA(op, src, out, 2, 7); @@ -597,18 +569,20 @@ BSF_GwEw(void) CPU_FLAGL |= Z_FLAG; /* dest reg is undefined */ } else { - for (bit = 0; (bit < 16) && !(src & (1 << bit)); bit++) - continue; - *out = (WORD)bit; CPU_FLAGL &= ~Z_FLAG; + for (bit = 0; bit < 15; bit++) { + if (src & (1 << bit)) + break; + } + *out = (UINT16)bit; } } void BSF_GdEd(void) { - DWORD *out; - DWORD op, src; + UINT32 *out; + UINT32 op, src; int bit; PREPART_REG32_EA(op, src, out, 2, 7); @@ -616,10 +590,12 @@ BSF_GdEd(void) CPU_FLAGL |= Z_FLAG; /* dest reg is undefined */ } else { - for (bit = 0; (bit < 32) && !(src & (1 << bit)); bit++) - continue; - *out = (DWORD)bit; CPU_FLAGL &= ~Z_FLAG; + for (bit = 0; bit < 31; bit++) { + if (src & (1 << bit)) + break; + } + *out = (UINT32)bit; } } @@ -629,8 +605,8 @@ BSF_GdEd(void) void BSR_GwEw(void) { - WORD *out; - DWORD op, src; + UINT16 *out; + UINT32 op, src; int bit; PREPART_REG16_EA(op, src, out, 2, 7); @@ -638,18 +614,20 @@ BSR_GwEw(void) CPU_FLAGL |= Z_FLAG; /* dest reg is undefined */ } else { - for (bit = 15; (bit >= 0) && !(src & (1 << bit)); bit--) - continue; - *out = (WORD)bit; CPU_FLAGL &= ~Z_FLAG; + for (bit = 15; bit > 0; bit--) { + if (src & (1 << bit)) + break; + } + *out = (UINT16)bit; } } void BSR_GdEd(void) { - DWORD *out; - DWORD op, src; + UINT32 *out; + UINT32 op, src; int bit; PREPART_REG32_EA(op, src, out, 2, 7); @@ -657,10 +635,12 @@ BSR_GdEd(void) CPU_FLAGL |= Z_FLAG; /* dest reg is undefined */ } else { - for (bit = 31; (bit >= 0) && !(src & (1 << bit)); bit--) - continue; - *out = (DWORD)bit; CPU_FLAGL &= ~Z_FLAG; + for (bit = 31; bit > 0; bit--) { + if (src & (1 << bit)) + break; + } + *out = (UINT32)bit; } } @@ -670,10 +650,10 @@ BSR_GdEd(void) void SETO_Eb(void) { - DWORD op, src, madr; - BYTE v = CPU_OV ? 1 : 0; + UINT32 op, madr; + UINT8 v = CC_O?1:0; - PREPART_EA_REG8(op, src); + GET_PCBYTE(op); if (op >= 0xc0) { CPU_WORKCLOCK(2); *(reg8_b20[op]) = v; @@ -687,10 +667,10 @@ SETO_Eb(void) void SETNO_Eb(void) { - DWORD op, src, madr; - BYTE v = CPU_OV ? 0 : 1; + UINT32 op, madr; + UINT8 v = CC_NO?1:0; - PREPART_EA_REG8(op, src); + GET_PCBYTE(op); if (op >= 0xc0) { CPU_WORKCLOCK(2); *(reg8_b20[op]) = v; @@ -704,10 +684,10 @@ SETNO_Eb(void) void SETC_Eb(void) { - DWORD op, src, madr; - BYTE v = CPU_FLAGL & C_FLAG; + UINT32 op, madr; + UINT8 v = CC_C?1:0; - PREPART_EA_REG8(op, src); + GET_PCBYTE(op); if (op >= 0xc0) { CPU_WORKCLOCK(2); *(reg8_b20[op]) = v; @@ -721,10 +701,10 @@ SETC_Eb(void) void SETNC_Eb(void) { - DWORD op, src, madr; - BYTE v = (CPU_FLAGL & C_FLAG) ? 0 : 1; + UINT32 op, madr; + UINT8 v = CC_NC?1:0; - PREPART_EA_REG8(op, src); + GET_PCBYTE(op); if (op >= 0xc0) { CPU_WORKCLOCK(2); *(reg8_b20[op]) = v; @@ -738,10 +718,10 @@ SETNC_Eb(void) void SETZ_Eb(void) { - DWORD op, src, madr; - BYTE v = (CPU_FLAGL & Z_FLAG) ? 1 : 0; + UINT32 op, madr; + UINT8 v = CC_Z?1:0; - PREPART_EA_REG8(op, src); + GET_PCBYTE(op); if (op >= 0xc0) { CPU_WORKCLOCK(2); *(reg8_b20[op]) = v; @@ -755,10 +735,10 @@ SETZ_Eb(void) void SETNZ_Eb(void) { - DWORD op, src, madr; - BYTE v = (CPU_FLAGL & Z_FLAG) ? 0 : 1; + UINT32 op, madr; + UINT8 v = CC_NZ?1:0; - PREPART_EA_REG8(op, src); + GET_PCBYTE(op); if (op >= 0xc0) { CPU_WORKCLOCK(2); *(reg8_b20[op]) = v; @@ -772,10 +752,10 @@ SETNZ_Eb(void) void SETA_Eb(void) { - DWORD op, src, madr; - BYTE v = (CPU_FLAGL & (Z_FLAG|C_FLAG)) ? 0 : 1; + UINT32 op, madr; + UINT8 v = CC_A?1:0; - PREPART_EA_REG8(op, src); + GET_PCBYTE(op); if (op >= 0xc0) { CPU_WORKCLOCK(2); *(reg8_b20[op]) = v; @@ -789,10 +769,10 @@ SETA_Eb(void) void SETNA_Eb(void) { - DWORD op, src, madr; - BYTE v = (CPU_FLAGL & (Z_FLAG|C_FLAG)) ? 1 : 0; + UINT32 op, madr; + UINT8 v = CC_NA?1:0; - PREPART_EA_REG8(op, src); + GET_PCBYTE(op); if (op >= 0xc0) { CPU_WORKCLOCK(2); *(reg8_b20[op]) = v; @@ -806,10 +786,10 @@ SETNA_Eb(void) void SETS_Eb(void) { - DWORD op, src, madr; - BYTE v = (CPU_FLAGL & S_FLAG) ? 1 : 0; + UINT32 op, madr; + UINT8 v = CC_S?1:0; - PREPART_EA_REG8(op, src); + GET_PCBYTE(op); if (op >= 0xc0) { CPU_WORKCLOCK(2); *(reg8_b20[op]) = v; @@ -823,10 +803,10 @@ SETS_Eb(void) void SETNS_Eb(void) { - DWORD op, src, madr; - BYTE v = (CPU_FLAGL & S_FLAG) ? 0 : 1; + UINT32 op, madr; + UINT8 v = CC_NS?1:0; - PREPART_EA_REG8(op, src); + GET_PCBYTE(op); if (op >= 0xc0) { CPU_WORKCLOCK(2); *(reg8_b20[op]) = v; @@ -840,10 +820,10 @@ SETNS_Eb(void) void SETP_Eb(void) { - DWORD op, src, madr; - BYTE v = (CPU_FLAGL & P_FLAG) ? 1 : 0; + UINT32 op, madr; + UINT8 v = CC_P?1:0; - PREPART_EA_REG8(op, src); + GET_PCBYTE(op); if (op >= 0xc0) { CPU_WORKCLOCK(2); *(reg8_b20[op]) = v; @@ -857,10 +837,10 @@ SETP_Eb(void) void SETNP_Eb(void) { - DWORD op, src, madr; - BYTE v = (CPU_FLAGL & P_FLAG) ? 0 : 1; + UINT32 op, madr; + UINT8 v = CC_NP?1:0; - PREPART_EA_REG8(op, src); + GET_PCBYTE(op); if (op >= 0xc0) { CPU_WORKCLOCK(2); *(reg8_b20[op]) = v; @@ -874,10 +854,10 @@ SETNP_Eb(void) void SETL_Eb(void) { - DWORD op, src, madr; - BYTE v = (!CPU_OV == !(CPU_FLAGL & S_FLAG)) ? 1 : 0; + UINT32 op, madr; + UINT8 v = CC_L?1:0; - PREPART_EA_REG8(op, src); + GET_PCBYTE(op); if (op >= 0xc0) { CPU_WORKCLOCK(2); *(reg8_b20[op]) = v; @@ -891,10 +871,10 @@ SETL_Eb(void) void SETNL_Eb(void) { - DWORD op, src, madr; - BYTE v = (!CPU_OV == !(CPU_FLAGL & S_FLAG)) ? 0 : 1; + UINT32 op, madr; + UINT8 v = CC_NL?1:0; - PREPART_EA_REG8(op, src); + GET_PCBYTE(op); if (op >= 0xc0) { CPU_WORKCLOCK(2); *(reg8_b20[op]) = v; @@ -908,10 +888,10 @@ SETNL_Eb(void) void SETLE_Eb(void) { - DWORD op, src, madr; - BYTE v = ((CPU_FLAGL & Z_FLAG) || (!CPU_OV == !(CPU_FLAGL & S_FLAG))) ? 1 : 0; + UINT32 op, madr; + UINT8 v = CC_LE?1:0; - PREPART_EA_REG8(op, src); + GET_PCBYTE(op); if (op >= 0xc0) { CPU_WORKCLOCK(2); *(reg8_b20[op]) = v; @@ -925,10 +905,10 @@ SETLE_Eb(void) void SETNLE_Eb(void) { - DWORD op, src, madr; - BYTE v = ((CPU_FLAGL & Z_FLAG) || (!CPU_OV == !(CPU_FLAGL & S_FLAG))) ? 0 : 1; + UINT32 op, madr; + UINT8 v = CC_NLE?1:0; - PREPART_EA_REG8(op, src); + GET_PCBYTE(op); if (op >= 0xc0) { CPU_WORKCLOCK(2); *(reg8_b20[op]) = v; @@ -945,7 +925,7 @@ SETNLE_Eb(void) void TEST_EbGb(void) { - DWORD op, src, tmp, madr; + UINT32 op, src, tmp, madr; PREPART_EA_REG8(op, src); if (op >= 0xc0) { @@ -956,13 +936,13 @@ TEST_EbGb(void) madr = calc_ea_dst(op); tmp = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr); } - ANDBYTE(tmp, src); + BYTE_AND(tmp, src); } void TEST_EwGw(void) { - DWORD op, src, tmp, madr; + UINT32 op, src, tmp, madr; PREPART_EA_REG16(op, src); if (op >= 0xc0) { @@ -973,13 +953,13 @@ TEST_EwGw(void) madr = calc_ea_dst(op); tmp = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr); } - ANDWORD(tmp, src); + WORD_AND(tmp, src); } void TEST_EdGd(void) { - DWORD op, src, tmp, madr; + UINT32 op, src, tmp, madr; PREPART_EA_REG32(op, src); if (op >= 0xc0) { @@ -990,46 +970,46 @@ TEST_EdGd(void) madr = calc_ea_dst(op); tmp = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr); } - ANDDWORD(tmp, src); + DWORD_AND(tmp, src); } void TEST_ALIb(void) { - DWORD src, tmp; + UINT32 src, tmp; CPU_WORKCLOCK(3); tmp = CPU_AL; GET_PCBYTE(src); - ANDBYTE(tmp, src); + BYTE_AND(tmp, src); } void TEST_AXIw(void) { - DWORD src, tmp; + UINT32 src, tmp; CPU_WORKCLOCK(3); tmp = CPU_AX; GET_PCWORD(src); - ANDWORD(tmp, src); + WORD_AND(tmp, src); } void TEST_EAXId(void) { - DWORD src, tmp; + UINT32 src, tmp; CPU_WORKCLOCK(3); tmp = CPU_EAX; GET_PCDWORD(src); - ANDDWORD(tmp, src); + DWORD_AND(tmp, src); } void -TEST_EbIb(DWORD op) +TEST_EbIb(UINT32 op) { - DWORD src, tmp, madr; + UINT32 src, tmp, madr; if (op >= 0xc0) { CPU_WORKCLOCK(2); @@ -1040,13 +1020,13 @@ TEST_EbIb(DWORD op) tmp = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr); } GET_PCBYTE(src); - ANDBYTE(tmp, src); + BYTE_AND(tmp, src); } void -TEST_EwIw(DWORD op) +TEST_EwIw(UINT32 op) { - DWORD src, tmp, madr; + UINT32 src, tmp, madr; if (op >= 0xc0) { CPU_WORKCLOCK(2); @@ -1057,13 +1037,13 @@ TEST_EwIw(DWORD op) tmp = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr); } GET_PCWORD(src); - ANDWORD(tmp, src); + WORD_AND(tmp, src); } void -TEST_EdId(DWORD op) +TEST_EdId(UINT32 op) { - DWORD src, tmp, madr; + UINT32 src, tmp, madr; if (op >= 0xc0) { CPU_WORKCLOCK(2); @@ -1074,5 +1054,5 @@ TEST_EdId(DWORD op) tmp = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr); } GET_PCDWORD(src); - ANDDWORD(tmp, src); + DWORD_AND(tmp, src); }