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 | 62 +++++++++++++----------------------
3 files changed, 23 insertions(+), 42 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index c5f1edd6218..20ccdbd0c95 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_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);
void tcg_gen_andc_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2);
@@ -202,7 +201,6 @@ void tcg_gen_st_i32(TCGv_i32 arg1, TCGv_ptr arg2,
tcg_target_long offset);
/* 64 bit ops */
-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);
void tcg_gen_andc_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 9ee7db8b60e..56d7d2c6bfc 100644
--- a/include/tcg/tcg-op-def2.h.inc
+++ b/include/tcg/tcg-op-def2.h.inc
@@ -20,6 +20,7 @@ DEF_RRR(and)
DEF_RRR(div)
DEF_RRR(mul)
DEF_RRR(or)
+DEF_RRR(rem)
DEF_RRR(sar)
DEF_RRR(shl)
DEF_RRR(shr)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 84f06b8593b..bdbd9244864 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -490,6 +490,28 @@ static void gen_ori(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
}
}
+static void gen_rem(TCGType type, TCGTemp *dst, TCGTemp *src1, TCGTemp *src2)
+{
+ if (tcg_op_supported(INDEX_op_rems, type, 0)) {
+ gen_op_ttt(INDEX_op_rems, type, dst, src1, src2);
+ } else {
+ TCGTemp *tmp = tcg_temp_new_internal(type, TEMP_EBB);
+
+ if (tcg_op_supported(INDEX_op_divs, type, 0)) {
+ gen_op_ttt(INDEX_op_divs, type, tmp, src1, src2);
+ gen_mul(type, tmp, tmp, src2);
+ gen_sub(type, dst, src1, tmp);
+ } else if (tcg_op_supported(INDEX_op_divs2, type, 0)) {
+ int width = tcg_type_size(type) * 8;
+ gen_sari(type, tmp, src1, width - 1);
+ gen_op_ttttt(INDEX_op_divs2, type, tmp, dst, src1, tmp, src2);
+ } else {
+ g_assert_not_reached();
+ }
+ tcg_temp_free_internal(tmp);
+ }
+}
+
static void gen_sar(TCGType type, TCGTemp *dst, TCGTemp *src1, TCGTemp *src2)
{
gen_op_ttt(INDEX_op_sar, type, dst, src1, src2);
@@ -666,26 +688,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_rem_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2)
-{
- if (tcg_op_supported(INDEX_op_rems, TCG_TYPE_I32, 0)) {
- tcg_gen_op3_i32(INDEX_op_rems, ret, arg1, arg2);
- } else if (tcg_op_supported(INDEX_op_divs, TCG_TYPE_I32, 0)) {
- TCGv_i32 t0 = tcg_temp_ebb_new_i32();
- tcg_gen_op3_i32(INDEX_op_divs, t0, arg1, arg2);
- tcg_gen_mul_i32(t0, t0, arg2);
- tcg_gen_sub_i32(ret, arg1, t0);
- tcg_temp_free_i32(t0);
- } 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, t0, ret, arg1, t0, arg2);
- tcg_temp_free_i32(t0);
- } else {
- g_assert_not_reached();
- }
-}
-
void tcg_gen_divu_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2)
{
if (tcg_op_supported(INDEX_op_divu, TCG_TYPE_I32, 0)) {
@@ -1580,26 +1582,6 @@ void tcg_gen_negsetcond_i64(TCGCond cond, TCGv_i64 ret,
}
}
-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)) {
- tcg_gen_op3_i64(INDEX_op_rems, ret, arg1, arg2);
- } else if (tcg_op_supported(INDEX_op_divs, TCG_TYPE_I64, 0)) {
- TCGv_i64 t0 = tcg_temp_ebb_new_i64();
- tcg_gen_op3_i64(INDEX_op_divs, t0, arg1, arg2);
- tcg_gen_mul_i64(t0, t0, arg2);
- tcg_gen_sub_i64(ret, arg1, t0);
- tcg_temp_free_i64(t0);
- } 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, t0, ret, arg1, t0, arg2);
- tcg_temp_free_i64(t0);
- } else {
- g_assert_not_reached();
- }
-}
-
void tcg_gen_divu_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2)
{
if (tcg_op_supported(INDEX_op_divu, TCG_TYPE_I64, 0)) {
--
2.53.0
