Signed-off-by: Richard Henderson <[email protected]>
---
include/tcg/tcg-op-common.h | 16 +--
include/tcg/tcg-op-mem.h | 2 +-
tcg/tcg-internal.h | 3 +
include/tcg/tcg-op-def.h.inc | 3 +
tcg/tcg-op-ldst.c | 237 ++++++++++++++---------------------
tcg/tcg-op.c | 8 ++
6 files changed, 113 insertions(+), 156 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index 4fec1500d56..9864674f1c2 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -104,6 +104,8 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
QEMU_ARG_NONNULL void glue(glue(tcg_gen_,NAME),TExt)(T1, T2, T3, T4, T5);
#define DEF6(NAME, T1, T2, T3, T4, T5, T6) \
QEMU_ARG_NONNULL void glue(glue(tcg_gen_,NAME),TExt)(T1, T2, T3, T4, T5,
T6);
+#define DEF7(NAME, T1, T2, T3, T4, T5, T6, T7) \
+ QEMU_ARG_NONNULL void glue(glue(tcg_gen_,NAME),TExt)(T1, T2, T3, T4, T5,
T6, T7);
#define TCGV glue(TCGv,TExt)
#define TExt _i32
@@ -129,6 +131,7 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
#undef DEF4
#undef DEF5
#undef DEF6
+#undef DEF7
/* 32 bit ops */
@@ -180,18 +183,9 @@ void tcg_gen_qemu_st_chk_i128(TCGv_i128, TCGTemp *,
TCGArg, MemOp, TCGType);
/* Atomic ops */
-void tcg_gen_atomic_cmpxchg_i32_chk(TCGv_i32, TCGTemp *, TCGv_i32, TCGv_i32,
- TCGArg, MemOp, TCGType);
-void tcg_gen_atomic_cmpxchg_i64_chk(TCGv_i64, TCGTemp *, TCGv_i64, TCGv_i64,
- TCGArg, MemOp, TCGType);
-void tcg_gen_atomic_cmpxchg_i128_chk(TCGv_i128, TCGTemp *, TCGv_i128,
+void tcg_gen_atomic_cmpxchg_chk_i128(TCGv_i128, TCGTemp *, TCGv_i128,
TCGv_i128, TCGArg, MemOp, TCGType);
-
-void tcg_gen_nonatomic_cmpxchg_i32_chk(TCGv_i32, TCGTemp *, TCGv_i32, TCGv_i32,
- TCGArg, MemOp, TCGType);
-void tcg_gen_nonatomic_cmpxchg_i64_chk(TCGv_i64, TCGTemp *, TCGv_i64, TCGv_i64,
- TCGArg, MemOp, TCGType);
-void tcg_gen_nonatomic_cmpxchg_i128_chk(TCGv_i128, TCGTemp *, TCGv_i128,
+void tcg_gen_nonatomic_cmpxchg_chk_i128(TCGv_i128, TCGTemp *, TCGv_i128,
TCGv_i128, TCGArg, MemOp, TCGType);
void tcg_gen_atomic_xchg_i32_chk(TCGv_i32, TCGTemp *, TCGv_i32,
diff --git a/include/tcg/tcg-op-mem.h b/include/tcg/tcg-op-mem.h
index e8425e10598..935860f1442 100644
--- a/include/tcg/tcg-op-mem.h
+++ b/include/tcg/tcg-op-mem.h
@@ -72,7 +72,7 @@ tcg_gen_qemu_st_i128(TCGv_i128 v, TCGv_va a, TCGArg i, MemOp
m)
#define DEF_ATOMIC3(N, S) \
QEMU_ARG_NONNULL static inline void \
N##_##S(TCGv_##S r, TCGv_va a, TCGv_##S o, TCGv_##S n, TCGArg i, MemOp m) \
- { N##_##S##_chk(r, tcgv_va_temp(a), o, n, i, m, TCG_TYPE_VA); }
+ { N##_chk_##S(r, tcgv_va_temp(a), o, n, i, m, TCG_TYPE_VA); }
DEF_ATOMIC3(tcg_gen_atomic_cmpxchg, i32)
DEF_ATOMIC3(tcg_gen_atomic_cmpxchg, i64)
diff --git a/tcg/tcg-internal.h b/tcg/tcg-internal.h
index bfd34905ee7..da1b9c9bab3 100644
--- a/tcg/tcg-internal.h
+++ b/tcg/tcg-internal.h
@@ -190,6 +190,8 @@ bool tcg_op_imm_match(TCGOpcode op, TCGType type,
tcg_target_ulong imm);
QEMU_ARG_NONNULL void glue(tcg_gen_,NAME)(TCGType, T1, T2, T3, T4, T5);
#define DEF6(NAME, T1, T2, T3, T4, T5, T6) \
QEMU_ARG_NONNULL void glue(tcg_gen_,NAME)(TCGType, T1, T2, T3, T4, T5, T6);
+#define DEF7(NAME, T1, T2, T3, T4, T5, T6, T7) \
+ QEMU_ARG_NONNULL void glue(tcg_gen_,NAME)(TCGType, T1, T2, T3, T4, T5, T6,
T7);
#define TCGV TCGTemp *
#define TINT int64_t
@@ -207,6 +209,7 @@ bool tcg_op_imm_match(TCGOpcode op, TCGType type,
tcg_target_ulong imm);
#undef DEF4
#undef DEF5
#undef DEF6
+#undef DEF7
static inline void tcg_gen_extrh(TCGTemp *dst, TCGTemp *src)
{
diff --git a/include/tcg/tcg-op-def.h.inc b/include/tcg/tcg-op-def.h.inc
index 552f62b7f4f..e0ffd0da678 100644
--- a/include/tcg/tcg-op-def.h.inc
+++ b/include/tcg/tcg-op-def.h.inc
@@ -85,3 +85,6 @@ DEF3(umin, TCGV, TCGV, TCGV)
DEF3(ussub, TCGV, TCGV, TCGV)
DEF3(xor, TCGV, TCGV, TCGV)
DEF3(xori, TCGV, TCGV, TINT)
+
+DEF7(atomic_cmpxchg_chk, TCGV, TCGTempPtr, TCGV, TCGV, unsigned, MemOp,
TCGType)
+DEF7(nonatomic_cmpxchg_chk, TCGV, TCGTempPtr, TCGV, TCGV, unsigned, MemOp,
TCGType)
diff --git a/tcg/tcg-op-ldst.c b/tcg/tcg-op-ldst.c
index 7345bdfcc2b..b3143f6311b 100644
--- a/tcg/tcg-op-ldst.c
+++ b/tcg/tcg-op-ldst.c
@@ -667,181 +667,125 @@ typedef void (*gen_atomic_op_i128)(TCGv_i128, TCGv_env,
TCGv_i64,
# define WITH_ATOMIC128(X)
#endif
-static void * const table_cmpxchg[(MO_SIZE | MO_BSWAP) + 1] = {
- [MO_8] = gen_helper_atomic_cmpxchgb,
- [MO_16 | MO_LE] = gen_helper_atomic_cmpxchgw_le,
- [MO_16 | MO_BE] = gen_helper_atomic_cmpxchgw_be,
- [MO_32 | MO_LE] = gen_helper_atomic_cmpxchgl_le,
- [MO_32 | MO_BE] = gen_helper_atomic_cmpxchgl_be,
- [MO_64 | MO_LE] = gen_helper_atomic_cmpxchgq_le,
- [MO_64 | MO_BE] = gen_helper_atomic_cmpxchgq_be,
- WITH_ATOMIC128([MO_128 | MO_LE] = gen_helper_atomic_cmpxchgo_le)
- WITH_ATOMIC128([MO_128 | MO_BE] = gen_helper_atomic_cmpxchgo_be)
-};
-
-static void tcg_gen_nonatomic_cmpxchg_i32_int(TCGv_i32 retv, TCGTemp *addr,
- TCGv_i32 cmpv, TCGv_i32 newv,
- TCGArg idx, MemOp memop)
+static void tcg_gen_nonatomic_cmpxchg_int(TCGType type, TCGTemp *retv,
+ TCGTemp *addr, TCGTemp *cmpv,
+ TCGTemp *newv, unsigned idx,
+ MemOp memop)
{
- TCGv_i32 t1 = tcg_temp_ebb_new_i32();
- TCGv_i32 t2 = tcg_temp_ebb_new_i32();
+ g_autoptr(TCGTemp) t1 = tcg_temp_new_ebb(type);
+ g_autoptr(TCGTemp) t2 = tcg_temp_new_ebb(type);
- tcg_gen_ext_i32(t2, cmpv, memop & MO_SIZE);
+ tcg_gen_ext(type, t2, cmpv, memop & MO_SIZE);
- tcg_gen_qemu_ld_int(TCG_TYPE_I32, tcgv_i32_temp(t1),
- addr, idx, memop & ~MO_SIGN);
- tcg_gen_movcond_i32(TCG_COND_EQ, t2, t1, t2, newv, t1);
- tcg_gen_qemu_st_int(TCG_TYPE_I32, tcgv_i32_temp(t2), addr, idx, memop);
- tcg_temp_free_i32(t2);
+ tcg_gen_qemu_ld_int(type, t1, addr, idx, memop & ~MO_SIGN);
+ tcg_gen_movcond(type, TCG_COND_EQ, t2, t1, t2, newv, t1);
+ tcg_gen_qemu_st_int(type, t2, addr, idx, memop);
if (memop & MO_SIGN) {
- tcg_gen_ext_i32(retv, t1, memop);
+ tcg_gen_ext(type, retv, t1, memop);
} else {
- tcg_gen_mov_i32(retv, t1);
+ tcg_gen_mov(type, retv, t1);
}
- tcg_temp_free_i32(t1);
}
-void tcg_gen_nonatomic_cmpxchg_i32_chk(TCGv_i32 retv, TCGTemp *addr,
- TCGv_i32 cmpv, TCGv_i32 newv,
- TCGArg idx, MemOp memop,
- TCGType addr_type)
+void tcg_gen_nonatomic_cmpxchg_chk(TCGType val_type, TCGTemp *retv,
+ TCGTemp *addr, TCGTemp *cmpv, TCGTemp *newv,
+ unsigned idx, MemOp memop, TCGType
addr_type)
{
tcg_debug_assert(addr_type == tcg_ctx->addr_type);
- tcg_debug_assert((memop & MO_SIZE) <= MO_32);
- tcg_gen_nonatomic_cmpxchg_i32_int(retv, addr, cmpv, newv, idx, memop);
+ tcg_debug_assert(memop_size(memop) <= tcg_type_size(val_type));
+ tcg_debug_assert(idx < NB_MMU_MODES);
+
+ tcg_gen_nonatomic_cmpxchg_int(val_type, retv, addr, cmpv, newv, idx,
memop);
}
-static void tcg_gen_atomic_cmpxchg_i32_int(TCGv_i32 retv, TCGTemp *addr,
- TCGv_i32 cmpv, TCGv_i32 newv,
- TCGArg idx, MemOp memop)
+static void tcg_gen_atomic_cmpxchg_int(TCGType type, TCGTemp *retv,
+ TCGTemp *addr, TCGTemp *cmpv,
+ TCGTemp *newv, unsigned idx,
+ MemOp memop)
{
- gen_atomic_cx_i32 gen;
TCGv_i64 a64;
MemOpIdx oi;
if (!(tcg_ctx->gen_tb->cflags & CF_PARALLEL)) {
- tcg_gen_nonatomic_cmpxchg_i32_int(retv, addr, cmpv, newv, idx, memop);
+ tcg_gen_nonatomic_cmpxchg_int(type, retv, addr, cmpv,
+ newv, idx, memop);
return;
}
- memop = tcg_canonicalize_memop(memop, 0, 0);
- gen = table_cmpxchg[memop & (MO_SIZE | MO_BSWAP)];
- tcg_debug_assert(gen != NULL);
-
- oi = make_memop_idx(memop & ~MO_SIGN, idx);
a64 = maybe_extend_addr64(addr);
- gen(retv, tcg_env, a64, cmpv, newv, tcg_constant_i32(oi));
- maybe_free_addr64(a64);
-
- if (memop & MO_SIGN) {
- tcg_gen_ext_i32(retv, retv, memop);
- }
-}
-
-void tcg_gen_atomic_cmpxchg_i32_chk(TCGv_i32 retv, TCGTemp *addr,
- TCGv_i32 cmpv, TCGv_i32 newv,
- TCGArg idx, MemOp memop,
- TCGType addr_type)
-{
- tcg_debug_assert(addr_type == tcg_ctx->addr_type);
- tcg_debug_assert((memop & MO_SIZE) <= MO_32);
- tcg_gen_atomic_cmpxchg_i32_int(retv, addr, cmpv, newv, idx, memop);
-}
-
-static void tcg_gen_nonatomic_cmpxchg_i64_int(TCGv_i64 retv, TCGTemp *addr,
- TCGv_i64 cmpv, TCGv_i64 newv,
- TCGArg idx, MemOp memop)
-{
- TCGv_i64 t1, t2;
-
- t1 = tcg_temp_ebb_new_i64();
- t2 = tcg_temp_ebb_new_i64();
-
- tcg_gen_ext_i64(t2, cmpv, memop & MO_SIZE);
-
- tcg_gen_qemu_ld_int(TCG_TYPE_I64, tcgv_i64_temp(t1),
- addr, idx, memop & ~MO_SIGN);
- tcg_gen_movcond_i64(TCG_COND_EQ, t2, t1, t2, newv, t1);
- tcg_gen_qemu_st_int(TCG_TYPE_I64, tcgv_i64_temp(t2), addr, idx, memop);
- tcg_temp_free_i64(t2);
-
- if (memop & MO_SIGN) {
- tcg_gen_ext_i64(retv, t1, memop);
- } else {
- tcg_gen_mov_i64(retv, t1);
- }
- tcg_temp_free_i64(t1);
-}
-
-void tcg_gen_nonatomic_cmpxchg_i64_chk(TCGv_i64 retv, TCGTemp *addr,
- TCGv_i64 cmpv, TCGv_i64 newv,
- TCGArg idx, MemOp memop,
- TCGType addr_type)
-{
- tcg_debug_assert(addr_type == tcg_ctx->addr_type);
- tcg_debug_assert((memop & MO_SIZE) <= MO_64);
- tcg_gen_nonatomic_cmpxchg_i64_int(retv, addr, cmpv, newv, idx, memop);
-}
-
-static void tcg_gen_atomic_cmpxchg_i64_int(TCGv_i64 retv, TCGTemp *addr,
- TCGv_i64 cmpv, TCGv_i64 newv,
- TCGArg idx, MemOp memop)
-{
- if (!(tcg_ctx->gen_tb->cflags & CF_PARALLEL)) {
- tcg_gen_nonatomic_cmpxchg_i64_int(retv, addr, cmpv, newv, idx, memop);
- return;
- }
if ((memop & MO_SIZE) == MO_64) {
- gen_atomic_cx_i64 gen;
+ gen_atomic_cx_i64 gen = ((memop & MO_BSWAP) == MO_LE
+ ? gen_helper_atomic_cmpxchgq_le
+ : gen_helper_atomic_cmpxchgq_be);
+
+ tcg_debug_assert(type == TCG_TYPE_I64);
memop = tcg_canonicalize_memop(memop, 1, 0);
- gen = table_cmpxchg[memop & (MO_SIZE | MO_BSWAP)];
- if (gen) {
- MemOpIdx oi = make_memop_idx(memop, idx);
- TCGv_i64 a64 = maybe_extend_addr64(addr);
- gen(retv, tcg_env, a64, cmpv, newv, tcg_constant_i32(oi));
- maybe_free_addr64(a64);
- return;
+ oi = make_memop_idx(memop & ~MO_SIGN, idx);
+
+ gen(temp_tcgv_i64(retv), tcg_env, a64, temp_tcgv_i64(cmpv),
+ temp_tcgv_i64(newv), tcg_constant_i32(oi));
+ } else {
+ static gen_atomic_cx_i32 const table_cmpxchg[(MO_SIZE | MO_BSWAP) + 1]
= {
+ [MO_8] = gen_helper_atomic_cmpxchgb,
+ [MO_16 | MO_LE] = gen_helper_atomic_cmpxchgw_le,
+ [MO_16 | MO_BE] = gen_helper_atomic_cmpxchgw_be,
+ [MO_32 | MO_LE] = gen_helper_atomic_cmpxchgl_le,
+ [MO_32 | MO_BE] = gen_helper_atomic_cmpxchgl_be,
+ };
+
+ g_autoptr(TCGTemp) c32 = NULL;
+ g_autoptr(TCGTemp) n32 = NULL;
+ g_autoptr(TCGTemp) r32 = NULL;
+ TCGTemp *retv_orig = retv;
+
+ gen_atomic_cx_i32 gen = table_cmpxchg[memop & (MO_SIZE | MO_BSWAP)];
+ tcg_debug_assert(gen != NULL);
+
+ if (type == TCG_TYPE_I64) {
+ c32 = tcg_temp_new_ebb(TCG_TYPE_I32);
+ n32 = tcg_temp_new_ebb(TCG_TYPE_I32);
+ r32 = tcg_temp_new_ebb(TCG_TYPE_I32);
+
+ tcg_gen_extrl(c32, cmpv);
+ tcg_gen_extrl(n32, newv);
+
+ cmpv = c32;
+ newv = n32;
+ retv = r32;
}
- gen_helper_exit_atomic(tcg_env);
+ memop = tcg_canonicalize_memop(memop, 0, 0);
+ oi = make_memop_idx(memop & ~MO_SIGN, idx);
- /*
- * Produce a result for a well-formed opcode stream. This satisfies
- * liveness for set before used, which happens before this dead code
- * is removed.
- */
- tcg_gen_movi_i64(retv, 0);
- } else {
- TCGv_i32 c32 = tcg_temp_ebb_new_i32();
- TCGv_i32 n32 = tcg_temp_ebb_new_i32();
- TCGv_i32 r32 = tcg_temp_ebb_new_i32();
-
- tcg_gen_extrl_i64_i32(c32, cmpv);
- tcg_gen_extrl_i64_i32(n32, newv);
- tcg_gen_atomic_cmpxchg_i32_int(r32, addr, c32, n32,
- idx, memop & ~MO_SIGN);
- tcg_temp_free_i32(c32);
- tcg_temp_free_i32(n32);
-
- tcg_gen_extu_i32_i64(retv, r32);
- tcg_temp_free_i32(r32);
+ gen(temp_tcgv_i32(retv), tcg_env, a64, temp_tcgv_i32(cmpv),
+ temp_tcgv_i32(newv), tcg_constant_i32(oi));
if (memop & MO_SIGN) {
- tcg_gen_ext_i64(retv, retv, memop);
+ tcg_gen_ext(TCG_TYPE_I32, retv, retv, memop);
+ }
+ if (retv != retv_orig) {
+ if (memop & MO_SIGN) {
+ tcg_gen_exts(retv_orig, retv);
+ } else {
+ tcg_gen_extu(retv_orig, retv);
+ }
}
}
+ maybe_free_addr64(a64);
}
-void tcg_gen_atomic_cmpxchg_i64_chk(TCGv_i64 retv, TCGTemp *addr,
- TCGv_i64 cmpv, TCGv_i64 newv,
- TCGArg idx, MemOp memop, TCGType addr_type)
+void tcg_gen_atomic_cmpxchg_chk(TCGType val_type, TCGTemp *retv, TCGTemp *addr,
+ TCGTemp *cmpv, TCGTemp *newv,
+ unsigned idx, MemOp memop, TCGType addr_type)
{
tcg_debug_assert(addr_type == tcg_ctx->addr_type);
- tcg_debug_assert((memop & MO_SIZE) <= MO_64);
- tcg_gen_atomic_cmpxchg_i64_int(retv, addr, cmpv, newv, idx, memop);
+ tcg_debug_assert(memop_size(memop) <= tcg_type_size(val_type));
+ tcg_debug_assert(idx < NB_MMU_MODES);
+
+ tcg_gen_atomic_cmpxchg_int(val_type, retv, addr, cmpv, newv, idx, memop);
}
static void tcg_gen_nonatomic_cmpxchg_i128_int(TCGv_i128 retv, TCGTemp *addr,
@@ -877,7 +821,7 @@ static void tcg_gen_nonatomic_cmpxchg_i128_int(TCGv_i128
retv, TCGTemp *addr,
tcg_temp_free_i128(oldv);
}
-void tcg_gen_nonatomic_cmpxchg_i128_chk(TCGv_i128 retv, TCGTemp *addr,
+void tcg_gen_nonatomic_cmpxchg_chk_i128(TCGv_i128 retv, TCGTemp *addr,
TCGv_i128 cmpv, TCGv_i128 newv,
TCGArg idx, MemOp memop,
TCGType addr_type)
@@ -887,18 +831,23 @@ void tcg_gen_nonatomic_cmpxchg_i128_chk(TCGv_i128 retv,
TCGTemp *addr,
tcg_gen_nonatomic_cmpxchg_i128_int(retv, addr, cmpv, newv, idx, memop);
}
-static void tcg_gen_atomic_cmpxchg_i128_int(TCGv_i128 retv, TCGTemp *addr,
+static void tcg_gen_atomic_cmpxchg_int_i128(TCGv_i128 retv, TCGTemp *addr,
TCGv_i128 cmpv, TCGv_i128 newv,
TCGArg idx, MemOp memop)
{
- gen_atomic_cx_i128 gen;
+ gen_atomic_cx_i128 gen = NULL;
if (!(tcg_ctx->gen_tb->cflags & CF_PARALLEL)) {
tcg_gen_nonatomic_cmpxchg_i128_int(retv, addr, cmpv, newv, idx, memop);
return;
}
- gen = table_cmpxchg[memop & (MO_SIZE | MO_BSWAP)];
+#if HAVE_CMPXCHG128
+ gen = ((memop & MO_BSWAP) == MO_LE
+ ? gen_helper_atomic_cmpxchgo_le
+ : gen_helper_atomic_cmpxchgo_be);
+#endif
+
if (gen) {
MemOpIdx oi = make_memop_idx(memop, idx);
TCGv_i64 a64 = maybe_extend_addr64(addr);
@@ -918,14 +867,14 @@ static void tcg_gen_atomic_cmpxchg_i128_int(TCGv_i128
retv, TCGTemp *addr,
tcg_gen_movi_i64(TCGV128_HIGH(retv), 0);
}
-void tcg_gen_atomic_cmpxchg_i128_chk(TCGv_i128 retv, TCGTemp *addr,
+void tcg_gen_atomic_cmpxchg_chk_i128(TCGv_i128 retv, TCGTemp *addr,
TCGv_i128 cmpv, TCGv_i128 newv,
TCGArg idx, MemOp memop,
TCGType addr_type)
{
tcg_debug_assert(addr_type == tcg_ctx->addr_type);
tcg_debug_assert((memop & (MO_SIZE | MO_SIGN)) == MO_128);
- tcg_gen_atomic_cmpxchg_i128_int(retv, addr, cmpv, newv, idx, memop);
+ tcg_gen_atomic_cmpxchg_int_i128(retv, addr, cmpv, newv, idx, memop);
}
static void do_nonatomic_op_i32(TCGv_i32 ret, TCGTemp *addr, TCGv_i32 val,
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index c68e9e10501..c8c79356d55 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -231,6 +231,13 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
{ tcg_gen_##NAME(TYPE, glue(C_,T1)(a), glue(C_,T2)(b), glue(C_,T3)(c), \
glue(C_,T4)(d), glue(C_,T5)(e), glue(C_,T6)(f)); }
+#define DEF7(NAME, T1, T2, T3, T4, T5, T6, T7) \
+ void glue(glue(tcg_gen_,NAME),TExt)(T1 a, T2 b, T3 c, T4 d, T5 e, \
+ T6 f, T7 g) \
+ { tcg_gen_##NAME(TYPE, glue(C_,T1)(a), glue(C_,T2)(b), \
+ glue(C_,T3)(c), glue(C_,T4)(d), glue(C_,T5)(e), \
+ glue(C_,T6)(f), glue(C_,T7)(g)); }
+
#define C_TCGv_i32 tcgv_i32_temp
#define C_TCGv_i64 tcgv_i64_temp
#define C_TCGv_ptr tcgv_ptr_temp
@@ -285,6 +292,7 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
#undef DEF4
#undef DEF5
#undef DEF6
+#undef DEF7
/*
* Internal helper for bit and byte reversal.
--
2.53.0