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 | 77 +++++++++++-------------------------
3 files changed, 24 insertions(+), 58 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index c60135d2fe4..60a0dfddf25 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -136,8 +136,6 @@ 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_addcio_i32(TCGv_i32 r, TCGv_i32 co,
- TCGv_i32 a, TCGv_i32 b, TCGv_i32 ci);
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);
@@ -166,8 +164,6 @@ 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_addcio_i64(TCGv_i64 r, TCGv_i64 co,
- TCGv_i64 a, TCGv_i64 b, TCGv_i64 ci);
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);
diff --git a/include/tcg/tcg-op-def.h.inc b/include/tcg/tcg-op-def.h.inc
index 1f6b3e2c464..141c18061e8 100644
--- a/include/tcg/tcg-op-def.h.inc
+++ b/include/tcg/tcg-op-def.h.inc
@@ -3,6 +3,7 @@
DEF2(abs, TCGV, TCGV)
DEF3(add, TCGV, TCGV, TCGV)
DEF3(addi, TCGV, TCGV, TINT)
+DEF5(addcio, TCGV, TCGV, TCGV, TCGV, TCGV)
DEF3(and, TCGV, TCGV, TCGV)
DEF3(andi, TCGV, TCGV, TINT)
DEF3(andc, TCGV, TCGV, TCGV)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 04faf9bb69a..c534acbdc74 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -430,6 +430,29 @@ static void gen_addi(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
}
}
+static void gen_addcio(TCGType type, TCGTemp *r, TCGTemp *co,
+ TCGTemp *a, TCGTemp *b, TCGTemp *ci)
+{
+ g_autoptr(TCGTemp) t0 = tcg_temp_new_ebb(type);
+
+ if (tcg_op_supported(INDEX_op_addci, type, 0)) {
+ TCGTemp *zero = tcg_constant_internal(type, 0);
+ TCGTemp *mone = tcg_constant_internal(type, -1);
+
+ gen_op_ttt(INDEX_op_addco, type, t0, ci, mone);
+ gen_op_ttt(INDEX_op_addcio, type, r, a, b);
+ gen_op_ttt(INDEX_op_addci, type, co, zero, zero);
+ } else {
+ g_autoptr(TCGTemp) t1 = tcg_temp_new_ebb(type);
+
+ gen_add(type, t0, a, b);
+ gen_setcond(type, TCG_COND_LTU, t1, t0, a);
+ gen_add(type, r, t0, ci);
+ gen_setcond(type, TCG_COND_LTU, t0, r, t0);
+ gen_or(type, co, t0, t1);
+ }
+}
+
static void gen_and(TCGType type, TCGTemp *dst, TCGTemp *src1, TCGTemp *src2)
{
gen_op_ttt(INDEX_op_and, type, dst, src1, src2);
@@ -1250,33 +1273,6 @@ void tcg_gen_add2_i32(TCGv_i32 rl, TCGv_i32 rh, TCGv_i32
al,
}
}
-void tcg_gen_addcio_i32(TCGv_i32 r, TCGv_i32 co,
- TCGv_i32 a, TCGv_i32 b, TCGv_i32 ci)
-{
- if (tcg_op_supported(INDEX_op_addci, TCG_TYPE_I32, 0)) {
- TCGv_i32 t0 = tcg_temp_ebb_new_i32();
- TCGv_i32 zero = tcg_constant_i32(0);
- TCGv_i32 mone = tcg_constant_i32(-1);
-
- tcg_gen_op3_i32(INDEX_op_addco, t0, ci, mone);
- tcg_gen_op3_i32(INDEX_op_addcio, r, a, b);
- tcg_gen_op3_i32(INDEX_op_addci, co, zero, zero);
- 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, a, b);
- tcg_gen_setcond_i32(TCG_COND_LTU, t1, t0, a);
- tcg_gen_add_i32(r, t0, ci);
- tcg_gen_setcond_i32(TCG_COND_LTU, t0, r, t0);
- tcg_gen_or_i32(co, t0, t1);
-
- 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)
{
@@ -1787,33 +1783,6 @@ void tcg_gen_add2_i64(TCGv_i64 rl, TCGv_i64 rh, TCGv_i64
al,
}
}
-void tcg_gen_addcio_i64(TCGv_i64 r, TCGv_i64 co,
- TCGv_i64 a, TCGv_i64 b, TCGv_i64 ci)
-{
- if (tcg_op_supported(INDEX_op_addci, TCG_TYPE_I64, 0)) {
- TCGv_i64 discard = tcg_temp_ebb_new_i64();
- TCGv_i64 zero = tcg_constant_i64(0);
- TCGv_i64 mone = tcg_constant_i64(-1);
-
- tcg_gen_op3_i64(INDEX_op_addco, discard, ci, mone);
- tcg_gen_op3_i64(INDEX_op_addcio, r, a, b);
- tcg_gen_op3_i64(INDEX_op_addci, co, zero, zero);
- tcg_temp_free_i64(discard);
- } else {
- TCGv_i64 t0 = tcg_temp_ebb_new_i64();
- TCGv_i64 t1 = tcg_temp_ebb_new_i64();
-
- tcg_gen_add_i64(t0, a, b);
- tcg_gen_setcond_i64(TCG_COND_LTU, t1, t0, a);
- tcg_gen_add_i64(r, t0, ci);
- tcg_gen_setcond_i64(TCG_COND_LTU, t0, r, t0);
- tcg_gen_or_i64(co, t0, t1);
-
- 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
