diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2013-02-22 18:10:05 +0000 |
---|---|---|
committer | Blue Swirl <blauwirbel@gmail.com> | 2013-03-03 14:29:08 +0000 |
commit | 806f352d3d6f7b326b0ab3a49c622b124459dc8d (patch) | |
tree | 0e2c636cf4b584f11e582d979b22f8d07e5bbbd2 | |
parent | 3a808cc407744c30daa7470b5f191cde1fbc1aae (diff) | |
download | qemu-806f352d3d6f7b326b0ab3a49c622b124459dc8d.zip qemu-806f352d3d6f7b326b0ab3a49c622b124459dc8d.tar.gz qemu-806f352d3d6f7b326b0ab3a49c622b124459dc8d.tar.bz2 |
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: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
-rw-r--r-- | include/exec/gen-icount.h | 4 | ||||
-rw-r--r-- | target-alpha/translate.c | 4 | ||||
-rw-r--r-- | target-arm/translate.c | 4 | ||||
-rw-r--r-- | target-cris/translate.c | 4 | ||||
-rw-r--r-- | target-i386/translate.c | 4 | ||||
-rw-r--r-- | target-lm32/translate.c | 4 | ||||
-rw-r--r-- | target-m68k/translate.c | 4 | ||||
-rw-r--r-- | target-microblaze/translate.c | 4 | ||||
-rw-r--r-- | target-mips/translate.c | 4 | ||||
-rw-r--r-- | target-openrisc/translate.c | 4 | ||||
-rw-r--r-- | target-ppc/translate.c | 4 | ||||
-rw-r--r-- | target-s390x/translate.c | 4 | ||||
-rw-r--r-- | target-sh4/translate.c | 4 | ||||
-rw-r--r-- | target-sparc/translate.c | 4 | ||||
-rw-r--r-- | target-unicore32/translate.c | 4 | ||||
-rw-r--r-- | target-xtensa/translate.c | 4 |
16 files changed, 32 insertions, 32 deletions
diff --git a/include/exec/gen-icount.h b/include/exec/gen-icount.h index 384153b..4e3b17b 100644 --- a/include/exec/gen-icount.h +++ b/include/exec/gen-icount.h @@ -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); diff --git a/target-alpha/translate.c b/target-alpha/translate.c index f8f7695..657f5e1 100644 --- a/target-alpha/translate.c +++ b/target-alpha/translate.c @@ -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; diff --git a/target-arm/translate.c b/target-arm/translate.c index f2f649d..db63c6e 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -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 diff --git a/target-cris/translate.c b/target-cris/translate.c index 14c167f..ec71ef4 100644 --- a/target-cris/translate.c +++ b/target-cris/translate.c @@ -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; diff --git a/target-i386/translate.c b/target-i386/translate.c index 3b92f3b..705147a 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -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) { diff --git a/target-lm32/translate.c b/target-lm32/translate.c index ccaf838..695d9c5 100644 --- a/target-lm32/translate.c +++ b/target-lm32/translate.c @@ -1040,7 +1040,7 @@ static void gen_intermediate_code_internal(CPULM32State *env, max_insns = CF_COUNT_MASK; } - gen_icount_start(); + gen_tb_start(); do { check_breakpoint(env, dc); @@ -1102,7 +1102,7 @@ static void gen_intermediate_code_internal(CPULM32State *env, } } - 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; diff --git a/target-m68k/translate.c b/target-m68k/translate.c index 3f1478c..20a86d8 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -2999,7 +2999,7 @@ gen_intermediate_code_internal(CPUM68KState *env, TranslationBlock *tb, if (max_insns == 0) max_insns = CF_COUNT_MASK; - gen_icount_start(); + gen_tb_start(); do { pc_offset = dc->pc - pc_start; gen_throws_exception = NULL; @@ -3063,7 +3063,7 @@ gen_intermediate_code_internal(CPUM68KState *env, TranslationBlock *tb, break; } } - gen_icount_end(tb, num_insns); + gen_tb_end(tb, num_insns); *tcg_ctx.gen_opc_ptr = INDEX_op_end; #ifdef DEBUG_DISAS diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c index 687b7d1..a74da8e 100644 --- a/target-microblaze/translate.c +++ b/target-microblaze/translate.c @@ -1770,7 +1770,7 @@ gen_intermediate_code_internal(CPUMBState *env, TranslationBlock *tb, if (max_insns == 0) max_insns = CF_COUNT_MASK; - gen_icount_start(); + gen_tb_start(); do { #if SIM_COMPAT @@ -1894,7 +1894,7 @@ gen_intermediate_code_internal(CPUMBState *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; diff --git a/target-mips/translate.c b/target-mips/translate.c index f10a533..6ce2f03 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -15596,7 +15596,7 @@ gen_intermediate_code_internal (CPUMIPSState *env, TranslationBlock *tb, if (max_insns == 0) max_insns = CF_COUNT_MASK; LOG_DISAS("\ntb %p idx %d hflags %04x\n", tb, ctx.mem_idx, ctx.hflags); - gen_icount_start(); + gen_tb_start(); while (ctx.bstate == BS_NONE) { if (unlikely(!QTAILQ_EMPTY(&env->breakpoints))) { QTAILQ_FOREACH(bp, &env->breakpoints, entry) { @@ -15694,7 +15694,7 @@ gen_intermediate_code_internal (CPUMIPSState *env, TranslationBlock *tb, } } done_generating: - 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; diff --git a/target-openrisc/translate.c b/target-openrisc/translate.c index 23e853e..0eafd02 100644 --- a/target-openrisc/translate.c +++ b/target-openrisc/translate.c @@ -1696,7 +1696,7 @@ static inline void gen_intermediate_code_internal(OpenRISCCPU *cpu, max_insns = CF_COUNT_MASK; } - gen_icount_start(); + gen_tb_start(); do { check_breakpoint(cpu, dc); @@ -1779,7 +1779,7 @@ static inline void gen_intermediate_code_internal(OpenRISCCPU *cpu, } } - 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; diff --git a/target-ppc/translate.c b/target-ppc/translate.c index 80d5366..fa9e9e3 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -9557,7 +9557,7 @@ static inline void gen_intermediate_code_internal(CPUPPCState *env, if (max_insns == 0) max_insns = CF_COUNT_MASK; - gen_icount_start(); + gen_tb_start(); /* Set env in case of segfault during code fetch */ while (ctx.exception == POWERPC_EXCP_NONE && tcg_ctx.gen_opc_ptr < gen_opc_end) { @@ -9669,7 +9669,7 @@ static inline void gen_intermediate_code_internal(CPUPPCState *env, /* Generate the return instruction */ tcg_gen_exit_tb(0); } - gen_icount_end(tb, num_insns); + gen_tb_end(tb, num_insns); *tcg_ctx.gen_opc_ptr = INDEX_op_end; if (unlikely(search_pc)) { j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf; diff --git a/target-s390x/translate.c b/target-s390x/translate.c index bdf69a3..88e481c 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -4769,7 +4769,7 @@ static inline void gen_intermediate_code_internal(CPUS390XState *env, max_insns = CF_COUNT_MASK; } - gen_icount_start(); + gen_tb_start(); do { if (search_pc) { @@ -4845,7 +4845,7 @@ static inline void gen_intermediate_code_internal(CPUS390XState *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; diff --git a/target-sh4/translate.c b/target-sh4/translate.c index d255066..7f300e3 100644 --- a/target-sh4/translate.c +++ b/target-sh4/translate.c @@ -1959,7 +1959,7 @@ gen_intermediate_code_internal(CPUSH4State * env, TranslationBlock * tb, max_insns = tb->cflags & CF_COUNT_MASK; if (max_insns == 0) max_insns = CF_COUNT_MASK; - gen_icount_start(); + gen_tb_start(); while (ctx.bstate == BS_NONE && tcg_ctx.gen_opc_ptr < gen_opc_end) { if (unlikely(!QTAILQ_EMPTY(&env->breakpoints))) { QTAILQ_FOREACH(bp, &env->breakpoints, entry) { @@ -2029,7 +2029,7 @@ gen_intermediate_code_internal(CPUSH4State * env, TranslationBlock * tb, } } - gen_icount_end(tb, num_insns); + gen_tb_end(tb, num_insns); *tcg_ctx.gen_opc_ptr = INDEX_op_end; if (search_pc) { i = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf; diff --git a/target-sparc/translate.c b/target-sparc/translate.c index 12276d5..eb6e800 100644 --- a/target-sparc/translate.c +++ b/target-sparc/translate.c @@ -5249,7 +5249,7 @@ static inline void gen_intermediate_code_internal(TranslationBlock * tb, max_insns = tb->cflags & CF_COUNT_MASK; 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) { @@ -5319,7 +5319,7 @@ static inline void gen_intermediate_code_internal(TranslationBlock * tb, tcg_gen_exit_tb(0); } } - gen_icount_end(tb, num_insns); + gen_tb_end(tb, num_insns); *tcg_ctx.gen_opc_ptr = INDEX_op_end; if (spc) { j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf; diff --git a/target-unicore32/translate.c b/target-unicore32/translate.c index d5039e2..151e35e 100644 --- a/target-unicore32/translate.c +++ b/target-unicore32/translate.c @@ -1921,7 +1921,7 @@ static inline void gen_intermediate_code_internal(CPUUniCore32State *env, } #endif - gen_icount_start(); + gen_tb_start(); do { if (unlikely(!QTAILQ_EMPTY(&env->breakpoints))) { QTAILQ_FOREACH(bp, &env->breakpoints, entry) { @@ -2041,7 +2041,7 @@ static inline void gen_intermediate_code_internal(CPUUniCore32State *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 diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c index 11e06a3..06d68db 100644 --- a/target-xtensa/translate.c +++ b/target-xtensa/translate.c @@ -2913,7 +2913,7 @@ static void gen_intermediate_code_internal( dc.next_icount = tcg_temp_local_new_i32(); } - gen_icount_start(); + gen_tb_start(); if (env->singlestep_enabled && env->exception_taken) { env->exception_taken = 0; @@ -2991,7 +2991,7 @@ static void gen_intermediate_code_internal( if (dc.is_jmp == DISAS_NEXT) { gen_jumpi(&dc, dc.pc, 0); } - gen_icount_end(tb, insn_count); + gen_tb_end(tb, insn_count); *tcg_ctx.gen_opc_ptr = INDEX_op_end; if (search_pc) { |