Signed-off-by: Richard Henderson <[email protected]>
---
include/tcg/tcg-op-common.h | 6 ++-
include/tcg/tcg-op-def2.h.inc | 1 +
tcg/tcg-op.c | 96 ++++++++++++++++++++---------------
3 files changed, 60 insertions(+), 43 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index 96fb4d5a47c..f8d65cc98ef 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -101,6 +101,9 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
#define DEF_RRR(NAME) \
void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b, TCGV c);
+#define DEF_RRRR(NAME) \
+ void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b, TCGV c, TCGV d);
+
#define DEF_RRRRR(NAME) \
void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b, TCGV c, TCGV d, TCGV
e);
@@ -148,6 +151,7 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
#undef DEF_R
#undef DEF_RR
#undef DEF_RRR
+#undef DEF_RRRR
#undef DEF_RRRRR
#undef DEF_RRRRRR
#undef DEF_RI
@@ -164,7 +168,6 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
/* 32 bit ops */
-void tcg_gen_mulu2_i32(TCGv_i32 rl, TCGv_i32 rh, TCGv_i32 arg1, TCGv_i32 arg2);
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_ext_i32(TCGv_i32 ret, TCGv_i32 val, MemOp opc);
@@ -190,7 +193,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_mulu2_i64(TCGv_i64 rl, TCGv_i64 rh, TCGv_i64 arg1, TCGv_i64 arg2);
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);
diff --git a/include/tcg/tcg-op-def2.h.inc b/include/tcg/tcg-op-def2.h.inc
index 337733b71a6..24a7f5592ed 100644
--- a/include/tcg/tcg-op-def2.h.inc
+++ b/include/tcg/tcg-op-def2.h.inc
@@ -60,6 +60,7 @@ DEF_RRR(umax)
DEF_RRR(umin)
DEF_RRR(ussub)
DEF_RRR(xor)
+DEF_RRRR(mulu2)
DEF_RRRRR(addcio)
DEF_RRRRRR(add2)
DEF_RRRRRR(sub2)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index ca4440746cb..a12147367ac 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -135,6 +135,13 @@ static TCGOp *gen_op_tttii(TCGOpcode opc, TCGType type,
temp_arg(t2), a3, a4);
}
+static TCGOp *gen_op_tttt(TCGOpcode opc, TCGType type, TCGTemp *t0,
+ TCGTemp *t1, TCGTemp *t2, TCGTemp *t3)
+{
+ return tcg_gen_op4(opc, type, temp_arg(t0), temp_arg(t1),
+ temp_arg(t2), temp_arg(t3));
+}
+
static TCGOp *gen_op_ttttt(TCGOpcode opc, TCGType type,
TCGTemp *t0, TCGTemp *t1, TCGTemp *t2,
TCGTemp *t3, TCGTemp *t4)
@@ -293,6 +300,10 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
#define DEF_RRR(NAME) \
static void glue(gen_,NAME)(TCGType, TCGTemp *, TCGTemp *, TCGTemp *);
+#define DEF_RRRR(NAME) \
+ static void glue(gen_,NAME)(TCGType, TCGTemp *, TCGTemp *, \
+ TCGTemp *, TCGTemp *);
+
#define DEF_RRRRR(NAME) \
static void glue(gen_,NAME)(TCGType, TCGTemp *, TCGTemp *, \
TCGTemp *, TCGTemp *, TCGTemp *);
@@ -343,6 +354,7 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
#undef DEF_R
#undef DEF_RR
#undef DEF_RRR
+#undef DEF_RRRR
#undef DEF_RRRRR
#undef DEF_RRRRRR
#undef DEF_RI
@@ -854,6 +866,44 @@ static void gen_muli(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
}
}
+static void gen_mulu2(TCGType type, TCGTemp *rl, TCGTemp *rh,
+ TCGTemp *src1, TCGTemp *src2)
+{
+ if (tcg_op_supported(INDEX_op_mulu2, type, 0)) {
+ gen_op_tttt(INDEX_op_mulu2, type, rl, rh, src1, src2);
+ } else if (tcg_op_supported(INDEX_op_muluh, type, 0)) {
+ TCGTemp *t = tcg_temp_new_internal(type, TEMP_EBB);
+
+ gen_mul(type, t, src1, src2);
+ gen_op_ttt(INDEX_op_muluh, type, rh, src1, src2);
+ gen_mov(type, rl, t);
+
+ tcg_temp_free_internal(t);
+ } else if (type == TCG_TYPE_I32) {
+ TCGTemp *t0 = tcg_temp_new_internal(TCG_TYPE_I64, TEMP_EBB);
+ TCGTemp *t1 = tcg_temp_new_internal(TCG_TYPE_I64, TEMP_EBB);
+
+ /* Simply extend and use host 64-bit multiply. */
+ gen_extu_i32_i64(t0, src1);
+ gen_extu_i32_i64(t1, src2);
+ gen_mul(TCG_TYPE_I64, t0, t0, t1);
+ gen_extrl_i64_i32(rl, t0);
+ gen_extrh_i64_i32(rh, t0);
+
+ tcg_temp_free_internal(t0);
+ tcg_temp_free_internal(t1);
+ } else {
+ TCGTemp *t = tcg_temp_new_internal(TCG_TYPE_I64, TEMP_EBB);
+
+ gen_mul(TCG_TYPE_I64, t, src1, src2);
+ gen_helper_muluh_i64(temp_tcgv_i64(rh), temp_tcgv_i64(src1),
+ temp_tcgv_i64(src2));
+ gen_mov(TCG_TYPE_I64, rl, t);
+
+ tcg_temp_free_internal(t);
+ }
+}
+
static void gen_nand(TCGType type, TCGTemp *dst, TCGTemp *src1, TCGTemp *src2)
{
if (tcg_op_supported(INDEX_op_nand, type, 0)) {
@@ -1280,6 +1330,10 @@ static void gen_xori(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
DNI void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b, TCGV c) \
{ gen_##NAME(TYPE, TTMP(a), TTMP(b), TTMP(c)); }
+#define DEF_RRRR(NAME) \
+ DNI void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b, TCGV c, TCGV d) \
+ { gen_##NAME(TYPE, TTMP(a), TTMP(b), TTMP(c), TTMP(d)); }
+
#define DEF_RRRRR(NAME) \
DNI void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b, TCGV c, \
TCGV d, TCGV e) \
@@ -1345,6 +1399,7 @@ static void gen_xori(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
#undef DEF_R
#undef DEF_RR
#undef DEF_RRR
+#undef DEF_RRRR
#undef DEF_RRRRR
#undef DEF_RRRRRR
#undef DEF_RI
@@ -1382,28 +1437,6 @@ void tcg_gen_ext_i64(TCGv_i64 dst, TCGv_i64 src, MemOp
mop)
/* 32 bit ops */
-void tcg_gen_mulu2_i32(TCGv_i32 rl, TCGv_i32 rh, TCGv_i32 arg1, TCGv_i32 arg2)
-{
- if (tcg_op_supported(INDEX_op_mulu2, TCG_TYPE_I32, 0)) {
- tcg_gen_op4_i32(INDEX_op_mulu2, rl, rh, arg1, arg2);
- } else if (tcg_op_supported(INDEX_op_muluh, 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_muluh, 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_extu_i32_i64(t0, arg1);
- tcg_gen_extu_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_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)) {
@@ -1889,25 +1922,6 @@ void tcg_gen_addN_i64(int n, TCGv_i64 *r, TCGv_i64 *a,
TCGv_i64 *b)
}
}
-void tcg_gen_mulu2_i64(TCGv_i64 rl, TCGv_i64 rh, TCGv_i64 arg1, TCGv_i64 arg2)
-{
- if (tcg_op_supported(INDEX_op_mulu2, TCG_TYPE_I64, 0)) {
- tcg_gen_op4_i64(INDEX_op_mulu2, rl, rh, arg1, arg2);
- } else if (tcg_op_supported(INDEX_op_muluh, 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_muluh, rh, arg1, arg2);
- tcg_gen_mov_i64(rl, t);
- tcg_temp_free_i64(t);
- } else {
- TCGv_i64 t0 = tcg_temp_ebb_new_i64();
- tcg_gen_mul_i64(t0, arg1, arg2);
- gen_helper_muluh_i64(rh, arg1, arg2);
- tcg_gen_mov_i64(rl, t0);
- tcg_temp_free_i64(t0);
- }
-}
-
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)) {
--
2.53.0
