Signed-off-by: Richard Henderson <[email protected]>
---
include/tcg/tcg-op-common.h | 8 +--
include/tcg/tcg-op-def2.h.inc | 1 +
tcg/tcg-op.c | 91 ++++++++++++++---------------------
3 files changed, 42 insertions(+), 58 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index 489121d478c..7f67b8972d1 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_RRRRR(NAME) \
+ void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b, TCGV c, TCGV d, TCGV
e);
+
#define DEF_RI(NAME) \
void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TINT b);
@@ -141,6 +144,7 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
#undef DEF_R
#undef DEF_RR
#undef DEF_RRR
+#undef DEF_RRRRR
#undef DEF_RI
#undef DEF_RRI
#undef DEF_RIR
@@ -159,8 +163,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);
@@ -190,8 +192,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-def2.h.inc b/include/tcg/tcg-op-def2.h.inc
index 187cffbdf4d..e4f694e5514 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_RRRRR(addcio)
DEF_RRRU(extract2)
DEF_RRRUU(deposit)
DEF_RRUU(deposit_z)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 3fd9d8bb92c..34532f8179c 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -293,6 +293,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_RRRRR(NAME) \
+ static void glue(gen_,NAME)(TCGType, TCGTemp *, TCGTemp *, \
+ TCGTemp *, TCGTemp *, TCGTemp *);
+
#define DEF_RI(NAME) \
static void glue(gen_,NAME)(TCGType, TCGTemp *, int64_t);
@@ -335,6 +339,7 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
#undef DEF_R
#undef DEF_RR
#undef DEF_RRR
+#undef DEF_RRRRR
#undef DEF_RI
#undef DEF_RRI
#undef DEF_RIR
@@ -388,6 +393,32 @@ 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)
+{
+ TCGTemp *t0 = tcg_temp_new_internal(type, TEMP_EBB);
+
+ 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 {
+ TCGTemp *t1 = tcg_temp_new_internal(type, TEMP_EBB);
+
+ 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);
+
+ tcg_temp_free_internal(t1);
+ }
+ tcg_temp_free_internal(t0);
+}
+
static void gen_and(TCGType type, TCGTemp *dst, TCGTemp *src1, TCGTemp *src2)
{
gen_op_ttt(INDEX_op_and, type, dst, src1, src2);
@@ -1200,6 +1231,11 @@ 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_RRRRR(NAME) \
+ DNI void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b, TCGV c, \
+ TCGV d, TCGV e) \
+ { gen_##NAME(TYPE, TTMP(a), TTMP(b), TTMP(c), TTMP(d), TTMP(e)); }
+
#define DEF_RI(NAME) \
DNI void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TINT b) \
{ gen_##NAME(TYPE, TTMP(a), b); }
@@ -1255,6 +1291,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_RRRRR
#undef DEF_RI
#undef DEF_RRI
#undef DEF_RIR
@@ -1312,33 +1349,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)
{
@@ -1849,33 +1859,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
