Skip to content

Commit

Permalink
gen-icount.h: Rename gen_icount_start/end to gen_tb_start/end
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
@pm215 @blueswirl
pm215 authored and blueswirl committed Mar 3, 2013
1 parent 3a808cc commit 806f352
Show file tree
Hide file tree
Showing 16 changed files with 32 additions and 32 deletions.
4 changes: 2 additions & 2 deletions include/exec/gen-icount.h
View file
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions target-alpha/translate.c
View file
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions target-arm/translate.c
View file
Expand Up @@ -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();

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions target-cris/translate.c
View file
Expand Up @@ -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);

Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions target-i386/translate.c
View file
Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions target-lm32/translate.c
View file
Expand Up @@ -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);

Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions target-m68k/translate.c
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions target-microblaze/translate.c
View file
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions target-mips/translate.c
View file
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions target-openrisc/translate.c
View file
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions target-ppc/translate.c
View file
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions target-s390x/translate.c
View file
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions target-sh4/translate.c
View file
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions target-sparc/translate.c
View file
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions target-unicore32/translate.c
View file
Expand Up @@ -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) {
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions target-xtensa/translate.c
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 806f352

Please sign in to comment.