diff --git a/target-ppc/translate.c b/target-ppc/translate.c index c5a9735c884ee1f55f825e4059edd5ec58f4c5b1..7d61d976b66952986285948e78028a0ba6d674f6 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -5730,7 +5730,7 @@ static always_inline void gen_##name (DisasContext *ctx) \ gen_store_gpr64(rD(ctx->opcode), cpu_T64[0]); \ } -#define GEN_SPEOP_TCG_ARITH2(name) \ +#define GEN_SPEOP_TCG_ARITH2(name, tcg_op) \ static always_inline void gen_##name (DisasContext *ctx) \ { \ if (unlikely(!ctx->spe_enabled)) { \ @@ -5741,7 +5741,7 @@ static always_inline void gen_##name (DisasContext *ctx) \ TCGv t1 = tcg_temp_new(TCG_TYPE_I64); \ gen_load_gpr64(t0, rA(ctx->opcode)); \ gen_load_gpr64(t1, rB(ctx->opcode)); \ - gen_op_##name(t0, t1); \ + tcg_op(t0, t0, t1); \ gen_store_gpr64(rD(ctx->opcode), t0); \ tcg_temp_free(t0); \ tcg_temp_free(t1); \ @@ -5773,59 +5773,14 @@ static always_inline void gen_##name (DisasContext *ctx) \ } /* Logical */ -static always_inline void gen_op_evand (TCGv t0, TCGv t1) -{ - tcg_gen_and_i64(t0, t0, t1); -} - -static always_inline void gen_op_evandc (TCGv t0, TCGv t1) -{ - tcg_gen_not_i64(t1, t1); - tcg_gen_and_i64(t0, t0, t1); -} - -static always_inline void gen_op_evxor (TCGv t0, TCGv t1) -{ - tcg_gen_xor_i64(t0, t0, t1); -} - -static always_inline void gen_op_evor (TCGv t0, TCGv t1) -{ - tcg_gen_or_i64(t0, t0, t1); -} - -static always_inline void gen_op_evnor (TCGv t0, TCGv t1) -{ - tcg_gen_or_i64(t0, t0, t1); - tcg_gen_not_i64(t0, t0); -} - -static always_inline void gen_op_eveqv (TCGv t0, TCGv t1) -{ - tcg_gen_xor_i64(t0, t0, t1); - tcg_gen_not_i64(t0, t0); -} - -static always_inline void gen_op_evorc (TCGv t0, TCGv t1) -{ - tcg_gen_not_i64(t1, t1); - tcg_gen_or_i64(t0, t0, t1); -} - -static always_inline void gen_op_evnand (TCGv t0, TCGv t1) -{ - tcg_gen_and_i64(t0, t0, t1); - tcg_gen_not_i64(t0, t0); -} - -GEN_SPEOP_TCG_ARITH2(evand); -GEN_SPEOP_TCG_ARITH2(evandc); -GEN_SPEOP_TCG_ARITH2(evxor); -GEN_SPEOP_TCG_ARITH2(evor); -GEN_SPEOP_TCG_ARITH2(evnor); -GEN_SPEOP_TCG_ARITH2(eveqv); -GEN_SPEOP_TCG_ARITH2(evorc); -GEN_SPEOP_TCG_ARITH2(evnand); +GEN_SPEOP_TCG_ARITH2(evand, tcg_gen_and_i64); +GEN_SPEOP_TCG_ARITH2(evandc, tcg_gen_andc_i64); +GEN_SPEOP_TCG_ARITH2(evxor, tcg_gen_xor_i64); +GEN_SPEOP_TCG_ARITH2(evor, tcg_gen_or_i64); +GEN_SPEOP_TCG_ARITH2(evnor, tcg_gen_nor_i64); +GEN_SPEOP_TCG_ARITH2(eveqv, tcg_gen_eqv_i64); +GEN_SPEOP_TCG_ARITH2(evorc, tcg_gen_orc_i64); +GEN_SPEOP_TCG_ARITH2(evnand, tcg_gen_nand_i64); GEN_SPEOP_ARITH2(evsrwu); GEN_SPEOP_ARITH2(evsrws); GEN_SPEOP_ARITH2(evslw);