Signed-off-by: Richard Henderson <[email protected]>
---
include/tcg/tcg-op-common.h | 6 +++--
include/tcg/tcg-op-def2.h.inc | 1 +
tcg/tcg-op.c | 44 +++++++++++++++++------------------
3 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index 831502dd994..e243ed93b55 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -110,6 +110,9 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
#define DEF_RIR(NAME) \
void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TINT b, TCGV c);
+#define DEF_CRRL(NAME) \
+ void glue(glue(tcg_gen_,NAME),TEXT)(TCGCond a, TCGV b, TCGV c, TCGLabel
*d);
+
#include "tcg-op-def.h.inc"
#undef DEF_R
@@ -118,6 +121,7 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
#undef DEF_RI
#undef DEF_RRI
#undef DEF_RIR
+#undef DEF_CRRL
/* 32 bit ops */
@@ -141,7 +145,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_brcond_i32(TCGCond cond, TCGv_i32 arg1, TCGv_i32 arg2, TCGLabel
*);
void tcg_gen_brcondi_i32(TCGCond cond, TCGv_i32 arg1, int32_t arg2, TCGLabel
*);
void tcg_gen_setcond_i32(TCGCond cond, TCGv_i32 ret,
TCGv_i32 arg1, TCGv_i32 arg2);
@@ -214,7 +217,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_brcond_i64(TCGCond cond, TCGv_i64 arg1, TCGv_i64 arg2, TCGLabel
*);
void tcg_gen_brcondi_i64(TCGCond cond, TCGv_i64 arg1, int64_t arg2, TCGLabel
*);
void tcg_gen_setcond_i64(TCGCond cond, 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 bad7f4753c1..7721c708e9c 100644
--- a/include/tcg/tcg-op-def2.h.inc
+++ b/include/tcg/tcg-op-def2.h.inc
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: MIT */
+DEF_CRRL(brcond)
DEF_R(discard)
DEF_RI(movi)
DEF_RIR(subfi)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 233ecdc5b98..c2ae691622f 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -338,6 +338,9 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
#define DEF_RIR(NAME) \
static void glue(gen_,NAME)(TCGType, TCGTemp *, int64_t, TCGTemp *);
+#define DEF_CRRL(NAME) \
+ static void glue(gen_,NAME)(TCGType, TCGCond, TCGTemp *, TCGTemp *,
TCGLabel *);
+
#include "tcg/tcg-op-def2.h.inc"
#undef DEF_R
@@ -346,6 +349,7 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
#undef DEF_RI
#undef DEF_RRI
#undef DEF_RIR
+#undef DEF_CRRL
/*
* Generic expansions for templated operations.
@@ -409,6 +413,18 @@ static void gen_andc(TCGType type, TCGTemp *dst, TCGTemp
*src1, TCGTemp *src2)
}
}
+static void gen_brcond(TCGType type, TCGCond cond, TCGTemp *src1,
+ TCGTemp *src2, TCGLabel *l)
+{
+ if (cond == TCG_COND_ALWAYS) {
+ tcg_gen_br(l);
+ } else if (cond != TCG_COND_NEVER) {
+ TCGOp *op = gen_op_ttii(INDEX_op_brcond, type,
+ src1, src2, cond, label_arg(l));
+ add_as_label_use(l, op);
+ }
+}
+
static void gen_discard(TCGType type, TCGTemp *src)
{
tcg_gen_op1(INDEX_op_discard, type, temp_arg(src));
@@ -699,6 +715,11 @@ static void gen_xori(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TINT b, TCGV c) \
{ gen_##NAME(TYPE, TTMP(a), b, TTMP(c)); }
+#define DEF_CRRL(NAME) \
+ void glue(glue(tcg_gen_,NAME),TEXT)(TCGCond a, TCGV b, \
+ TCGV c, TCGLabel *d) \
+ { gen_##NAME(TYPE, a, TTMP(b), TTMP(c), d); }
+
#include "tcg/tcg-op-def.h.inc"
#undef DEF_R
@@ -707,20 +728,10 @@ static void gen_xori(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
#undef DEF_RI
#undef DEF_RRI
#undef DEF_RIR
+#undef DEF_CRRL
/* 32 bit ops */
-void tcg_gen_brcond_i32(TCGCond cond, TCGv_i32 arg1, TCGv_i32 arg2, TCGLabel
*l)
-{
- if (cond == TCG_COND_ALWAYS) {
- tcg_gen_br(l);
- } else if (cond != TCG_COND_NEVER) {
- TCGOp *op = tcg_gen_op4ii_i32(INDEX_op_brcond,
- arg1, arg2, cond, label_arg(l));
- add_as_label_use(l, op);
- }
-}
-
void tcg_gen_brcondi_i32(TCGCond cond, TCGv_i32 arg1, int32_t arg2, TCGLabel
*l)
{
if (cond == TCG_COND_ALWAYS) {
@@ -1520,17 +1531,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_brcond_i64(TCGCond cond, TCGv_i64 arg1, TCGv_i64 arg2, TCGLabel
*l)
-{
- if (cond == TCG_COND_ALWAYS) {
- tcg_gen_br(l);
- } else if (cond != TCG_COND_NEVER) {
- TCGOp *op = tcg_gen_op4ii_i64(INDEX_op_brcond, arg1, arg2, cond,
- label_arg(l));
- add_as_label_use(l, op);
- }
-}
-
void tcg_gen_brcondi_i64(TCGCond cond, TCGv_i64 arg1, int64_t arg2, TCGLabel
*l)
{
tcg_gen_brcond_i64(cond, arg1, tcg_constant_i64(arg2), l);
--
2.53.0
