Signed-off-by: Richard Henderson <[email protected]>
---
include/tcg/tcg-op-common.h | 2 -
include/tcg/tcg-op-def.h.inc | 1 +
tcg/tcg-op.c | 131 +++++++++++++----------------------
3 files changed, 51 insertions(+), 83 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index 3ad966b72c1..b0ce35df411 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -132,7 +132,6 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
/* 32 bit ops */
-void tcg_gen_muls2_i32(TCGv_i32 rl, TCGv_i32 rh, TCGv_i32 arg1, TCGv_i32 arg2);
void tcg_gen_mulsu2_i32(TCGv_i32 rl, TCGv_i32 rh, TCGv_i32 arg1, TCGv_i32
arg2);
void tcg_gen_bswap16_i32(TCGv_i32 ret, TCGv_i32 arg, int flags);
void tcg_gen_bswap32_i32(TCGv_i32 ret, TCGv_i32 arg);
@@ -156,7 +155,6 @@ void tcg_gen_st_i32(TCGv_i32 arg1, TCGv_ptr arg2,
tcg_target_long offset);
/* 64 bit ops */
void tcg_gen_addN_i64(int n, TCGv_i64 *r, TCGv_i64 *a, TCGv_i64 *b);
-void tcg_gen_muls2_i64(TCGv_i64 rl, TCGv_i64 rh, TCGv_i64 arg1, TCGv_i64 arg2);
void tcg_gen_mulsu2_i64(TCGv_i64 rl, TCGv_i64 rh, TCGv_i64 arg1, TCGv_i64
arg2);
void tcg_gen_ext32s_i64(TCGv_i64 ret, TCGv_i64 arg);
void tcg_gen_ext32u_i64(TCGv_i64 ret, TCGv_i64 arg);
diff --git a/include/tcg/tcg-op-def.h.inc b/include/tcg/tcg-op-def.h.inc
index 75ada0d0473..5e169258ea3 100644
--- a/include/tcg/tcg-op-def.h.inc
+++ b/include/tcg/tcg-op-def.h.inc
@@ -34,6 +34,7 @@ DEF2(movi, TCGV, TINT)
DEF6(movcond, TCGCond, TCGV, TCGV, TCGV, TCGV, TCGV)
DEF3(mul, TCGV, TCGV, TCGV)
DEF3(muli, TCGV, TCGV, TINT)
+DEF4(muls2, TCGV, TCGV, TCGV, TCGV)
DEF4(mulu2, TCGV, TCGV, TCGV, TCGV)
DEF3(nand, TCGV, TCGV, TCGV)
DEF2(neg, TCGV, TCGV)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 5219140f5fb..d58d1c81c4b 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -183,13 +183,6 @@ static void DNI tcg_gen_op2_i64(TCGOpcode opc, TCGv_i64
a1, TCGv_i64 a2)
tcg_gen_op2(opc, TCG_TYPE_I64, tcgv_i64_arg(a1), tcgv_i64_arg(a2));
}
-static void DNI tcg_gen_op3_i32(TCGOpcode opc, TCGv_i32 a1,
- TCGv_i32 a2, TCGv_i32 a3)
-{
- tcg_gen_op3(opc, TCG_TYPE_I32, tcgv_i32_arg(a1),
- tcgv_i32_arg(a2), tcgv_i32_arg(a3));
-}
-
static void DNI tcg_gen_op3_i64(TCGOpcode opc, TCGv_i64 a1,
TCGv_i64 a2, TCGv_i64 a3)
{
@@ -223,20 +216,6 @@ static void DNI tcg_gen_ldst_op_i64(TCGOpcode opc,
TCGv_i64 val,
tcgv_ptr_arg(base), offset);
}
-static void DNI tcg_gen_op4_i32(TCGOpcode opc, TCGv_i32 a1, TCGv_i32 a2,
- TCGv_i32 a3, TCGv_i32 a4)
-{
- tcg_gen_op4(opc, TCG_TYPE_I32, tcgv_i32_arg(a1), tcgv_i32_arg(a2),
- tcgv_i32_arg(a3), tcgv_i32_arg(a4));
-}
-
-static void DNI tcg_gen_op4_i64(TCGOpcode opc, TCGv_i64 a1, TCGv_i64 a2,
- TCGv_i64 a3, TCGv_i64 a4)
-{
- tcg_gen_op4(opc, TCG_TYPE_I64, tcgv_i64_arg(a1), tcgv_i64_arg(a2),
- tcgv_i64_arg(a3), tcgv_i64_arg(a4));
-}
-
/* Generic ops. */
void gen_set_label(TCGLabel *l)
@@ -889,6 +868,56 @@ static void gen_muli(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
}
}
+static void gen_muls2(TCGType type, TCGTemp *rl, TCGTemp *rh,
+ TCGTemp *src1, TCGTemp *src2)
+{
+ if (tcg_op_supported(INDEX_op_muls2, type, 0)) {
+ gen_op_tttt(INDEX_op_muls2, type, rl, rh, src1, src2);
+ } else if (tcg_op_supported(INDEX_op_mulsh, TCG_TYPE_I32, 0)) {
+ g_autoptr(TCGTemp) t = tcg_temp_new_ebb(type);
+
+ gen_mul(type, t, src1, src2);
+ gen_op_ttt(INDEX_op_mulsh, type, rh, src1, src2);
+ gen_mov(type, rl, t);
+ } else if (type == TCG_TYPE_I32) {
+ g_autoptr(TCGTemp) t0 = tcg_temp_new_ebb(type);
+ g_autoptr(TCGTemp) t1 = tcg_temp_new_ebb(type);
+
+ /* Simply extend and use host 64-bit multiply. */
+ gen_ext_i32_i64(t0, src1);
+ gen_ext_i32_i64(t1, src2);
+ gen_mul(TCG_TYPE_I64, t0, t0, t1);
+ gen_extrl_i64_i32(rl, t0);
+ gen_extrh_i64_i32(rh, t0);
+ } else if (tcg_op_supported(INDEX_op_mulu2, TCG_TYPE_I64, 0) ||
+ tcg_op_supported(INDEX_op_muluh, TCG_TYPE_I64, 0)) {
+ g_autoptr(TCGTemp) t0 = tcg_temp_new_ebb(type);
+ g_autoptr(TCGTemp) t1 = tcg_temp_new_ebb(type);
+ g_autoptr(TCGTemp) t2 = NULL;
+ g_autoptr(TCGTemp) t3 = NULL;
+
+ gen_mulu2(TCG_TYPE_I64, t0, t1, src1, src2);
+
+ /* Adjust for negative inputs. */
+ t2 = tcg_temp_new_ebb(type);
+ t3 = tcg_temp_new_ebb(type);
+ gen_sari(TCG_TYPE_I64, t2, src1, 63);
+ gen_sari(TCG_TYPE_I64, t3, src2, 63);
+ gen_and(TCG_TYPE_I64, t2, t2, src2);
+ gen_and(TCG_TYPE_I64, t3, t3, src1);
+ gen_sub(TCG_TYPE_I64, rh, t1, t2);
+ gen_sub(TCG_TYPE_I64, rh, rh, t3);
+ gen_mov(TCG_TYPE_I64, rl, t0);
+ } else {
+ g_autoptr(TCGTemp) t = tcg_temp_new_ebb(type);
+
+ gen_mul(TCG_TYPE_I64, t, src1, src2);
+ gen_helper_mulsh_i64(temp_tcgv_i64(rh), temp_tcgv_i64(src1),
+ temp_tcgv_i64(src2));
+ gen_mov(TCG_TYPE_I64, rl, t);
+ }
+}
+
static void gen_mulu2(TCGType type, TCGTemp *rl, TCGTemp *rh,
TCGTemp *src1, TCGTemp *src2)
{
@@ -1327,28 +1356,6 @@ static void gen_xori(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
/* 32 bit ops */
-void tcg_gen_muls2_i32(TCGv_i32 rl, TCGv_i32 rh, TCGv_i32 arg1, TCGv_i32 arg2)
-{
- if (tcg_op_supported(INDEX_op_muls2, TCG_TYPE_I32, 0)) {
- tcg_gen_op4_i32(INDEX_op_muls2, rl, rh, arg1, arg2);
- } else if (tcg_op_supported(INDEX_op_mulsh, TCG_TYPE_I32, 0)) {
- TCGv_i32 t = tcg_temp_ebb_new_i32();
- tcg_gen_op3_i32(INDEX_op_mul, t, arg1, arg2);
- tcg_gen_op3_i32(INDEX_op_mulsh, rh, arg1, arg2);
- tcg_gen_mov_i32(rl, t);
- tcg_temp_free_i32(t);
- } else {
- TCGv_i64 t0 = tcg_temp_ebb_new_i64();
- TCGv_i64 t1 = tcg_temp_ebb_new_i64();
- tcg_gen_ext_i32_i64(t0, arg1);
- tcg_gen_ext_i32_i64(t1, arg2);
- tcg_gen_mul_i64(t0, t0, t1);
- tcg_gen_extr_i64_i32(rl, rh, t0);
- tcg_temp_free_i64(t0);
- tcg_temp_free_i64(t1);
- }
-}
-
void tcg_gen_mulsu2_i32(TCGv_i32 rl, TCGv_i32 rh, TCGv_i32 arg1, TCGv_i32 arg2)
{
TCGv_i64 t0 = tcg_temp_ebb_new_i64();
@@ -1812,44 +1819,6 @@ void tcg_gen_addN_i64(int n, TCGv_i64 *r, TCGv_i64 *a,
TCGv_i64 *b)
}
}
-void tcg_gen_muls2_i64(TCGv_i64 rl, TCGv_i64 rh, TCGv_i64 arg1, TCGv_i64 arg2)
-{
- if (tcg_op_supported(INDEX_op_muls2, TCG_TYPE_I64, 0)) {
- tcg_gen_op4_i64(INDEX_op_muls2, rl, rh, arg1, arg2);
- } else if (tcg_op_supported(INDEX_op_mulsh, TCG_TYPE_I64, 0)) {
- TCGv_i64 t = tcg_temp_ebb_new_i64();
- tcg_gen_op3_i64(INDEX_op_mul, t, arg1, arg2);
- tcg_gen_op3_i64(INDEX_op_mulsh, rh, arg1, arg2);
- tcg_gen_mov_i64(rl, t);
- tcg_temp_free_i64(t);
- } else if (tcg_op_supported(INDEX_op_mulu2, TCG_TYPE_I64, 0) ||
- tcg_op_supported(INDEX_op_muluh, TCG_TYPE_I64, 0)) {
- TCGv_i64 t0 = tcg_temp_ebb_new_i64();
- TCGv_i64 t1 = tcg_temp_ebb_new_i64();
- TCGv_i64 t2 = tcg_temp_ebb_new_i64();
- TCGv_i64 t3 = tcg_temp_ebb_new_i64();
- tcg_gen_mulu2_i64(t0, t1, arg1, arg2);
- /* Adjust for negative inputs. */
- tcg_gen_sari_i64(t2, arg1, 63);
- tcg_gen_sari_i64(t3, arg2, 63);
- tcg_gen_and_i64(t2, t2, arg2);
- tcg_gen_and_i64(t3, t3, arg1);
- tcg_gen_sub_i64(rh, t1, t2);
- tcg_gen_sub_i64(rh, rh, t3);
- tcg_gen_mov_i64(rl, t0);
- tcg_temp_free_i64(t0);
- tcg_temp_free_i64(t1);
- tcg_temp_free_i64(t2);
- tcg_temp_free_i64(t3);
- } else {
- TCGv_i64 t0 = tcg_temp_ebb_new_i64();
- tcg_gen_mul_i64(t0, arg1, arg2);
- gen_helper_mulsh_i64(rh, arg1, arg2);
- tcg_gen_mov_i64(rl, t0);
- tcg_temp_free_i64(t0);
- }
-}
-
void tcg_gen_mulsu2_i64(TCGv_i64 rl, TCGv_i64 rh, TCGv_i64 arg1, TCGv_i64 arg2)
{
TCGv_i64 t0 = tcg_temp_ebb_new_i64();
--
2.53.0
