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 | 51 ++++++++++++++++++-----------------
3 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index b859af38355..9b01acb3128 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -116,6 +116,9 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
#define DEF_CRIL(NAME) \
void glue(glue(tcg_gen_,NAME),TEXT)(TCGCond a, TCGV b, TINT c, TCGLabel
*d);
+#define DEF_CRRR(NAME) \
+ void glue(glue(tcg_gen_,NAME),TEXT)(TCGCond a, TCGV b, TCGV c, TCGV d);
+
#include "tcg-op-def.h.inc"
#undef DEF_R
@@ -126,6 +129,7 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
#undef DEF_RIR
#undef DEF_CRRL
#undef DEF_CRIL
+#undef DEF_CRRR
/* 32 bit ops */
@@ -149,8 +153,6 @@ void tcg_gen_sextract_i32(TCGv_i32 ret, TCGv_i32 arg,
unsigned int ofs, unsigned int len);
void tcg_gen_extract2_i32(TCGv_i32 ret, TCGv_i32 al, TCGv_i32 ah,
unsigned int ofs);
-void tcg_gen_setcond_i32(TCGCond cond, TCGv_i32 ret,
- TCGv_i32 arg1, TCGv_i32 arg2);
void tcg_gen_setcondi_i32(TCGCond cond, TCGv_i32 ret,
TCGv_i32 arg1, int32_t arg2);
void tcg_gen_negsetcond_i32(TCGCond cond, TCGv_i32 ret,
@@ -220,8 +222,6 @@ void tcg_gen_sextract_i64(TCGv_i64 ret, TCGv_i64 arg,
unsigned int ofs, unsigned int len);
void tcg_gen_extract2_i64(TCGv_i64 ret, TCGv_i64 al, TCGv_i64 ah,
unsigned int ofs);
-void tcg_gen_setcond_i64(TCGCond cond, TCGv_i64 ret,
- TCGv_i64 arg1, TCGv_i64 arg2);
void tcg_gen_setcondi_i64(TCGCond cond, TCGv_i64 ret,
TCGv_i64 arg1, int64_t arg2);
void tcg_gen_negsetcond_i64(TCGCond cond, TCGv_i64 ret,
diff --git a/include/tcg/tcg-op-def2.h.inc b/include/tcg/tcg-op-def2.h.inc
index da15a647e2e..560e7f0394e 100644
--- a/include/tcg/tcg-op-def2.h.inc
+++ b/include/tcg/tcg-op-def2.h.inc
@@ -2,6 +2,7 @@
DEF_CRIL(brcondi)
DEF_CRRL(brcond)
+DEF_CRRR(setcond)
DEF_R(discard)
DEF_RI(movi)
DEF_RIR(subfi)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index e1974aac41c..ee6099461f3 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -121,6 +121,12 @@ 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_ttti(TCGOpcode opc, TCGType type,
+ TCGTemp *t0, TCGTemp *t1, TCGTemp *t2, TCGArg a3)
+{
+ return tcg_gen_op4(opc, type, temp_arg(t0), temp_arg(t1), temp_arg(t2),
a3);
+}
+
static TCGOp *gen_op_ttttt(TCGOpcode opc, TCGType type,
TCGTemp *t0, TCGTemp *t1, TCGTemp *t2,
TCGTemp *t3, TCGTemp *t4)
@@ -344,6 +350,9 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
#define DEF_CRIL(NAME) \
static void glue(gen_,NAME)(TCGType, TCGCond, TCGTemp *, int64_t, TCGLabel
*);
+#define DEF_CRRR(NAME) \
+ static void glue(gen_,NAME)(TCGType, TCGCond, TCGTemp *, TCGTemp *,
TCGTemp *);
+
#include "tcg/tcg-op-def2.h.inc"
#undef DEF_R
@@ -354,6 +363,7 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
#undef DEF_RIR
#undef DEF_CRRL
#undef DEF_CRIL
+#undef DEF_CRRR
/*
* Generic expansions for templated operations.
@@ -631,6 +641,18 @@ static void gen_sari(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
}
}
+static void gen_setcond(TCGType type, TCGCond cond, TCGTemp *dst,
+ TCGTemp *src1, TCGTemp *src2)
+{
+ if (cond == TCG_COND_ALWAYS) {
+ gen_movi(type, dst, 1);
+ } else if (cond == TCG_COND_NEVER) {
+ gen_movi(type, dst, 0);
+ } else {
+ gen_op_ttti(INDEX_op_setcond, type, dst, src1, src2, cond);
+ }
+}
+
static void gen_shl(TCGType type, TCGTemp *dst, TCGTemp *src1, TCGTemp *src2)
{
gen_op_ttt(INDEX_op_shl, type, dst, src1, src2);
@@ -735,6 +757,10 @@ static void gen_xori(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
TINT c, TCGLabel *d) \
{ gen_##NAME(TYPE, a, TTMP(b), c, d); }
+#define DEF_CRRR(NAME) \
+ void glue(glue(tcg_gen_,NAME),TEXT)(TCGCond a, TCGV b, TCGV c, TCGV d) \
+ { gen_##NAME(TYPE, a, TTMP(b), TTMP(c), TTMP(d)); }
+
#include "tcg/tcg-op-def.h.inc"
#undef DEF_R
@@ -745,21 +771,10 @@ static void gen_xori(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
#undef DEF_RIR
#undef DEF_CRRL
#undef DEF_CRIL
+#undef DEF_CRRR
/* 32 bit ops */
-void tcg_gen_setcond_i32(TCGCond cond, TCGv_i32 ret,
- TCGv_i32 arg1, TCGv_i32 arg2)
-{
- if (cond == TCG_COND_ALWAYS) {
- tcg_gen_movi_i32(ret, 1);
- } else if (cond == TCG_COND_NEVER) {
- tcg_gen_movi_i32(ret, 0);
- } else {
- tcg_gen_op4i_i32(INDEX_op_setcond, ret, arg1, arg2, cond);
- }
-}
-
void tcg_gen_setcondi_i32(TCGCond cond, TCGv_i32 ret,
TCGv_i32 arg1, int32_t arg2)
{
@@ -1538,18 +1553,6 @@ void tcg_gen_st_i64(TCGv_i64 arg1, TCGv_ptr arg2,
tcg_target_long offset)
tcg_gen_ldst_op_i64(INDEX_op_st, arg1, arg2, offset);
}
-void tcg_gen_setcond_i64(TCGCond cond, TCGv_i64 ret,
- TCGv_i64 arg1, TCGv_i64 arg2)
-{
- if (cond == TCG_COND_ALWAYS) {
- tcg_gen_movi_i64(ret, 1);
- } else if (cond == TCG_COND_NEVER) {
- tcg_gen_movi_i64(ret, 0);
- } else {
- tcg_gen_op4i_i64(INDEX_op_setcond, ret, arg1, arg2, cond);
- }
-}
-
void tcg_gen_setcondi_i64(TCGCond cond, TCGv_i64 ret,
TCGv_i64 arg1, int64_t arg2)
{
--
2.53.0
