Signed-off-by: Richard Henderson <[email protected]>
---
include/tcg/tcg-op-common.h | 2 --
include/tcg/tcg-op-def2.h.inc | 1 +
tcg/tcg-op.c | 52 ++++++++++++++++-------------------
3 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index 4476f9dbfb3..c5f1edd6218 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -121,7 +121,6 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
/* 32 bit ops */
-void tcg_gen_div_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2);
void tcg_gen_rem_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2);
void tcg_gen_divu_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2);
void tcg_gen_remu_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2);
@@ -203,7 +202,6 @@ void tcg_gen_st_i32(TCGv_i32 arg1, TCGv_ptr arg2,
tcg_target_long offset);
/* 64 bit ops */
-void tcg_gen_div_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2);
void tcg_gen_rem_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2);
void tcg_gen_divu_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2);
void tcg_gen_remu_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2);
diff --git a/include/tcg/tcg-op-def2.h.inc b/include/tcg/tcg-op-def2.h.inc
index e3935b850cb..9ee7db8b60e 100644
--- a/include/tcg/tcg-op-def2.h.inc
+++ b/include/tcg/tcg-op-def2.h.inc
@@ -17,6 +17,7 @@ DEF_RRI(subi)
DEF_RRI(xori)
DEF_RRR(add)
DEF_RRR(and)
+DEF_RRR(div)
DEF_RRR(mul)
DEF_RRR(or)
DEF_RRR(sar)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 26e1d441661..84f06b8593b 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -121,6 +121,14 @@ static TCGOp *gen_op_ttii(TCGOpcode opc, TCGType type,
return tcg_gen_op4(opc, type, temp_arg(t0), temp_arg(t1), a2, a3);
}
+static TCGOp *gen_op_ttttt(TCGOpcode opc, TCGType type,
+ TCGTemp *t0, TCGTemp *t1, TCGTemp *t2,
+ TCGTemp *t3, TCGTemp *t4)
+{
+ return tcg_gen_op5(opc, type, temp_arg(t0), temp_arg(t1), temp_arg(t2),
+ temp_arg(t3), temp_arg(t4));
+}
+
/*
* With CONFIG_DEBUG_TCG, tcgv_*_tmp via tcgv_*_arg, is an out-of-line
* assertion check. Force tail calls to avoid too much code expansion.
@@ -407,6 +415,22 @@ static void gen_discard(TCGType type, TCGTemp *src)
tcg_gen_op1(INDEX_op_discard, type, temp_arg(src));
}
+static void gen_div(TCGType type, TCGTemp *dst, TCGTemp *src1, TCGTemp *src2)
+{
+ if (tcg_op_supported(INDEX_op_divs, type, 0)) {
+ gen_op_ttt(INDEX_op_divs, type, dst, src1, src2);
+ } else if (tcg_op_supported(INDEX_op_divs2, type, 0)) {
+ TCGTemp *tmp = tcg_temp_new_internal(type, TEMP_EBB);
+ int width = tcg_type_size(type) * 8;
+
+ gen_sari(type, tmp, src1, width - 1);
+ gen_op_ttttt(INDEX_op_divs2, type, dst, tmp, src1, tmp, src2);
+ tcg_temp_free_internal(tmp);
+ } else {
+ g_assert_not_reached();
+ }
+}
+
static void gen_mov(TCGType type, TCGTemp *dst, TCGTemp *src)
{
if (src != dst) {
@@ -642,20 +666,6 @@ void tcg_gen_negsetcondi_i32(TCGCond cond, TCGv_i32 ret,
tcg_gen_negsetcond_i32(cond, ret, arg1, tcg_constant_i32(arg2));
}
-void tcg_gen_div_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2)
-{
- if (tcg_op_supported(INDEX_op_divs, TCG_TYPE_I32, 0)) {
- tcg_gen_op3_i32(INDEX_op_divs, ret, arg1, arg2);
- } else if (tcg_op_supported(INDEX_op_divs2, TCG_TYPE_I32, 0)) {
- TCGv_i32 t0 = tcg_temp_ebb_new_i32();
- tcg_gen_sari_i32(t0, arg1, 31);
- tcg_gen_op5_i32(INDEX_op_divs2, ret, t0, arg1, t0, arg2);
- tcg_temp_free_i32(t0);
- } else {
- g_assert_not_reached();
- }
-}
-
void tcg_gen_rem_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2)
{
if (tcg_op_supported(INDEX_op_rems, TCG_TYPE_I32, 0)) {
@@ -1570,20 +1580,6 @@ void tcg_gen_negsetcond_i64(TCGCond cond, TCGv_i64 ret,
}
}
-void tcg_gen_div_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2)
-{
- if (tcg_op_supported(INDEX_op_divs, TCG_TYPE_I64, 0)) {
- tcg_gen_op3_i64(INDEX_op_divs, ret, arg1, arg2);
- } else if (tcg_op_supported(INDEX_op_divs2, TCG_TYPE_I64, 0)) {
- TCGv_i64 t0 = tcg_temp_ebb_new_i64();
- tcg_gen_sari_i64(t0, arg1, 63);
- tcg_gen_op5_i64(INDEX_op_divs2, ret, t0, arg1, t0, arg2);
- tcg_temp_free_i64(t0);
- } else {
- g_assert_not_reached();
- }
-}
-
void tcg_gen_rem_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2)
{
if (tcg_op_supported(INDEX_op_rems, TCG_TYPE_I64, 0)) {
--
2.53.0
