mirror of https://github.com/xemu-project/xemu.git
tcg/i386: Pass x86 condition codes to tcg_out_cmov
Hoist the tcg_cond_to_jcc index outside the function. Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
9f56661410
commit
c95da56bfe
|
@ -1699,14 +1699,14 @@ static void tcg_out_setcond2(TCGContext *s, const TCGArg *args,
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static void tcg_out_cmov(TCGContext *s, TCGCond cond, int rexw,
|
static void tcg_out_cmov(TCGContext *s, int jcc, int rexw,
|
||||||
TCGReg dest, TCGReg v1)
|
TCGReg dest, TCGReg v1)
|
||||||
{
|
{
|
||||||
if (have_cmov) {
|
if (have_cmov) {
|
||||||
tcg_out_modrm(s, OPC_CMOVCC | tcg_cond_to_jcc[cond] | rexw, dest, v1);
|
tcg_out_modrm(s, OPC_CMOVCC | jcc | rexw, dest, v1);
|
||||||
} else {
|
} else {
|
||||||
TCGLabel *over = gen_new_label();
|
TCGLabel *over = gen_new_label();
|
||||||
tcg_out_jxx(s, tcg_cond_to_jcc[tcg_invert_cond(cond)], over, 1);
|
tcg_out_jxx(s, jcc ^ 1, over, 1);
|
||||||
tcg_out_mov(s, TCG_TYPE_I32, dest, v1);
|
tcg_out_mov(s, TCG_TYPE_I32, dest, v1);
|
||||||
tcg_out_label(s, over);
|
tcg_out_label(s, over);
|
||||||
}
|
}
|
||||||
|
@ -1717,7 +1717,7 @@ static void tcg_out_movcond(TCGContext *s, int rexw, TCGCond cond,
|
||||||
TCGReg v1)
|
TCGReg v1)
|
||||||
{
|
{
|
||||||
tcg_out_cmp(s, c1, c2, const_c2, rexw);
|
tcg_out_cmp(s, c1, c2, const_c2, rexw);
|
||||||
tcg_out_cmov(s, cond, rexw, dest, v1);
|
tcg_out_cmov(s, tcg_cond_to_jcc[cond], rexw, dest, v1);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void tcg_out_ctz(TCGContext *s, int rexw, TCGReg dest, TCGReg arg1,
|
static void tcg_out_ctz(TCGContext *s, int rexw, TCGReg dest, TCGReg arg1,
|
||||||
|
@ -1729,12 +1729,12 @@ static void tcg_out_ctz(TCGContext *s, int rexw, TCGReg dest, TCGReg arg1,
|
||||||
tcg_debug_assert(arg2 == (rexw ? 64 : 32));
|
tcg_debug_assert(arg2 == (rexw ? 64 : 32));
|
||||||
} else {
|
} else {
|
||||||
tcg_debug_assert(dest != arg2);
|
tcg_debug_assert(dest != arg2);
|
||||||
tcg_out_cmov(s, TCG_COND_LTU, rexw, dest, arg2);
|
tcg_out_cmov(s, JCC_JB, rexw, dest, arg2);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
tcg_debug_assert(dest != arg2);
|
tcg_debug_assert(dest != arg2);
|
||||||
tcg_out_modrm(s, OPC_BSF + rexw, dest, arg1);
|
tcg_out_modrm(s, OPC_BSF + rexw, dest, arg1);
|
||||||
tcg_out_cmov(s, TCG_COND_EQ, rexw, dest, arg2);
|
tcg_out_cmov(s, JCC_JE, rexw, dest, arg2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1747,7 +1747,7 @@ static void tcg_out_clz(TCGContext *s, int rexw, TCGReg dest, TCGReg arg1,
|
||||||
tcg_debug_assert(arg2 == (rexw ? 64 : 32));
|
tcg_debug_assert(arg2 == (rexw ? 64 : 32));
|
||||||
} else {
|
} else {
|
||||||
tcg_debug_assert(dest != arg2);
|
tcg_debug_assert(dest != arg2);
|
||||||
tcg_out_cmov(s, TCG_COND_LTU, rexw, dest, arg2);
|
tcg_out_cmov(s, JCC_JB, rexw, dest, arg2);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
tcg_debug_assert(!const_a2);
|
tcg_debug_assert(!const_a2);
|
||||||
|
@ -1760,7 +1760,7 @@ static void tcg_out_clz(TCGContext *s, int rexw, TCGReg dest, TCGReg arg1,
|
||||||
|
|
||||||
/* Since we have destroyed the flags from BSR, we have to re-test. */
|
/* Since we have destroyed the flags from BSR, we have to re-test. */
|
||||||
tcg_out_cmp(s, arg1, 0, 1, rexw);
|
tcg_out_cmp(s, arg1, 0, 1, rexw);
|
||||||
tcg_out_cmov(s, TCG_COND_EQ, rexw, dest, arg2);
|
tcg_out_cmov(s, JCC_JE, rexw, dest, arg2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue