Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-28 03:02:52 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fixed bug in x86 and x64 backends where sometimes the flags would be corrupted.

Browse Source 
In particular, we always clobbered the flags for the subfze instruction, which
broke the nbapbp camera and some other things.
This commit is contained in:
Aaron Giles 2008-06-08 08:43:26 +00:00
parent 8e72738ea2
commit 003a6e94ca
2 changed files with 128 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
src/emu/cpu/drcbex64.c
View File

@ -1234,6 +1234,26 @@ static void emit_mov_r32_p32(drcbe_state *drcbe, x86code **dst, UINT8 reg, const
} }
/*-------------------------------------------------
emit_mov_r32_p32_keepflags - move a 32-bit
parameter into a register without affecting
any flags
-------------------------------------------------*/
static void emit_mov_r32_p32_keepflags(drcbe_state *drcbe, x86code **dst, UINT8 reg, const drcuml_parameter *param)
{
if (param->type == DRCUML_PTYPE_IMMEDIATE)
emit_mov_r32_imm(dst, reg, param->value); // mov reg,param
else if (param->type == DRCUML_PTYPE_MEMORY)
emit_mov_r32_m32(dst, reg, MABS(drcbe, param->value)); // mov reg,[param]
else if (param->type == DRCUML_PTYPE_INT_REGISTER)
{
if (reg != param->value)
emit_mov_r32_r32(dst, reg, param->value); // mov reg,param
}
}
/*------------------------------------------------- /*-------------------------------------------------
emit_mov_m32_p32 - move a 32-bit parameter emit_mov_m32_p32 - move a 32-bit parameter
into a memory location into a memory location
@ -1345,7 +1365,7 @@ static void emit_adc_m32_p32(drcbe_state *drcbe, x86code **dst, DECLARE_MEMPARAM
else else
{ {
int reg = param_select_register(REG_EAX, param, NULL); int reg = param_select_register(REG_EAX, param, NULL);
emit_mov_r32_p32(drcbe, dst, reg, param); // mov reg,param emit_mov_r32_p32_keepflags(drcbe, dst, reg, param); // mov reg,param
emit_adc_m32_r32(dst, MEMPARAMS, reg); // adc [dest],reg emit_adc_m32_r32(dst, MEMPARAMS, reg); // adc [dest],reg
} }
} }
@ -1425,7 +1445,7 @@ static void emit_sbb_m32_p32(drcbe_state *drcbe, x86code **dst, DECLARE_MEMPARAM
else else
{ {
int reg = param_select_register(REG_EAX, param, NULL); int reg = param_select_register(REG_EAX, param, NULL);
emit_mov_r32_p32(drcbe, dst, reg, param); // mov reg,param emit_mov_r32_p32_keepflags(drcbe, dst, reg, param); // mov reg,param
emit_sbb_m32_r32(dst, MEMPARAMS, reg); // sbb [dest],reg emit_sbb_m32_r32(dst, MEMPARAMS, reg); // sbb [dest],reg
} }
} }
@ -1880,7 +1900,7 @@ static void emit_rcl_r32_p32(drcbe_state *drcbe, x86code **dst, UINT8 reg, const
} }
else else
{ {
emit_mov_r32_p32(drcbe, dst, REG_ECX, param); // mov ecx,param emit_mov_r32_p32_keepflags(drcbe, dst, REG_ECX, param); // mov ecx,param
emit_rcl_r32_cl(dst, reg); // rcl reg,cl emit_rcl_r32_cl(dst, reg); // rcl reg,cl
} }
} }
@ -1902,7 +1922,7 @@ static void emit_rcl_m32_p32(drcbe_state *drcbe, x86code **dst, DECLARE_MEMPARAM
} }
else else
{ {
emit_mov_r32_p32(drcbe, dst, REG_ECX, param); // mov ecx,param emit_mov_r32_p32_keepflags(drcbe, dst, REG_ECX, param); // mov ecx,param
emit_rcl_m32_cl(dst, MEMPARAMS); // rcl [dest],cl emit_rcl_m32_cl(dst, MEMPARAMS); // rcl [dest],cl
} }
} }
@ -1924,7 +1944,7 @@ static void emit_rcr_r32_p32(drcbe_state *drcbe, x86code **dst, UINT8 reg, const
} }
else else
{ {
emit_mov_r32_p32(drcbe, dst, REG_ECX, param); // mov ecx,param emit_mov_r32_p32_keepflags(drcbe, dst, REG_ECX, param); // mov ecx,param
emit_rcr_r32_cl(dst, reg); // rcr reg,cl emit_rcr_r32_cl(dst, reg); // rcr reg,cl
} }
} }
@ -1946,7 +1966,7 @@ static void emit_rcr_m32_p32(drcbe_state *drcbe, x86code **dst, DECLARE_MEMPARAM
} }
else else
{ {
emit_mov_r32_p32(drcbe, dst, REG_ECX, param); // mov ecx,param emit_mov_r32_p32_keepflags(drcbe, dst, REG_ECX, param); // mov ecx,param
emit_rcr_m32_cl(dst, MEMPARAMS); // rcr [dest],cl emit_rcr_m32_cl(dst, MEMPARAMS); // rcr [dest],cl
} }
} }
@ -1981,6 +2001,26 @@ static void emit_mov_r64_p64(drcbe_state *drcbe, x86code **dst, UINT8 reg, const
} }
/*-------------------------------------------------
emit_mov_r64_p64_keepflags - move a 64-bit
parameter into a register without affecting
any flags
-------------------------------------------------*/
static void emit_mov_r64_p64_keepflags(drcbe_state *drcbe, x86code **dst, UINT8 reg, const drcuml_parameter *param)
{
if (param->type == DRCUML_PTYPE_IMMEDIATE)
emit_mov_r64_imm(dst, reg, param->value); // mov reg,param
else if (param->type == DRCUML_PTYPE_MEMORY)
emit_mov_r64_m64(dst, reg, MABS(drcbe, param->value)); // mov reg,[param]
else if (param->type == DRCUML_PTYPE_INT_REGISTER)
{
if (reg != param->value)
emit_mov_r64_r64(dst, reg, param->value); // mov reg,param
}
}
/*------------------------------------------------- /*-------------------------------------------------
emit_mov_p64_r64 - move a registers into a emit_mov_p64_r64 - move a registers into a
64-bit parameter 64-bit parameter
@ -2091,7 +2131,7 @@ static void emit_adc_m64_p64(drcbe_state *drcbe, x86code **dst, DECLARE_MEMPARAM
else else
{ {
int reg = param_select_register(REG_EAX, param, NULL); int reg = param_select_register(REG_EAX, param, NULL);
emit_mov_r64_p64(drcbe, dst, reg, param); // mov reg,param emit_mov_r64_p64_keepflags(drcbe, dst, reg, param); // mov reg,param
emit_adc_m64_r64(dst, MEMPARAMS, reg); // adc [dest],reg emit_adc_m64_r64(dst, MEMPARAMS, reg); // adc [dest],reg
} }
} }
@ -2189,7 +2229,7 @@ static void emit_sbb_m64_p64(drcbe_state *drcbe, x86code **dst, DECLARE_MEMPARAM
else else
{ {
int reg = param_select_register(REG_EAX, param, NULL); int reg = param_select_register(REG_EAX, param, NULL);
emit_mov_r64_p64(drcbe, dst, reg, param); // mov reg,param emit_mov_r64_p64_keepflags(drcbe, dst, reg, param); // mov reg,param
emit_sbb_m64_r64(dst, MEMPARAMS, reg); // sbb [dest],reg emit_sbb_m64_r64(dst, MEMPARAMS, reg); // sbb [dest],reg
} }
} }
@ -2688,7 +2728,7 @@ static void emit_rcl_r64_p64(drcbe_state *drcbe, x86code **dst, UINT8 reg, const
} }
else else
{ {
emit_mov_r64_p64(drcbe, dst, REG_RCX, param); // mov rcx,param emit_mov_r64_p64_keepflags(drcbe, dst, REG_RCX, param); // mov rcx,param
emit_rcl_r64_cl(dst, reg); // rcl reg,cl emit_rcl_r64_cl(dst, reg); // rcl reg,cl
} }
} }
@ -2710,7 +2750,7 @@ static void emit_rcl_m64_p64(drcbe_state *drcbe, x86code **dst, DECLARE_MEMPARAM
} }
else else
{ {
emit_mov_r64_p64(drcbe, dst, REG_RCX, param); // mov rcx,param emit_mov_r64_p64_keepflags(drcbe, dst, REG_RCX, param); // mov rcx,param
emit_rcl_m64_cl(dst, MEMPARAMS); // rcl [dest],cl emit_rcl_m64_cl(dst, MEMPARAMS); // rcl [dest],cl
} }
} }
@ -2732,7 +2772,7 @@ static void emit_rcr_r64_p64(drcbe_state *drcbe, x86code **dst, UINT8 reg, const
} }
else else
{ {
emit_mov_r64_p64(drcbe, dst, REG_RCX, param); // mov rcx,param emit_mov_r64_p64_keepflags(drcbe, dst, REG_RCX, param); // mov rcx,param
emit_rcr_r64_cl(dst, reg); // rcr reg,cl emit_rcr_r64_cl(dst, reg); // rcr reg,cl
} }
} }
@ -2754,7 +2794,7 @@ static void emit_rcr_m64_p64(drcbe_state *drcbe, x86code **dst, DECLARE_MEMPARAM
} }
else else
{ {
emit_mov_r64_p64(drcbe, dst, REG_RCX, param); // mov rcx,param emit_mov_r64_p64_keepflags(drcbe, dst, REG_RCX, param); // mov rcx,param
emit_rcr_m64_cl(dst, MEMPARAMS); // rcr [dest],cl emit_rcr_m64_cl(dst, MEMPARAMS); // rcr [dest],cl
} }
} }
@ -2838,43 +2878,6 @@ static void emit_movsd_p64_r128(drcbe_state *drcbe, x86code **dst, const drcuml_
/***************************************************************************
HELPERS TO CONVERT OTHER OPERATIONS TO MOVES
***************************************************************************/
/*-------------------------------------------------
convert_to_mov_imm - convert an instruction
into a mov immediate
-------------------------------------------------*/
#if 0
static x86code *convert_to_mov_imm(drcbe_state *drcbe, x86code *dst, const drcuml_instruction *inst, const drcuml_parameter *dstp, UINT64 imm)
{
drcuml_instruction temp = *inst;
temp.numparams = 2;
temp.param[0] = *dstp;
temp.param[1].type = DRCUML_PTYPE_IMMEDIATE;
temp.param[1].value = imm;
return op_mov(drcbe, dst, &temp);
}
/*-------------------------------------------------
convert_to_mov_src1 - convert an instruction
into a mov src1
-------------------------------------------------*/
static x86code *convert_to_mov_src1(drcbe_state *drcbe, x86code *dst, const drcuml_instruction *inst, const drcuml_parameter *dstp, const drcuml_parameter *srcp)
{
drcuml_instruction temp = *inst;
temp.numparams = 2;
temp.param[0] = *dstp;
temp.param[1] = *srcp;
return op_mov(drcbe, dst, &temp);
}
#endif
/*************************************************************************** /***************************************************************************
OUT-OF-BAND CODE FIXUP CALLBACKS OUT-OF-BAND CODE FIXUP CALLBACKS
***************************************************************************/ ***************************************************************************/
@ -4408,7 +4411,7 @@ static x86code *op_mov(drcbe_state *drcbe, x86code *dst, const drcuml_instructio
/* general case */ /* general case */
else else
{ {
emit_mov_r32_p32(drcbe, &dst, dstreg, &srcp); // mov dstreg,srcp emit_mov_r32_p32_keepflags(drcbe, &dst, dstreg, &srcp); // mov dstreg,srcp
emit_mov_p32_r32(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg emit_mov_p32_r32(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg
} }
} }
@ -4445,7 +4448,7 @@ static x86code *op_mov(drcbe_state *drcbe, x86code *dst, const drcuml_instructio
/* general case */ /* general case */
else else
{ {
emit_mov_r64_p64(drcbe, &dst, dstreg, &srcp); // mov dstreg,srcp emit_mov_r64_p64_keepflags(drcbe, &dst, dstreg, &srcp); // mov dstreg,srcp
emit_mov_p64_r64(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg emit_mov_p64_r64(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg
} }
} }
@ -4741,7 +4744,7 @@ static x86code *op_addc(drcbe_state *drcbe, x86code *dst, const drcuml_instructi
/* general case */ /* general case */
else else
{ {
emit_mov_r32_p32(drcbe, &dst, dstreg, &src1p); // mov dstreg,src1p emit_mov_r32_p32_keepflags(drcbe, &dst, dstreg, &src1p); // mov dstreg,src1p
emit_adc_r32_p32(drcbe, &dst, dstreg, &src2p, inst); // adc dstreg,src2p emit_adc_r32_p32(drcbe, &dst, dstreg, &src2p, inst); // adc dstreg,src2p
emit_mov_p32_r32(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg emit_mov_p32_r32(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg
} }
@ -4757,7 +4760,7 @@ static x86code *op_addc(drcbe_state *drcbe, x86code *dst, const drcuml_instructi
/* general case */ /* general case */
else else
{ {
emit_mov_r64_p64(drcbe, &dst, dstreg, &src1p); // mov dstreg,src1p emit_mov_r64_p64_keepflags(drcbe, &dst, dstreg, &src1p); // mov dstreg,src1p
emit_adc_r64_p64(drcbe, &dst, dstreg, &src2p, inst); // adc dstreg,src2p emit_adc_r64_p64(drcbe, &dst, dstreg, &src2p, inst); // adc dstreg,src2p
emit_mov_p64_r64(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg emit_mov_p64_r64(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg
} }
@ -4860,7 +4863,7 @@ static x86code *op_subc(drcbe_state *drcbe, x86code *dst, const drcuml_instructi
/* general case */ /* general case */
else else
{ {
emit_mov_r32_p32(drcbe, &dst, dstreg, &src1p); // mov dstreg,src1p emit_mov_r32_p32_keepflags(drcbe, &dst, dstreg, &src1p); // mov dstreg,src1p
emit_sbb_r32_p32(drcbe, &dst, dstreg, &src2p, inst); // sbb dstreg,src2p emit_sbb_r32_p32(drcbe, &dst, dstreg, &src2p, inst); // sbb dstreg,src2p
emit_mov_p32_r32(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg emit_mov_p32_r32(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg
} }
@ -4876,7 +4879,7 @@ static x86code *op_subc(drcbe_state *drcbe, x86code *dst, const drcuml_instructi
/* general case */ /* general case */
else else
{ {
emit_mov_r64_p64(drcbe, &dst, dstreg, &src1p); // mov dstreg,src1p emit_mov_r64_p64_keepflags(drcbe, &dst, dstreg, &src1p); // mov dstreg,src1p
emit_sbb_r64_p64(drcbe, &dst, dstreg, &src2p, inst); // sbb dstreg,src2p emit_sbb_r64_p64(drcbe, &dst, dstreg, &src2p, inst); // sbb dstreg,src2p
emit_mov_p64_r64(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg emit_mov_p64_r64(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg
} }
@ -5907,7 +5910,7 @@ static x86code *op_rolc(drcbe_state *drcbe, x86code *dst, const drcuml_instructi
/* general case */ /* general case */
else else
{ {
emit_mov_r32_p32(drcbe, &dst, dstreg, &src1p); // mov dstreg,src1p emit_mov_r32_p32_keepflags(drcbe, &dst, dstreg, &src1p); // mov dstreg,src1p
emit_rcl_r32_p32(drcbe, &dst, dstreg, &src2p, inst); // rcl dstreg,src2p emit_rcl_r32_p32(drcbe, &dst, dstreg, &src2p, inst); // rcl dstreg,src2p
emit_mov_p32_r32(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg emit_mov_p32_r32(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg
} }
@ -5923,7 +5926,7 @@ static x86code *op_rolc(drcbe_state *drcbe, x86code *dst, const drcuml_instructi
/* general case */ /* general case */
else else
{ {
emit_mov_r64_p64(drcbe, &dst, dstreg, &src1p); // mov dstreg,src1p emit_mov_r64_p64_keepflags(drcbe, &dst, dstreg, &src1p); // mov dstreg,src1p
emit_rcl_r64_p64(drcbe, &dst, dstreg, &src2p, inst); // rcl dstreg,src2p emit_rcl_r64_p64(drcbe, &dst, dstreg, &src2p, inst); // rcl dstreg,src2p
emit_mov_p64_r64(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg emit_mov_p64_r64(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg
} }
@ -5962,7 +5965,7 @@ static x86code *op_rorc(drcbe_state *drcbe, x86code *dst, const drcuml_instructi
/* general case */ /* general case */
else else
{ {
emit_mov_r32_p32(drcbe, &dst, dstreg, &src1p); // mov dstreg,src1p emit_mov_r32_p32_keepflags(drcbe, &dst, dstreg, &src1p); // mov dstreg,src1p
emit_rcr_r32_p32(drcbe, &dst, dstreg, &src2p, inst); // rcr dstreg,src2p emit_rcr_r32_p32(drcbe, &dst, dstreg, &src2p, inst); // rcr dstreg,src2p
emit_mov_p32_r32(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg emit_mov_p32_r32(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg
} }
@ -5978,7 +5981,7 @@ static x86code *op_rorc(drcbe_state *drcbe, x86code *dst, const drcuml_instructi
/* general case */ /* general case */
else else
{ {
emit_mov_r64_p64(drcbe, &dst, dstreg, &src1p); // mov dstreg,src1p emit_mov_r64_p64_keepflags(drcbe, &dst, dstreg, &src1p); // mov dstreg,src1p
emit_rcr_r64_p64(drcbe, &dst, dstreg, &src2p, inst); // rcr dstreg,src2p emit_rcr_r64_p64(drcbe, &dst, dstreg, &src2p, inst); // rcr dstreg,src2p
emit_mov_p64_r64(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg emit_mov_p64_r64(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg
} }

85
src/emu/cpu/drcbex86.c
View File

@ -1030,6 +1030,26 @@ static void emit_mov_r32_p32(drcbe_state *drcbe, x86code **dst, UINT8 reg, const
} }
/*-------------------------------------------------
emit_mov_r32_p32_keepflags - move a 32-bit
parameter into a register without affecting
any flags
-------------------------------------------------*/
static void emit_mov_r32_p32_keepflags(drcbe_state *drcbe, x86code **dst, UINT8 reg, const drcuml_parameter *param)
{
if (param->type == DRCUML_PTYPE_IMMEDIATE)
emit_mov_r32_imm(dst, reg, param->value); // mov reg,param
else if (param->type == DRCUML_PTYPE_MEMORY)
emit_mov_r32_m32(dst, reg, MABS(param->value)); // mov reg,[param]
else if (param->type == DRCUML_PTYPE_INT_REGISTER)
{
if (reg != param->value)
emit_mov_r32_r32(dst, reg, param->value); // mov reg,param
}
}
/*------------------------------------------------- /*-------------------------------------------------
emit_mov_m32_p32 - move a 32-bit parameter emit_mov_m32_p32 - move a 32-bit parameter
into a memory location into a memory location
@ -1157,7 +1177,7 @@ static void emit_adc_m32_p32(drcbe_state *drcbe, x86code **dst, DECLARE_MEMPARAM
else else
{ {
int reg = param_select_register(REG_EAX, param, NULL); int reg = param_select_register(REG_EAX, param, NULL);
emit_mov_r32_p32(drcbe, dst, reg, param); // mov reg,param emit_mov_r32_p32_keepflags(drcbe, dst, reg, param); // mov reg,param
emit_adc_m32_r32(dst, MEMPARAMS, reg); // adc [dest],reg emit_adc_m32_r32(dst, MEMPARAMS, reg); // adc [dest],reg
} }
} }
@ -1237,7 +1257,7 @@ static void emit_sbb_m32_p32(drcbe_state *drcbe, x86code **dst, DECLARE_MEMPARAM
else else
{ {
int reg = param_select_register(REG_EAX, param, NULL); int reg = param_select_register(REG_EAX, param, NULL);
emit_mov_r32_p32(drcbe, dst, reg, param); // mov reg,param emit_mov_r32_p32_keepflags(drcbe, dst, reg, param); // mov reg,param
emit_sbb_m32_r32(dst, MEMPARAMS, reg); // sbb [dest],reg emit_sbb_m32_r32(dst, MEMPARAMS, reg); // sbb [dest],reg
} }
} }
@ -1730,7 +1750,7 @@ static void emit_rcl_r32_p32(drcbe_state *drcbe, x86code **dst, UINT8 reg, const
} }
else else
{ {
emit_mov_r32_p32(drcbe, dst, REG_ECX, param); // mov ecx,param emit_mov_r32_p32_keepflags(drcbe, dst, REG_ECX, param); // mov ecx,param
emit_rcl_r32_cl(dst, reg); // rcl reg,cl emit_rcl_r32_cl(dst, reg); // rcl reg,cl
} }
} }
@ -1752,7 +1772,7 @@ static void emit_rcl_m32_p32(drcbe_state *drcbe, x86code **dst, DECLARE_MEMPARAM
} }
else else
{ {
emit_mov_r32_p32(drcbe, dst, REG_ECX, param); // mov ecx,param emit_mov_r32_p32_keepflags(drcbe, dst, REG_ECX, param); // mov ecx,param
emit_rcl_m32_cl(dst, MEMPARAMS); // rcl [dest],cl emit_rcl_m32_cl(dst, MEMPARAMS); // rcl [dest],cl
} }
} }
@ -1774,7 +1794,7 @@ static void emit_rcr_r32_p32(drcbe_state *drcbe, x86code **dst, UINT8 reg, const
} }
else else
{ {
emit_mov_r32_p32(drcbe, dst, REG_ECX, param); // mov ecx,param emit_mov_r32_p32_keepflags(drcbe, dst, REG_ECX, param); // mov ecx,param
emit_rcr_r32_cl(dst, reg); // rcr reg,cl emit_rcr_r32_cl(dst, reg); // rcr reg,cl
} }
} }
@ -1796,7 +1816,7 @@ static void emit_rcr_m32_p32(drcbe_state *drcbe, x86code **dst, DECLARE_MEMPARAM
} }
else else
{ {
emit_mov_r32_p32(drcbe, dst, REG_ECX, param); // mov ecx,param emit_mov_r32_p32_keepflags(drcbe, dst, REG_ECX, param); // mov ecx,param
emit_rcr_m32_cl(dst, MEMPARAMS); // rcr [dest],cl emit_rcr_m32_cl(dst, MEMPARAMS); // rcr [dest],cl
} }
} }
@ -1839,6 +1859,33 @@ static void emit_mov_r64_p64(drcbe_state *drcbe, x86code **dst, UINT8 reglo, UIN
} }
/*-------------------------------------------------
emit_mov_r64_p64_keepflags - move a 64-bit
parameter into a pair of registers without
affecting any flags
-------------------------------------------------*/
static void emit_mov_r64_p64_keepflags(drcbe_state *drcbe, x86code **dst, UINT8 reglo, UINT8 reghi, const drcuml_parameter *param)
{
if (param->type == DRCUML_PTYPE_IMMEDIATE)
{
emit_mov_r32_imm(dst, reglo, param->value); // mov reglo,param
emit_mov_r32_imm(dst, reghi, param->value >> 32); // mov reghi,param >> 32
}
else if (param->type == DRCUML_PTYPE_MEMORY)
{
emit_mov_r32_m32(dst, reglo, MABS(param->value)); // mov reglo,[param]
emit_mov_r32_m32(dst, reghi, MABS(param->value + 4)); // mov reghi,[param+4]
}
else if (param->type == DRCUML_PTYPE_INT_REGISTER)
{
if (reglo != param->value)
emit_mov_r32_r32(dst, reglo, param->value); // mov reglo,param
emit_mov_r32_m32(dst, reghi, MABS(drcbe->reghi[param->value])); // mov reghi,reghi[param]
}
}
/*------------------------------------------------- /*-------------------------------------------------
emit_mov_p64_r64 - move a pair of registers emit_mov_p64_r64 - move a pair of registers
into a 64-bit parameter into a 64-bit parameter
@ -1992,7 +2039,7 @@ static void emit_adc_m64_p64(drcbe_state *drcbe, x86code **dst, DECLARE_MEMPARAM
else else
{ {
int reglo = (param->type == DRCUML_PTYPE_INT_REGISTER) ? param->value : REG_EAX; int reglo = (param->type == DRCUML_PTYPE_INT_REGISTER) ? param->value : REG_EAX;
emit_mov_r64_p64(drcbe, dst, reglo, REG_EDX, param); // mov edx:reglo,param emit_mov_r64_p64_keepflags(drcbe, dst, reglo, REG_EDX, param); // mov edx:reglo,param
emit_adc_m32_r32(dst, MEMPARAMS, reglo); // adc [dest],reglo emit_adc_m32_r32(dst, MEMPARAMS, reglo); // adc [dest],reglo
if (saveflags) emit_pushf(dst); // pushf if (saveflags) emit_pushf(dst); // pushf
emit_adc_m32_r32(dst, MEMPARAMS + 4, REG_EDX); // adc [dest+4],edx emit_adc_m32_r32(dst, MEMPARAMS + 4, REG_EDX); // adc [dest+4],edx
@ -2108,7 +2155,7 @@ static void emit_sbb_m64_p64(drcbe_state *drcbe, x86code **dst, DECLARE_MEMPARAM
else else
{ {
int reglo = (param->type == DRCUML_PTYPE_INT_REGISTER) ? param->value : REG_EAX; int reglo = (param->type == DRCUML_PTYPE_INT_REGISTER) ? param->value : REG_EAX;
emit_mov_r64_p64(drcbe, dst, reglo, REG_EDX, param); // mov edx:reglo,param emit_mov_r64_p64_keepflags(drcbe, dst, reglo, REG_EDX, param); // mov edx:reglo,param
emit_sbb_m32_r32(dst, MEMPARAMS, reglo); // sbb [dest],reglo emit_sbb_m32_r32(dst, MEMPARAMS, reglo); // sbb [dest],reglo
if (saveflags) emit_pushf(dst); // pushf if (saveflags) emit_pushf(dst); // pushf
emit_sbb_m32_r32(dst, MEMPARAMS + 4, REG_EDX); // sbb [dest+4],edx emit_sbb_m32_r32(dst, MEMPARAMS + 4, REG_EDX); // sbb [dest+4],edx
@ -2782,7 +2829,7 @@ static void emit_rcl_r64_p64(drcbe_state *drcbe, x86code **dst, UINT8 reglo, UIN
emit_link skipall, skiploop; emit_link skipall, skiploop;
x86code *loop; x86code *loop;
emit_mov_r32_p32(drcbe, dst, REG_ECX, param); // mov ecx,param emit_mov_r32_p32_keepflags(drcbe, dst, REG_ECX, param); // mov ecx,param
if (!saveflags) if (!saveflags)
{ {
loop = *dst; // loop: loop = *dst; // loop:
@ -2824,7 +2871,7 @@ static void emit_rcr_r64_p64(drcbe_state *drcbe, x86code **dst, UINT8 reglo, UIN
emit_link skipall, skiploop; emit_link skipall, skiploop;
x86code *loop; x86code *loop;
emit_mov_r32_p32(drcbe, dst, REG_ECX, param); // mov ecx,param emit_mov_r32_p32_keepflags(drcbe, dst, REG_ECX, param); // mov ecx,param
if (!saveflags) if (!saveflags)
{ {
loop = *dst; // loop: loop = *dst; // loop:
@ -4465,7 +4512,7 @@ static x86code *op_mov(drcbe_state *drcbe, x86code *dst, const drcuml_instructio
/* general case */ /* general case */
else else
{ {
emit_mov_r32_p32(drcbe, &dst, dstreg, &srcp); // mov dstreg,srcp emit_mov_r32_p32_keepflags(drcbe, &dst, dstreg, &srcp); // mov dstreg,srcp
emit_mov_p32_r32(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg emit_mov_p32_r32(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg
} }
} }
@ -4808,7 +4855,7 @@ static x86code *op_addc(drcbe_state *drcbe, x86code *dst, const drcuml_instructi
/* general case */ /* general case */
else else
{ {
emit_mov_r32_p32(drcbe, &dst, dstreg, &src1p); // mov dstreg,src1p emit_mov_r32_p32_keepflags(drcbe, &dst, dstreg, &src1p); // mov dstreg,src1p
emit_adc_r32_p32(drcbe, &dst, dstreg, &src2p, inst); // adc dstreg,src2p emit_adc_r32_p32(drcbe, &dst, dstreg, &src2p, inst); // adc dstreg,src2p
emit_mov_p32_r32(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg emit_mov_p32_r32(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg
} }
@ -4824,7 +4871,7 @@ static x86code *op_addc(drcbe_state *drcbe, x86code *dst, const drcuml_instructi
/* general case */ /* general case */
else else
{ {
emit_mov_r64_p64(drcbe, &dst, dstreg, REG_EDX, &src1p); // mov dstreg:dstp,[src1p] emit_mov_r64_p64_keepflags(drcbe, &dst, dstreg, REG_EDX, &src1p); // mov dstreg:dstp,[src1p]
emit_adc_r64_p64(drcbe, &dst, dstreg, REG_EDX, &src2p, inst); // adc dstreg:dstp,src2p emit_adc_r64_p64(drcbe, &dst, dstreg, REG_EDX, &src2p, inst); // adc dstreg:dstp,src2p
emit_mov_p64_r64(drcbe, &dst, &dstp, dstreg, REG_EDX); // mov dstp,dstreg:eax emit_mov_p64_r64(drcbe, &dst, &dstp, dstreg, REG_EDX); // mov dstp,dstreg:eax
} }
@ -4923,7 +4970,7 @@ static x86code *op_subc(drcbe_state *drcbe, x86code *dst, const drcuml_instructi
/* general case */ /* general case */
else else
{ {
emit_mov_r32_p32(drcbe, &dst, dstreg, &src1p); // mov dstreg,src1p emit_mov_r32_p32_keepflags(drcbe, &dst, dstreg, &src1p); // mov dstreg,src1p
emit_sbb_r32_p32(drcbe, &dst, dstreg, &src2p, inst); // sbb dstreg,src2p emit_sbb_r32_p32(drcbe, &dst, dstreg, &src2p, inst); // sbb dstreg,src2p
emit_mov_p32_r32(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg emit_mov_p32_r32(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg
} }
@ -4939,7 +4986,7 @@ static x86code *op_subc(drcbe_state *drcbe, x86code *dst, const drcuml_instructi
/* general case */ /* general case */
else else
{ {
emit_mov_r64_p64(drcbe, &dst, dstreg, REG_EDX, &src1p); // mov dstreg:dstp,[src1p] emit_mov_r64_p64_keepflags(drcbe, &dst, dstreg, REG_EDX, &src1p); // mov dstreg:dstp,[src1p]
emit_sbb_r64_p64(drcbe, &dst, dstreg, REG_EDX, &src2p, inst); // sbb dstreg:dstp,src2p emit_sbb_r64_p64(drcbe, &dst, dstreg, REG_EDX, &src2p, inst); // sbb dstreg:dstp,src2p
emit_mov_p64_r64(drcbe, &dst, &dstp, dstreg, REG_EDX); // mov dstp,dstreg:eax emit_mov_p64_r64(drcbe, &dst, &dstp, dstreg, REG_EDX); // mov dstp,dstreg:eax
} }
@ -5989,7 +6036,7 @@ static x86code *op_rolc(drcbe_state *drcbe, x86code *dst, const drcuml_instructi
/* general case */ /* general case */
else else
{ {
emit_mov_r32_p32(drcbe, &dst, dstreg, &src1p); // mov dstreg,src1p emit_mov_r32_p32_keepflags(drcbe, &dst, dstreg, &src1p); // mov dstreg,src1p
emit_rcl_r32_p32(drcbe, &dst, dstreg, &src2p, inst); // rcl dstreg,src2p emit_rcl_r32_p32(drcbe, &dst, dstreg, &src2p, inst); // rcl dstreg,src2p
emit_mov_p32_r32(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg emit_mov_p32_r32(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg
} }
@ -5999,7 +6046,7 @@ static x86code *op_rolc(drcbe_state *drcbe, x86code *dst, const drcuml_instructi
else if (inst->size == 8) else if (inst->size == 8)
{ {
/* general case */ /* general case */
emit_mov_r64_p64(drcbe, &dst, dstreg, REG_EDX, &src1p); // mov dstreg:dstp,[src1p] emit_mov_r64_p64_keepflags(drcbe, &dst, dstreg, REG_EDX, &src1p); // mov dstreg:dstp,[src1p]
emit_rcl_r64_p64(drcbe, &dst, dstreg, REG_EDX, &src2p, inst); // rcl dstreg:dstp,src2p emit_rcl_r64_p64(drcbe, &dst, dstreg, REG_EDX, &src2p, inst); // rcl dstreg:dstp,src2p
emit_mov_p64_r64(drcbe, &dst, &dstp, dstreg, REG_EDX); // mov dstp,dstreg:eax emit_mov_p64_r64(drcbe, &dst, &dstp, dstreg, REG_EDX); // mov dstp,dstreg:eax
} }
@ -6037,7 +6084,7 @@ static x86code *op_rorc(drcbe_state *drcbe, x86code *dst, const drcuml_instructi
/* general case */ /* general case */
else else
{ {
emit_mov_r32_p32(drcbe, &dst, dstreg, &src1p); // mov dstreg,src1p emit_mov_r32_p32_keepflags(drcbe, &dst, dstreg, &src1p); // mov dstreg,src1p
emit_rcr_r32_p32(drcbe, &dst, dstreg, &src2p, inst); // rcr dstreg,src2p emit_rcr_r32_p32(drcbe, &dst, dstreg, &src2p, inst); // rcr dstreg,src2p
emit_mov_p32_r32(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg emit_mov_p32_r32(drcbe, &dst, &dstp, dstreg); // mov dstp,dstreg
} }
@ -6047,7 +6094,7 @@ static x86code *op_rorc(drcbe_state *drcbe, x86code *dst, const drcuml_instructi
else if (inst->size == 8) else if (inst->size == 8)
{ {
/* general case */ /* general case */
emit_mov_r64_p64(drcbe, &dst, dstreg, REG_EDX, &src1p); // mov dstreg:dstp,[src1p] emit_mov_r64_p64_keepflags(drcbe, &dst, dstreg, REG_EDX, &src1p); // mov dstreg:dstp,[src1p]
emit_rcr_r64_p64(drcbe, &dst, dstreg, REG_EDX, &src2p, inst); // rcr dstreg:dstp,src2p emit_rcr_r64_p64(drcbe, &dst, dstreg, REG_EDX, &src2p, inst); // rcr dstreg:dstp,src2p
emit_mov_p64_r64(drcbe, &dst, &dstp, dstreg, REG_EDX); // mov dstp,dstreg:eax emit_mov_p64_r64(drcbe, &dst, &dstp, dstreg, REG_EDX); // mov dstp,dstreg:eax
} }