Signed-off-by: Richard Henderson <[email protected]>
---
include/tcg/tcg-op-common.h | 5 ++--
include/tcg/tcg.h | 1 +
include/tcg/tcg-op-def.h.inc | 1 +
tcg/tcg-op.c | 46 +++++++++++++++++++-----------------
4 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index 974681a29a1..2817089b62c 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -98,6 +98,8 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
void glue(glue(tcg_gen_,NAME),TEXT)(T1, T2);
#define DEF3(NAME, T1, T2, T3) \
void glue(glue(tcg_gen_,NAME),TEXT)(T1, T2, T3);
+#define DEF4(NAME, T1, T2, T3, T4) \
+ void glue(glue(tcg_gen_,NAME),TEXT)(T1, T2, T3, T4);
#define TCGV glue(TCGv,TEXT)
#define TEXT _i32
@@ -120,6 +122,7 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
#undef DEF1
#undef DEF2
#undef DEF3
+#undef DEF4
/* 32 bit ops */
@@ -143,7 +146,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);
@@ -216,7 +218,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.h b/include/tcg/tcg.h
index 7669dc1c2db..de1a81d8e45 100644
--- a/include/tcg/tcg.h
+++ b/include/tcg/tcg.h
@@ -97,6 +97,7 @@ struct TCGLabelUse {
};
typedef struct TCGLabel TCGLabel;
+typedef struct TCGLabel *TCGLabelPtr;
struct TCGLabel {
bool present;
bool has_value;
diff --git a/include/tcg/tcg-op-def.h.inc b/include/tcg/tcg-op-def.h.inc
index e17caafd890..d2bbf9ba017 100644
--- a/include/tcg/tcg-op-def.h.inc
+++ b/include/tcg/tcg-op-def.h.inc
@@ -5,6 +5,7 @@ DEF3(addi, TCGV, TCGV, TINT)
DEF3(and, TCGV, TCGV, TCGV)
DEF3(andi, TCGV, TCGV, TINT)
DEF3(andc, TCGV, TCGV, TCGV)
+DEF4(brcond, TCGCond, TCGV, TCGV, TCGLabelPtr)
DEF1(discard, TCGV)
DEF3(div, TCGV, TCGV, TCGV)
DEF3(divu, TCGV, TCGV, TCGV)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 1bbe6992e34..70e2443f562 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -326,6 +326,8 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
static void glue(gen_,NAME)(TCGType, T1, T2);
#define DEF3(NAME, T1, T2, T3) \
static void glue(gen_,NAME)(TCGType, T1, T2, T3);
+#define DEF4(NAME, T1, T2, T3, T4) \
+ static void glue(gen_,NAME)(TCGType, T1, T2, T3, T4);
#define TCGV TCGTemp *
#define TINT int64_t
@@ -338,6 +340,7 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
#undef DEF1
#undef DEF2
#undef DEF3
+#undef DEF4
/*
* Templated operations.
@@ -355,10 +358,17 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned
meminfo)
void glue(glue(tcg_gen_,NAME),TEXT)(T1 a, T2 b, T3 c) \
{ gen_##NAME(TYPE, glue(C_,T1)(a), glue(C_,T2)(b), glue(C_,T3)(c)); }
+#define DEF4(NAME, T1, T2, T3, T4) \
+ void glue(glue(tcg_gen_,NAME),TEXT)(T1 a, T2 b, T3 c, T4 d) \
+ { gen_##NAME(TYPE, glue(C_,T1)(a), glue(C_,T2)(b), \
+ glue(C_,T3)(c), glue(C_,T4)(d)); }
+
#define C_TCGv_i32 tcgv_i32_temp
#define C_TCGv_i64 tcgv_i64_temp
#define C_int32_t
#define C_int64_t
+#define C_TCGCond
+#define C_TCGLabelPtr
#define TCGV glue(TCGv,TEXT)
#define TEXT _i32
@@ -386,6 +396,8 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
#undef C_TCGv_i64
#undef C_int32_t
#undef C_int64_t
+#undef C_TCGCond
+#undef C_TCGLabelPtr
#undef DEF1
#undef DEF2
@@ -453,6 +465,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));
@@ -717,17 +741,6 @@ static void gen_xori(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
/* 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) {
@@ -1527,17 +1540,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
