Commit 806f352d authored by Peter Maydell's avatar Peter Maydell Committed by Blue Swirl
Browse files

gen-icount.h: Rename gen_icount_start/end to gen_tb_start/end 



The gen_icount_start/end functions are now somewhat misnamed since they
are useful for generic "start/end of TB" code, used for more than just
icount. Rename them to gen_tb_start/end.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 3a808cc4

include/exec/gen-icount.h

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ static TCGArg *icount_arg; 
static int icount_label;

static int exitreq_label;



static inline void gen_icount_start(void)

static inline void gen_tb_start(void)

{

    TCGv_i32 count;

    TCGv_i32 flag;
@@ -36,7 +36,7 @@ static inline void gen_icount_start(void) 
    tcg_temp_free_i32(count);

}



static void gen_icount_end(TranslationBlock *tb, int num_insns)

static void gen_tb_end(TranslationBlock *tb, int num_insns)

{

    gen_set_label(exitreq_label);

    tcg_gen_exit_tb((tcg_target_long)tb + TB_EXIT_REQUESTED);

target-alpha/translate.c

+2 −2
Original line number Diff line number Diff line
@@ -3411,7 +3411,7 @@ static inline void gen_intermediate_code_internal(CPUAlphaState *env, 
    if (max_insns == 0)

        max_insns = CF_COUNT_MASK;



    gen_icount_start();

    gen_tb_start();

    do {

        if (unlikely(!QTAILQ_EMPTY(&env->breakpoints))) {

            QTAILQ_FOREACH(bp, &env->breakpoints, entry) {
@@ -3478,7 +3478,7 @@ static inline void gen_intermediate_code_internal(CPUAlphaState *env, 
        abort();

    }



    gen_icount_end(tb, num_insns);

    gen_tb_end(tb, num_insns);

    *tcg_ctx.gen_opc_ptr = INDEX_op_end;

    if (search_pc) {

        j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf;

target-arm/translate.c

+2 −2
Original line number Diff line number Diff line
@@ -9808,7 +9808,7 @@ static inline void gen_intermediate_code_internal(CPUARMState *env, 
    if (max_insns == 0)

        max_insns = CF_COUNT_MASK;



    gen_icount_start();

    gen_tb_start();



    tcg_clear_temp_count();
@@ -10011,7 +10011,7 @@ static inline void gen_intermediate_code_internal(CPUARMState *env, 
    }



done_generating:

    gen_icount_end(tb, num_insns);

    gen_tb_end(tb, num_insns);

    *tcg_ctx.gen_opc_ptr = INDEX_op_end;



#ifdef DEBUG_DISAS

target-cris/translate.c

+2 −2
Original line number Diff line number Diff line
@@ -3250,7 +3250,7 @@ gen_intermediate_code_internal(CPUCRISState *env, TranslationBlock *tb, 
        max_insns = CF_COUNT_MASK;

    }



    gen_icount_start();

    gen_tb_start();

    do {

        check_breakpoint(env, dc);
@@ -3391,7 +3391,7 @@ gen_intermediate_code_internal(CPUCRISState *env, TranslationBlock *tb, 
            break;

        }

    }

    gen_icount_end(tb, num_insns);

    gen_tb_end(tb, num_insns);

    *tcg_ctx.gen_opc_ptr = INDEX_op_end;

    if (search_pc) {

        j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf;

target-i386/translate.c

+2 −2
Original line number Diff line number Diff line
@@ -8324,7 +8324,7 @@ static inline void gen_intermediate_code_internal(CPUX86State *env, 
    if (max_insns == 0)

        max_insns = CF_COUNT_MASK;



    gen_icount_start();

    gen_tb_start();

    for(;;) {

        if (unlikely(!QTAILQ_EMPTY(&env->breakpoints))) {

            QTAILQ_FOREACH(bp, &env->breakpoints, entry) {
@@ -8382,7 +8382,7 @@ static inline void gen_intermediate_code_internal(CPUX86State *env, 
    }

    if (tb->cflags & CF_LAST_IO)

        gen_io_end();

    gen_icount_end(tb, num_insns);

    gen_tb_end(tb, num_insns);

    *tcg_ctx.gen_opc_ptr = INDEX_op_end;

    /* we don't forget to fill the last values */

    if (search_pc) {