Commit c5a49c63 authored by Emilio G. Cota's avatar Emilio G. Cota Committed by Richard Henderson
Browse files

tcg: convert tb->cflags reads to tb_cflags(tb) 



Convert all existing readers of tb->cflags to tb_cflags, so that we
use atomic_read and therefore avoid undefined behaviour in C11.

Note that the remaining setters/getters of the field are protected
by tb_lock, and therefore do not need conversion.

Luckily all readers access the field via 'tb->cflags' (so no foo.cflags,
bar->cflags in the code base), which makes the conversion easily
scriptable:

FILES=$(git grep 'tb->cflags' target include/exec/gen-icount.h \
	 accel/tcg/translator.c | cut -f1 -d':' | sort | uniq)

perl -pi -e 's/([^.>])tb->cflags/$1tb_cflags(tb)/g' $FILES
perl -pi -e 's/([a-z->.]*)(->|\.)tb->cflags/tb_cflags($1$2tb)/g' $FILES

Then manually fixed the few errors that checkpatch reported.

Compile-tested for all targets.

Suggested-by: default avatarRichard Henderson <rth@twiddle.net>
Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarEmilio G. Cota <cota@braap.org>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent cdfef171

accel/tcg/translator.c

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ void translator_loop(const TranslatorOps *ops, DisasContextBase *db, 
    db->singlestep_enabled = cpu->singlestep_enabled;



    /* Instruction counting */

    max_insns = db->tb->cflags & CF_COUNT_MASK;

    max_insns = tb_cflags(db->tb) & CF_COUNT_MASK;

    if (max_insns == 0) {

        max_insns = CF_COUNT_MASK;

    }
@@ -95,7 +95,7 @@ void translator_loop(const TranslatorOps *ops, DisasContextBase *db, 
           update db->pc_next and db->is_jmp to indicate what should be

           done next -- either exiting this loop or locate the start of

           the next instruction.  */

        if (db->num_insns == max_insns && (db->tb->cflags & CF_LAST_IO)) {

        if (db->num_insns == max_insns && (tb_cflags(db->tb) & CF_LAST_IO)) {

            /* Accept I/O on the last instruction.  */

            gen_io_start();

            ops->translate_insn(db, cpu);

include/exec/gen-icount.h

+4 −4
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ static inline void gen_tb_start(TranslationBlock *tb) 
    TCGv_i32 count, imm;



    exitreq_label = gen_new_label();

    if (tb->cflags & CF_USE_ICOUNT) {

    if (tb_cflags(tb) & CF_USE_ICOUNT) {

        count = tcg_temp_local_new_i32();

    } else {

        count = tcg_temp_new_i32();
@@ -22,7 +22,7 @@ static inline void gen_tb_start(TranslationBlock *tb) 
    tcg_gen_ld_i32(count, tcg_ctx.tcg_env,

                   -ENV_OFFSET + offsetof(CPUState, icount_decr.u32));



    if (tb->cflags & CF_USE_ICOUNT) {

    if (tb_cflags(tb) & CF_USE_ICOUNT) {

        imm = tcg_temp_new_i32();

        /* We emit a movi with a dummy immediate argument. Keep the insn index

         * of the movi so that we later (when we know the actual insn count)
@@ -36,7 +36,7 @@ static inline void gen_tb_start(TranslationBlock *tb) 


    tcg_gen_brcondi_i32(TCG_COND_LT, count, 0, exitreq_label);



    if (tb->cflags & CF_USE_ICOUNT) {

    if (tb_cflags(tb) & CF_USE_ICOUNT) {

        tcg_gen_st16_i32(count, tcg_ctx.tcg_env,

                         -ENV_OFFSET + offsetof(CPUState, icount_decr.u16.low));

    }
@@ -46,7 +46,7 @@ static inline void gen_tb_start(TranslationBlock *tb) 


static inline void gen_tb_end(TranslationBlock *tb, int num_insns)

{

    if (tb->cflags & CF_USE_ICOUNT) {

    if (tb_cflags(tb) & CF_USE_ICOUNT) {

        /* Update the num_insn immediate parameter now that we know

         * the actual insn count.  */

        tcg_set_insn_param(icount_start_insn_idx, 1, num_insns);

target/alpha/translate.c

+2 −2
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ static bool in_superpage(DisasContext *ctx, int64_t addr) 


static bool use_exit_tb(DisasContext *ctx)

{

    return ((ctx->base.tb->cflags & CF_LAST_IO)

    return ((tb_cflags(ctx->base.tb) & CF_LAST_IO)

            || ctx->base.singlestep_enabled

            || singlestep);

}
@@ -2399,7 +2399,7 @@ static DisasJumpType translate_one(DisasContext *ctx, uint32_t insn) 
        case 0xC000:

            /* RPCC */

            va = dest_gpr(ctx, ra);

            if (ctx->base.tb->cflags & CF_USE_ICOUNT) {

            if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {

                gen_io_start();

                gen_helper_load_pcc(va, cpu_env);

                gen_io_end();

target/arm/translate-a64.c

+4 −3
Original line number Diff line number Diff line
@@ -348,7 +348,8 @@ static inline bool use_goto_tb(DisasContext *s, int n, uint64_t dest) 
    /* No direct tb linking with singlestep (either QEMU's or the ARM

     * debug architecture kind) or deterministic io

     */

    if (s->base.singlestep_enabled || s->ss_active || (s->base.tb->cflags & CF_LAST_IO)) {

    if (s->base.singlestep_enabled || s->ss_active ||

        (tb_cflags(s->base.tb) & CF_LAST_IO)) {

        return false;

    }
@@ -1561,7 +1562,7 @@ static void handle_sys(DisasContext *s, uint32_t insn, bool isread, 
        break;

    }



    if ((s->base.tb->cflags & CF_USE_ICOUNT) && (ri->type & ARM_CP_IO)) {

    if ((tb_cflags(s->base.tb) & CF_USE_ICOUNT) && (ri->type & ARM_CP_IO)) {

        gen_io_start();

    }
@@ -1592,7 +1593,7 @@ static void handle_sys(DisasContext *s, uint32_t insn, bool isread, 
        }

    }



    if ((s->base.tb->cflags & CF_USE_ICOUNT) && (ri->type & ARM_CP_IO)) {

    if ((tb_cflags(s->base.tb) & CF_USE_ICOUNT) && (ri->type & ARM_CP_IO)) {

        /* I/O operations must end the TB here (whether read or write) */

        gen_io_end();

        s->base.is_jmp = DISAS_UPDATE;

target/arm/translate.c

+3 −3
Original line number Diff line number Diff line
@@ -7704,7 +7704,7 @@ static int disas_coproc_insn(DisasContext *s, uint32_t insn) 
            break;

        }



        if ((s->base.tb->cflags & CF_USE_ICOUNT) && (ri->type & ARM_CP_IO)) {

        if ((tb_cflags(s->base.tb) & CF_USE_ICOUNT) && (ri->type & ARM_CP_IO)) {

            gen_io_start();

        }
@@ -7795,7 +7795,7 @@ static int disas_coproc_insn(DisasContext *s, uint32_t insn) 
            }

        }



        if ((s->base.tb->cflags & CF_USE_ICOUNT) && (ri->type & ARM_CP_IO)) {

        if ((tb_cflags(s->base.tb) & CF_USE_ICOUNT) && (ri->type & ARM_CP_IO)) {

            /* I/O operations must end the TB here (whether read or write) */

            gen_io_end();

            gen_lookup_tb(s);
@@ -12253,7 +12253,7 @@ static void arm_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu) 
{

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



    if (dc->base.tb->cflags & CF_LAST_IO && dc->condjmp) {

    if (tb_cflags(dc->base.tb) & CF_LAST_IO && dc->condjmp) {

        /* FIXME: This can theoretically happen with self-modifying code. */

        cpu_abort(cpu, "IO on conditional branch instruction");

    }