Commit f764718d authored by Richard Henderson's avatar Richard Henderson
Browse files

tcg: Remove TCGV_UNUSED* and TCGV_IS_UNUSED* 



These are now trivial sets and tests against NULL.  Unwrap.

Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent 1f5940e4

target/alpha/translate.c

+11 −11
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ void alpha_translate_init(void) 


static TCGv load_zero(DisasContext *ctx)

{

    if (TCGV_IS_UNUSED_I64(ctx->zero)) {

    if (!ctx->zero) {

        ctx->zero = tcg_const_i64(0);

    }

    return ctx->zero;
@@ -164,7 +164,7 @@ static TCGv load_zero(DisasContext *ctx) 


static TCGv dest_sink(DisasContext *ctx)

{

    if (TCGV_IS_UNUSED_I64(ctx->sink)) {

    if (!ctx->sink) {

        ctx->sink = tcg_temp_new();

    }

    return ctx->sink;
@@ -172,18 +172,18 @@ static TCGv dest_sink(DisasContext *ctx) 


static void free_context_temps(DisasContext *ctx)

{

    if (!TCGV_IS_UNUSED_I64(ctx->sink)) {

    if (ctx->sink) {

        tcg_gen_discard_i64(ctx->sink);

        tcg_temp_free(ctx->sink);

        TCGV_UNUSED_I64(ctx->sink);

        ctx->sink = NULL;

    }

    if (!TCGV_IS_UNUSED_I64(ctx->zero)) {

    if (ctx->zero) {

        tcg_temp_free(ctx->zero);

        TCGV_UNUSED_I64(ctx->zero);

        ctx->zero = NULL;

    }

    if (!TCGV_IS_UNUSED_I64(ctx->lit)) {

    if (ctx->lit) {

        tcg_temp_free(ctx->lit);

        TCGV_UNUSED_I64(ctx->lit);

        ctx->lit = NULL;

    }

}
@@ -2948,9 +2948,9 @@ static int alpha_tr_init_disas_context(DisasContextBase *dcbase, 
    /* Similarly for flush-to-zero.  */

    ctx->tb_ftz = -1;



    TCGV_UNUSED_I64(ctx->zero);

    TCGV_UNUSED_I64(ctx->sink);

    TCGV_UNUSED_I64(ctx->lit);

    ctx->zero = NULL;

    ctx->sink = NULL;

    ctx->lit = NULL;



    /* Bound the number of insns to execute to those left on the page.  */

    if (in_superpage(ctx, ctx->base.pc_first)) {

target/arm/translate-a64.c

+16 −19
Original line number Diff line number Diff line
@@ -405,10 +405,7 @@ static void unallocated_encoding(DisasContext *s) 
static void init_tmp_a64_array(DisasContext *s)

{

#ifdef CONFIG_DEBUG_TCG

    int i;

    for (i = 0; i < ARRAY_SIZE(s->tmp_a64); i++) {

        TCGV_UNUSED_I64(s->tmp_a64[i]);

    }

    memset(s->tmp_a64, 0, sizeof(s->tmp_a64));

#endif

    s->tmp_a64_count = 0;

}
@@ -6276,7 +6273,7 @@ static void disas_simd_scalar_pairwise(DisasContext *s, uint32_t insn) 
            return;

        }



        TCGV_UNUSED_PTR(fpst);

        fpst = NULL;

        break;

    case 0xc: /* FMAXNMP */

    case 0xd: /* FADDP */
@@ -6371,7 +6368,7 @@ static void disas_simd_scalar_pairwise(DisasContext *s, uint32_t insn) 
        tcg_temp_free_i32(tcg_res);

    }



    if (!TCGV_IS_UNUSED_PTR(fpst)) {

    if (fpst) {

        tcg_temp_free_ptr(fpst);

    }

}
@@ -6387,7 +6384,7 @@ static void handle_shri_with_rndacc(TCGv_i64 tcg_res, TCGv_i64 tcg_src, 
                                    bool is_u, int size, int shift)

{

    bool extended_result = false;

    bool round = !TCGV_IS_UNUSED_I64(tcg_rnd);

    bool round = tcg_rnd != NULL;

    int ext_lshift = 0;

    TCGv_i64 tcg_src_hi;
@@ -6533,7 +6530,7 @@ static void handle_scalar_simd_shri(DisasContext *s, 
        uint64_t round_const = 1ULL << (shift - 1);

        tcg_round = tcg_const_i64(round_const);

    } else {

        TCGV_UNUSED_I64(tcg_round);

        tcg_round = NULL;

    }



    tcg_rn = read_fp_dreg(s, rn);
@@ -6649,7 +6646,7 @@ static void handle_vec_simd_sqshrn(DisasContext *s, bool is_scalar, bool is_q, 
        uint64_t round_const = 1ULL << (shift - 1);

        tcg_round = tcg_const_i64(round_const);

    } else {

        TCGV_UNUSED_I64(tcg_round);

        tcg_round = NULL;

    }



    for (i = 0; i < elements; i++) {
@@ -8239,8 +8236,8 @@ static void disas_simd_scalar_two_reg_misc(DisasContext *s, uint32_t insn) 
        gen_helper_set_rmode(tcg_rmode, tcg_rmode, cpu_env);

        tcg_fpstatus = get_fpstatus_ptr();

    } else {

        TCGV_UNUSED_I32(tcg_rmode);

        TCGV_UNUSED_PTR(tcg_fpstatus);

        tcg_rmode = NULL;

        tcg_fpstatus = NULL;

    }



    if (size == 3) {
@@ -8360,7 +8357,7 @@ static void handle_vec_simd_shri(DisasContext *s, bool is_q, bool is_u, 
        uint64_t round_const = 1ULL << (shift - 1);

        tcg_round = tcg_const_i64(round_const);

    } else {

        TCGV_UNUSED_I64(tcg_round);

        tcg_round = NULL;

    }



    for (i = 0; i < elements; i++) {
@@ -8502,7 +8499,7 @@ static void handle_vec_simd_shrn(DisasContext *s, bool is_q, 
        uint64_t round_const = 1ULL << (shift - 1);

        tcg_round = tcg_const_i64(round_const);

    } else {

        TCGV_UNUSED_I64(tcg_round);

        tcg_round = NULL;

    }



    for (i = 0; i < elements; i++) {
@@ -9168,7 +9165,7 @@ static void handle_simd_3same_pair(DisasContext *s, int is_q, int u, int opcode, 
    if (opcode >= 0x58) {

        fpst = get_fpstatus_ptr();

    } else {

        TCGV_UNUSED_PTR(fpst);

        fpst = NULL;

    }



    if (!fp_access_check(s)) {
@@ -9305,7 +9302,7 @@ static void handle_simd_3same_pair(DisasContext *s, int is_q, int u, int opcode, 
        }

    }



    if (!TCGV_IS_UNUSED_PTR(fpst)) {

    if (fpst) {

        tcg_temp_free_ptr(fpst);

    }

}
@@ -10226,13 +10223,13 @@ static void disas_simd_two_reg_misc(DisasContext *s, uint32_t insn) 
    if (need_fpstatus) {

        tcg_fpstatus = get_fpstatus_ptr();

    } else {

        TCGV_UNUSED_PTR(tcg_fpstatus);

        tcg_fpstatus = NULL;

    }

    if (need_rmode) {

        tcg_rmode = tcg_const_i32(arm_rmode_to_sf(rmode));

        gen_helper_set_rmode(tcg_rmode, tcg_rmode, cpu_env);

    } else {

        TCGV_UNUSED_I32(tcg_rmode);

        tcg_rmode = NULL;

    }



    if (size == 3) {
@@ -10593,7 +10590,7 @@ static void disas_simd_indexed(DisasContext *s, uint32_t insn) 
    if (is_fp) {

        fpst = get_fpstatus_ptr();

    } else {

        TCGV_UNUSED_PTR(fpst);

        fpst = NULL;

    }



    if (size == 3) {
@@ -10917,7 +10914,7 @@ static void disas_simd_indexed(DisasContext *s, uint32_t insn) 
        }

    }



    if (!TCGV_IS_UNUSED_PTR(fpst)) {

    if (fpst) {

        tcg_temp_free_ptr(fpst);

    }

}

target/arm/translate.c

+14 −15
Original line number Diff line number Diff line
@@ -2169,8 +2169,8 @@ static int disas_iwmmxt_insn(DisasContext *s, uint32_t insn) 
            tmp3 = tcg_const_i32((insn & 1) << 5);

            break;

        default:

            TCGV_UNUSED_I32(tmp2);

            TCGV_UNUSED_I32(tmp3);

            tmp2 = NULL;

            tmp3 = NULL;

        }

        gen_helper_iwmmxt_insr(cpu_M0, cpu_M0, tmp, tmp2, tmp3);

        tcg_temp_free_i32(tmp3);
@@ -4939,7 +4939,7 @@ static int disas_neon_ls_insn(DisasContext *s, uint32_t insn) 
                        }

                    } else /* size == 0 */ {

                        if (load) {

                            TCGV_UNUSED_I32(tmp2);

                            tmp2 = NULL;

                            for (n = 0; n < 4; n++) {

                                tmp = tcg_temp_new_i32();

                                gen_aa32_ld8u(s, tmp, addr, get_mem_index(s));
@@ -6643,11 +6643,11 @@ static int disas_neon_data_insn(DisasContext *s, uint32_t insn) 
                    tmp = neon_load_reg(rn, 1);

                    neon_store_scratch(2, tmp);

                }

                TCGV_UNUSED_I32(tmp3);

                tmp3 = NULL;

                for (pass = 0; pass < 2; pass++) {

                    if (src1_wide) {

                        neon_load_reg64(cpu_V0, rn + pass);

                        TCGV_UNUSED_I32(tmp);

                        tmp = NULL;

                    } else {

                        if (pass == 1 && rd == rn) {

                            tmp = neon_load_scratch(2);
@@ -6660,7 +6660,7 @@ static int disas_neon_data_insn(DisasContext *s, uint32_t insn) 
                    }

                    if (src2_wide) {

                        neon_load_reg64(cpu_V1, rm + pass);

                        TCGV_UNUSED_I32(tmp2);

                        tmp2 = NULL;

                    } else {

                        if (pass == 1 && rd == rm) {

                            tmp2 = neon_load_scratch(2);
@@ -7078,7 +7078,7 @@ static int disas_neon_data_insn(DisasContext *s, uint32_t insn) 
                    if (rm & 1) {

                        return 1;

                    }

                    TCGV_UNUSED_I32(tmp2);

                    tmp2 = NULL;

                    for (pass = 0; pass < 2; pass++) {

                        neon_load_reg64(cpu_V0, rm + pass);

                        tmp = tcg_temp_new_i32();
@@ -7217,7 +7217,7 @@ static int disas_neon_data_insn(DisasContext *s, uint32_t insn) 
                        if (neon_2rm_is_float_op(op)) {

                            tcg_gen_ld_f32(cpu_F0s, cpu_env,

                                           neon_reg_offset(rm, pass));

                            TCGV_UNUSED_I32(tmp);

                            tmp = NULL;

                        } else {

                            tmp = neon_load_reg(rm, pass);

                        }
@@ -8666,7 +8666,7 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) 
            rn = (insn >> 16) & 0xf;

            tmp = load_reg(s, rn);

        } else {

            TCGV_UNUSED_I32(tmp);

            tmp = NULL;

        }

        rd = (insn >> 12) & 0xf;

        switch(op1) {
@@ -9505,7 +9505,7 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) 


                /* compute total size */

                loaded_base = 0;

                TCGV_UNUSED_I32(loaded_var);

                loaded_var = NULL;

                n = 0;

                for(i=0;i<16;i++) {

                    if (insn & (1 << i))
@@ -10074,7 +10074,7 @@ static int disas_thumb2_insn(DisasContext *s, uint32_t insn) 
                    tcg_gen_addi_i32(addr, addr, -offset);

                }



                TCGV_UNUSED_I32(loaded_var);

                loaded_var = NULL;

                for (i = 0; i < 16; i++) {

                    if ((insn & (1 << i)) == 0)

                        continue;
@@ -11355,7 +11355,7 @@ static void disas_thumb_insn(DisasContext *s, uint32_t insn) 
        } else if (op != 0xf) { /* mvn doesn't read its first operand */

            tmp = load_reg(s, rd);

        } else {

            TCGV_UNUSED_I32(tmp);

            tmp = NULL;

        }



        tmp2 = load_reg(s, rm);
@@ -11686,7 +11686,7 @@ static void disas_thumb_insn(DisasContext *s, uint32_t insn) 
                    tcg_gen_addi_i32(addr, addr, 4);

                }

            }

            TCGV_UNUSED_I32(tmp);

            tmp = NULL;

            if (insn & (1 << 8)) {

                if (insn & (1 << 11)) {

                    /* pop pc */
@@ -11831,8 +11831,7 @@ static void disas_thumb_insn(DisasContext *s, uint32_t insn) 
    case 12:

    {

        /* load/store multiple */

        TCGv_i32 loaded_var;

        TCGV_UNUSED_I32(loaded_var);

        TCGv_i32 loaded_var = NULL;

        rn = (insn >> 8) & 0x7;

        addr = load_reg(s, rn);

        for (i = 0; i < 8; i++) {

target/cris/translate.c

+1 −1
Original line number Diff line number Diff line
@@ -2603,7 +2603,7 @@ static int dec_movem_mr(CPUCRISState *env, DisasContext *dc) 
        tcg_gen_addi_tl(addr, cpu_R[dc->op1], i * 8);

        gen_load(dc, tmp32, addr, 4, 0);

    } else {

        TCGV_UNUSED(tmp32);

        tmp32 = NULL;

    }

    tcg_temp_free(addr);

target/hppa/translate.c

+31 −32
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ void hppa_translate_init(void) 


    int i;



    TCGV_UNUSED(cpu_gr[0]);

    cpu_gr[0] = NULL;

    for (i = 1; i < 32; i++) {

        cpu_gr[i] = tcg_global_mem_new(cpu_env,

                                       offsetof(CPUHPPAState, gr[i]),
@@ -140,28 +140,31 @@ void hppa_translate_init(void) 


static DisasCond cond_make_f(void)

{

    DisasCond r = { .c = TCG_COND_NEVER };

    TCGV_UNUSED(r.a0);

    TCGV_UNUSED(r.a1);

    return r;

    return (DisasCond){

        .c = TCG_COND_NEVER,

        .a0 = NULL,

        .a1 = NULL,

    };

}



static DisasCond cond_make_n(void)

{

    DisasCond r = { .c = TCG_COND_NE, .a0_is_n = true, .a1_is_0 = true };

    r.a0 = cpu_psw_n;

    TCGV_UNUSED(r.a1);

    return r;

    return (DisasCond){

        .c = TCG_COND_NE,

        .a0 = cpu_psw_n,

        .a0_is_n = true,

        .a1 = NULL,

        .a1_is_0 = true

    };

}



static DisasCond cond_make_0(TCGCond c, TCGv a0)

{

    DisasCond r = { .c = c, .a1_is_0 = true };

    DisasCond r = { .c = c, .a1 = NULL, .a1_is_0 = true };



    assert (c != TCG_COND_NEVER && c != TCG_COND_ALWAYS);

    r.a0 = tcg_temp_new();

    tcg_gen_mov_tl(r.a0, a0);

    TCGV_UNUSED(r.a1);



    return r;

}
@@ -199,8 +202,8 @@ static void cond_free(DisasCond *cond) 
        }

        cond->a0_is_n = false;

        cond->a1_is_0 = false;

        TCGV_UNUSED(cond->a0);

        TCGV_UNUSED(cond->a1);

        cond->a0 = NULL;

        cond->a1 = NULL;

        /* fallthru */

    case TCG_COND_ALWAYS:

        cond->c = TCG_COND_NEVER;
@@ -716,9 +719,8 @@ static DisasCond do_sed_cond(unsigned orig, TCGv res) 
static DisasCond do_unit_cond(unsigned cf, TCGv res, TCGv in1, TCGv in2)

{

    DisasCond cond;

    TCGv tmp, cb;

    TCGv tmp, cb = NULL;



    TCGV_UNUSED(cb);

    if (cf & 8) {

        /* Since we want to test lots of carry-out bits all at once, do not

         * do our normal thing and compute carry-in of bit B+1 since that
@@ -826,8 +828,8 @@ static DisasJumpType do_add(DisasContext *ctx, unsigned rt, TCGv in1, TCGv in2, 
    DisasCond cond;



    dest = tcg_temp_new();

    TCGV_UNUSED(cb);

    TCGV_UNUSED(cb_msb);

    cb = NULL;

    cb_msb = NULL;



    if (shift) {

        tmp = get_temp(ctx);
@@ -856,7 +858,7 @@ static DisasJumpType do_add(DisasContext *ctx, unsigned rt, TCGv in1, TCGv in2, 
    }



    /* Compute signed overflow if required.  */

    TCGV_UNUSED(sv);

    sv = NULL;

    if (is_tsv || c == 6) {

        sv = do_add_sv(ctx, dest, in1, in2);

        if (is_tsv) {
@@ -919,7 +921,7 @@ static DisasJumpType do_sub(DisasContext *ctx, unsigned rt, TCGv in1, TCGv in2, 
    tcg_temp_free(zero);



    /* Compute signed overflow if required.  */

    TCGV_UNUSED(sv);

    sv = NULL;

    if (is_tsv || c == 6) {

        sv = do_sub_sv(ctx, dest, in1, in2);

        if (is_tsv) {
@@ -965,7 +967,7 @@ static DisasJumpType do_cmpclr(DisasContext *ctx, unsigned rt, TCGv in1, 
    tcg_gen_sub_tl(dest, in1, in2);



    /* Compute signed overflow if required.  */

    TCGV_UNUSED(sv);

    sv = NULL;

    if ((cf >> 1) == 6) {

        sv = do_sub_sv(ctx, dest, in1, in2);

    }
@@ -2070,8 +2072,7 @@ static DisasJumpType trans_ds(DisasContext *ctx, uint32_t insn, 


    /* Install the new nullification.  */

    if (cf) {

        TCGv sv;

        TCGV_UNUSED(sv);

        TCGv sv = NULL;

        if (cf >> 1 == 6) {

            /* ??? The lshift is supposed to contribute to overflow.  */

            sv = do_add_sv(ctx, dest, add1, add2);
@@ -2542,7 +2543,7 @@ static DisasJumpType trans_cmpb(DisasContext *ctx, uint32_t insn, 


    tcg_gen_sub_tl(dest, in1, in2);



    TCGV_UNUSED(sv);

    sv = NULL;

    if (c == 6) {

        sv = do_sub_sv(ctx, dest, in1, in2);

    }
@@ -2571,8 +2572,8 @@ static DisasJumpType trans_addb(DisasContext *ctx, uint32_t insn, 
    }

    in2 = load_gpr(ctx, r);

    dest = dest_gpr(ctx, r);

    TCGV_UNUSED(sv);

    TCGV_UNUSED(cb_msb);

    sv = NULL;

    cb_msb = NULL;



    switch (c) {

    default:
@@ -3732,18 +3733,16 @@ static int hppa_tr_init_disas_context(DisasContextBase *dcbase, 
{

    DisasContext *ctx = container_of(dcbase, DisasContext, base);

    TranslationBlock *tb = ctx->base.tb;

    int i, bound;

    int bound;



    ctx->cs = cs;

    ctx->iaoq_f = tb->pc;

    ctx->iaoq_b = tb->cs_base;

    ctx->iaoq_n = -1;

    TCGV_UNUSED(ctx->iaoq_n_var);

    ctx->iaoq_n_var = NULL;



    ctx->ntemps = 0;

    for (i = 0; i < ARRAY_SIZE(ctx->temps); ++i) {

        TCGV_UNUSED(ctx->temps[i]);

    }

    memset(ctx->temps, 0, sizeof(ctx->temps));



    bound = -(tb->pc | TARGET_PAGE_MASK) / 4;

    return MIN(max_insns, bound);
@@ -3804,7 +3803,7 @@ static void hppa_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) 
            tcg_gen_addi_tl(ctx->iaoq_n_var, cpu_iaoq_b, 4);

        } else {

            ctx->iaoq_n = ctx->iaoq_b + 4;

            TCGV_UNUSED(ctx->iaoq_n_var);

            ctx->iaoq_n_var = NULL;

        }



        if (unlikely(ctx->null_cond.c == TCG_COND_ALWAYS)) {
@@ -3819,7 +3818,7 @@ static void hppa_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) 
    /* Free any temporaries allocated.  */

    for (i = 0, n = ctx->ntemps; i < n; ++i) {

        tcg_temp_free(ctx->temps[i]);

        TCGV_UNUSED(ctx->temps[i]);

        ctx->temps[i] = NULL;

    }

    ctx->ntemps = 0;