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

gen-icount: use tcg_ctx.tcg_env instead of cpu_env 



We are relying on cpu_env being defined as a global, yet most
targets (i.e. all but arm/a64) have it defined as a local variable.
Luckily all of them use the same "cpu_env" name, but really
compilation shouldn't break if the name of that local variable
changed.

Fix it by using tcg_ctx.tcg_env, which all targets set in their
translate_init function. This change also helps paving the way
for the upcoming "translation loop common to all targets" work.

Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarEmilio G. Cota <cota@braap.org>
Message-Id: <1497639397-19453-3-git-send-email-cota@braap.org>
Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
parent ae06cb46

include/exec/gen-icount.h

+6 −4
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ static inline void gen_tb_start(TranslationBlock *tb) 
        count = tcg_temp_new_i32();

    }



    tcg_gen_ld_i32(count, cpu_env,

    tcg_gen_ld_i32(count, tcg_ctx.tcg_env,

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



    if (tb->cflags & CF_USE_ICOUNT) {
@@ -37,7 +37,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) {

        tcg_gen_st16_i32(count, cpu_env,

        tcg_gen_st16_i32(count, tcg_ctx.tcg_env,

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

    }
@@ -62,14 +62,16 @@ static inline void gen_tb_end(TranslationBlock *tb, int num_insns) 
static inline void gen_io_start(void)

{

    TCGv_i32 tmp = tcg_const_i32(1);

    tcg_gen_st_i32(tmp, cpu_env, -ENV_OFFSET + offsetof(CPUState, can_do_io));

    tcg_gen_st_i32(tmp, tcg_ctx.tcg_env,

                   -ENV_OFFSET + offsetof(CPUState, can_do_io));

    tcg_temp_free_i32(tmp);

}



static inline void gen_io_end(void)

{

    TCGv_i32 tmp = tcg_const_i32(0);

    tcg_gen_st_i32(tmp, cpu_env, -ENV_OFFSET + offsetof(CPUState, can_do_io));

    tcg_gen_st_i32(tmp, tcg_ctx.tcg_env,

                   -ENV_OFFSET + offsetof(CPUState, can_do_io));

    tcg_temp_free_i32(tmp);

}