Signed-off-by: Richard Henderson <[email protected]>
---
include/tcg/tcg-op-common.h | 4 ---
include/tcg/tcg-op-def.h.inc | 1 +
tcg/tcg-op.c | 64 +++++++++++-------------------------
3 files changed, 20 insertions(+), 49 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index 9cc941478ba..0a1ff0c5b19 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -132,8 +132,6 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
/* 32 bit ops */
-void tcg_gen_add2_i32(TCGv_i32 rl, TCGv_i32 rh, TCGv_i32 al,
- TCGv_i32 ah, TCGv_i32 bl, TCGv_i32 bh);
void tcg_gen_sub2_i32(TCGv_i32 rl, TCGv_i32 rh, TCGv_i32 al,
TCGv_i32 ah, TCGv_i32 bl, TCGv_i32 bh);
void tcg_gen_mulu2_i32(TCGv_i32 rl, TCGv_i32 rh, TCGv_i32 arg1, TCGv_i32 arg2);
@@ -160,8 +158,6 @@ void tcg_gen_st_i32(TCGv_i32 arg1, TCGv_ptr arg2,
tcg_target_long offset);
/* 64 bit ops */
-void tcg_gen_add2_i64(TCGv_i64 rl, TCGv_i64 rh, TCGv_i64 al,
- TCGv_i64 ah, TCGv_i64 bl, TCGv_i64 bh);
void tcg_gen_sub2_i64(TCGv_i64 rl, TCGv_i64 rh, TCGv_i64 al,
TCGv_i64 ah, TCGv_i64 bl, TCGv_i64 bh);
void tcg_gen_addN_i64(int n, TCGv_i64 *r, TCGv_i64 *a, TCGv_i64 *b);
diff --git a/include/tcg/tcg-op-def.h.inc b/include/tcg/tcg-op-def.h.inc
index 003384b65df..e9f0b971a2b 100644
--- a/include/tcg/tcg-op-def.h.inc
+++ b/include/tcg/tcg-op-def.h.inc
@@ -4,6 +4,7 @@
DEF2(abs, TCGV, TCGV)
DEF3(add, TCGV, TCGV, TCGV)
DEF3(addi, TCGV, TCGV, TINT)
+DEF6(add2, TCGV, TCGV, TCGV, TCGV, TCGV, TCGV)
DEF5(addcio, TCGV, TCGV, TCGV, TCGV, TCGV)
DEF3(and, TCGV, TCGV, TCGV)
DEF3(andi, TCGV, TCGV, TINT)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index eb59bc37631..0f478e65861 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -346,6 +346,25 @@ void tcg_gen_addi(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
}
}
+void tcg_gen_add2(TCGType type, TCGTemp *rl, TCGTemp *rh, TCGTemp *al,
+ TCGTemp *ah, TCGTemp *bl, TCGTemp *bh)
+{
+ g_autoptr(TCGTemp) t0 = tcg_temp_new_ebb(type);
+
+ if (tcg_op_supported(INDEX_op_addci, type, 0)) {
+ tcg_gen_op_ttt(INDEX_op_addco, type, t0, al, bl);
+ tcg_gen_op_ttt(INDEX_op_addci, type, rh, ah, bh);
+ } else {
+ g_autoptr(TCGTemp) t1 = tcg_temp_new_ebb(type);
+
+ tcg_gen_add(type, t0, al, bl);
+ tcg_gen_setcond(type, TCG_COND_LTU, t1, t0, al);
+ tcg_gen_add(type, rh, ah, bh);
+ tcg_gen_add(type, rh, rh, t1);
+ }
+ tcg_gen_mov(type, rl, t0);
+}
+
void tcg_gen_addcio(TCGType type, TCGTemp *r, TCGTemp *co,
TCGTemp *a, TCGTemp *b, TCGTemp *ci)
{
@@ -1148,28 +1167,6 @@ void tcg_gen_xori(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
/* 32 bit ops */
-void tcg_gen_add2_i32(TCGv_i32 rl, TCGv_i32 rh, TCGv_i32 al,
- TCGv_i32 ah, TCGv_i32 bl, TCGv_i32 bh)
-{
- if (tcg_op_supported(INDEX_op_addci, TCG_TYPE_I32, 0)) {
- TCGv_i32 t0 = tcg_temp_ebb_new_i32();
- tcg_gen_op3_i32(INDEX_op_addco, t0, al, bl);
- tcg_gen_op3_i32(INDEX_op_addci, rh, ah, bh);
- tcg_gen_mov_i32(rl, t0);
- tcg_temp_free_i32(t0);
- } else {
- TCGv_i32 t0 = tcg_temp_ebb_new_i32();
- TCGv_i32 t1 = tcg_temp_ebb_new_i32();
- tcg_gen_add_i32(t0, al, bl);
- tcg_gen_setcond_i32(TCG_COND_LTU, t1, t0, al);
- tcg_gen_add_i32(rh, ah, bh);
- tcg_gen_add_i32(rh, rh, t1);
- tcg_gen_mov_i32(rl, t0);
- tcg_temp_free_i32(t0);
- tcg_temp_free_i32(t1);
- }
-}
-
void tcg_gen_sub2_i32(TCGv_i32 rl, TCGv_i32 rh, TCGv_i32 al,
TCGv_i32 ah, TCGv_i32 bl, TCGv_i32 bh)
{
@@ -1657,29 +1654,6 @@ void tcg_gen_revbit64_i64(TCGv_i64 ret, TCGv_i64 arg)
}
}
-void tcg_gen_add2_i64(TCGv_i64 rl, TCGv_i64 rh, TCGv_i64 al,
- TCGv_i64 ah, TCGv_i64 bl, TCGv_i64 bh)
-{
- if (tcg_op_supported(INDEX_op_addci, TCG_TYPE_REG, 0)) {
- TCGv_i64 t0 = tcg_temp_ebb_new_i64();
-
- tcg_gen_op3_i64(INDEX_op_addco, t0, al, bl);
- tcg_gen_op3_i64(INDEX_op_addci, rh, ah, bh);
- tcg_gen_mov_i64(rl, t0);
- tcg_temp_free_i64(t0);
- } else {
- TCGv_i64 t0 = tcg_temp_ebb_new_i64();
- TCGv_i64 t1 = tcg_temp_ebb_new_i64();
- tcg_gen_add_i64(t0, al, bl);
- tcg_gen_setcond_i64(TCG_COND_LTU, t1, t0, al);
- tcg_gen_add_i64(rh, ah, bh);
- tcg_gen_add_i64(rh, rh, t1);
- tcg_gen_mov_i64(rl, t0);
- tcg_temp_free_i64(t0);
- tcg_temp_free_i64(t1);
- }
-}
-
void tcg_gen_addN_i64(int n, TCGv_i64 *r, TCGv_i64 *a, TCGv_i64 *b)
{
tcg_debug_assert(n > 2);
--
2.53.0
