motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
Peter Maydell 2013-02-22 18:10:05 +00:00 • committed by Blue Swirl
parent 3a808cc407
commit 806f352d3d
16 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/exec/gen-icount.h
View file

@ -9,7 +9,7 @@ static TCGArg *icount_arg;
static int icount_label; static int icount_label;
static int exitreq_label; static int exitreq_label;
static inline void gen_icount_start(void) static inline void gen_tb_start(void)
{ {
TCGv_i32 count; TCGv_i32 count;
TCGv_i32 flag; TCGv_i32 flag;
@ -36,7 +36,7 @@ static inline void gen_icount_start(void)
tcg_temp_free_i32(count); 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); gen_set_label(exitreq_label);
tcg_gen_exit_tb((tcg_target_long)tb + TB_EXIT_REQUESTED); tcg_gen_exit_tb((tcg_target_long)tb + TB_EXIT_REQUESTED);

4
target-alpha/translate.c
View file

@ -3411,7 +3411,7 @@ static inline void gen_intermediate_code_internal(CPUAlphaState *env,
if (max_insns == 0) if (max_insns == 0)
max_insns = CF_COUNT_MASK; max_insns = CF_COUNT_MASK;
gen_icount_start(); gen_tb_start();
do { do {
if (unlikely(!QTAILQ_EMPTY(&env->breakpoints))) { if (unlikely(!QTAILQ_EMPTY(&env->breakpoints))) {
QTAILQ_FOREACH(bp, &env->breakpoints, entry) { QTAILQ_FOREACH(bp, &env->breakpoints, entry) {
@ -3478,7 +3478,7 @@ static inline void gen_intermediate_code_internal(CPUAlphaState *env,
abort(); abort();
} }
gen_icount_end(tb, num_insns); gen_tb_end(tb, num_insns);
*tcg_ctx.gen_opc_ptr = INDEX_op_end; *tcg_ctx.gen_opc_ptr = INDEX_op_end;
if (search_pc) { if (search_pc) {
j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf; j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf;

4
target-arm/translate.c
View file

@ -9808,7 +9808,7 @@ static inline void gen_intermediate_code_internal(CPUARMState *env,
if (max_insns == 0) if (max_insns == 0)
max_insns = CF_COUNT_MASK; max_insns = CF_COUNT_MASK;
gen_icount_start(); gen_tb_start();
tcg_clear_temp_count(); tcg_clear_temp_count();
@ -10011,7 +10011,7 @@ static inline void gen_intermediate_code_internal(CPUARMState *env,
} }
done_generating: done_generating:
gen_icount_end(tb, num_insns); gen_tb_end(tb, num_insns);
*tcg_ctx.gen_opc_ptr = INDEX_op_end; *tcg_ctx.gen_opc_ptr = INDEX_op_end;
#ifdef DEBUG_DISAS #ifdef DEBUG_DISAS

4
target-cris/translate.c
View file

@ -3250,7 +3250,7 @@ gen_intermediate_code_internal(CPUCRISState *env, TranslationBlock *tb,
max_insns = CF_COUNT_MASK; max_insns = CF_COUNT_MASK;
} }
gen_icount_start(); gen_tb_start();
do { do {
check_breakpoint(env, dc); check_breakpoint(env, dc);
@ -3391,7 +3391,7 @@ gen_intermediate_code_internal(CPUCRISState *env, TranslationBlock *tb,
break; break;
} }
} }
gen_icount_end(tb, num_insns); gen_tb_end(tb, num_insns);
*tcg_ctx.gen_opc_ptr = INDEX_op_end; *tcg_ctx.gen_opc_ptr = INDEX_op_end;
if (search_pc) { if (search_pc) {
j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf; j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf;

4
target-i386/translate.c
View file

@ -8324,7 +8324,7 @@ static inline void gen_intermediate_code_internal(CPUX86State *env,
if (max_insns == 0) if (max_insns == 0)
max_insns = CF_COUNT_MASK; max_insns = CF_COUNT_MASK;
gen_icount_start(); gen_tb_start();
for(;;) { for(;;) {
if (unlikely(!QTAILQ_EMPTY(&env->breakpoints))) { if (unlikely(!QTAILQ_EMPTY(&env->breakpoints))) {
QTAILQ_FOREACH(bp, &env->breakpoints, entry) { 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) if (tb->cflags & CF_LAST_IO)
gen_io_end(); gen_io_end();
gen_icount_end(tb, num_insns); gen_tb_end(tb, num_insns);
*tcg_ctx.gen_opc_ptr = INDEX_op_end; *tcg_ctx.gen_opc_ptr = INDEX_op_end;
/* we don't forget to fill the last values */ /* we don't forget to fill the last values */
if (search_pc) { if (search_pc) {

4
target-lm32/translate.c
View file

@ -1040,7 +1040,7 @@ static void gen_intermediate_code_internal(CPULM32State *env,
max_insns = CF_COUNT_MASK; max_insns = CF_COUNT_MASK;
} }
gen_icount_start(); gen_tb_start();
do { do {
check_breakpoint(env, dc); 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; *tcg_ctx.gen_opc_ptr = INDEX_op_end;
if (search_pc) { if (search_pc) {
j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf; j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf;

4
target-m68k/translate.c
View file

@ -2999,7 +2999,7 @@ gen_intermediate_code_internal(CPUM68KState *env, TranslationBlock *tb,
if (max_insns == 0) if (max_insns == 0)
max_insns = CF_COUNT_MASK; max_insns = CF_COUNT_MASK;
gen_icount_start(); gen_tb_start();
do { do {
pc_offset = dc->pc - pc_start; pc_offset = dc->pc - pc_start;
gen_throws_exception = NULL; gen_throws_exception = NULL;
@ -3063,7 +3063,7 @@ gen_intermediate_code_internal(CPUM68KState *env, TranslationBlock *tb,
break; break;
} }
} }
gen_icount_end(tb, num_insns); gen_tb_end(tb, num_insns);
*tcg_ctx.gen_opc_ptr = INDEX_op_end; *tcg_ctx.gen_opc_ptr = INDEX_op_end;
#ifdef DEBUG_DISAS #ifdef DEBUG_DISAS

4
target-microblaze/translate.c
View file

@ -1770,7 +1770,7 @@ gen_intermediate_code_internal(CPUMBState *env, TranslationBlock *tb,
if (max_insns == 0) if (max_insns == 0)
max_insns = CF_COUNT_MASK; max_insns = CF_COUNT_MASK;
gen_icount_start(); gen_tb_start();
do do
{ {
#if SIM_COMPAT #if SIM_COMPAT
@ -1894,7 +1894,7 @@ gen_intermediate_code_internal(CPUMBState *env, TranslationBlock *tb,
break; break;
} }
} }
gen_icount_end(tb, num_insns); gen_tb_end(tb, num_insns);
*tcg_ctx.gen_opc_ptr = INDEX_op_end; *tcg_ctx.gen_opc_ptr = INDEX_op_end;
if (search_pc) { if (search_pc) {
j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf; j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf;

4
target-mips/translate.c
View file

@ -15596,7 +15596,7 @@ gen_intermediate_code_internal (CPUMIPSState *env, TranslationBlock *tb,
if (max_insns == 0) if (max_insns == 0)
max_insns = CF_COUNT_MASK; max_insns = CF_COUNT_MASK;
LOG_DISAS("\ntb %p idx %d hflags %04x\n", tb, ctx.mem_idx, ctx.hflags); 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) { while (ctx.bstate == BS_NONE) {
if (unlikely(!QTAILQ_EMPTY(&env->breakpoints))) { if (unlikely(!QTAILQ_EMPTY(&env->breakpoints))) {
QTAILQ_FOREACH(bp, &env->breakpoints, entry) { QTAILQ_FOREACH(bp, &env->breakpoints, entry) {
@ -15694,7 +15694,7 @@ gen_intermediate_code_internal (CPUMIPSState *env, TranslationBlock *tb,
} }
} }
done_generating: done_generating:
gen_icount_end(tb, num_insns); gen_tb_end(tb, num_insns);
*tcg_ctx.gen_opc_ptr = INDEX_op_end; *tcg_ctx.gen_opc_ptr = INDEX_op_end;
if (search_pc) { if (search_pc) {
j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf; j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf;

4
target-openrisc/translate.c
View file

@ -1696,7 +1696,7 @@ static inline void gen_intermediate_code_internal(OpenRISCCPU *cpu,
max_insns = CF_COUNT_MASK; max_insns = CF_COUNT_MASK;
} }
gen_icount_start(); gen_tb_start();
do { do {
check_breakpoint(cpu, dc); 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; *tcg_ctx.gen_opc_ptr = INDEX_op_end;
if (search_pc) { if (search_pc) {
j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf; j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf;

4
target-ppc/translate.c
View file

@ -9557,7 +9557,7 @@ static inline void gen_intermediate_code_internal(CPUPPCState *env,
if (max_insns == 0) if (max_insns == 0)
max_insns = CF_COUNT_MASK; max_insns = CF_COUNT_MASK;
gen_icount_start(); gen_tb_start();
/* Set env in case of segfault during code fetch */ /* Set env in case of segfault during code fetch */
while (ctx.exception == POWERPC_EXCP_NONE while (ctx.exception == POWERPC_EXCP_NONE
&& tcg_ctx.gen_opc_ptr < gen_opc_end) { && 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 */ /* Generate the return instruction */
tcg_gen_exit_tb(0); 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; *tcg_ctx.gen_opc_ptr = INDEX_op_end;
if (unlikely(search_pc)) { if (unlikely(search_pc)) {
j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf; j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf;

4
target-s390x/translate.c
View file

@ -4769,7 +4769,7 @@ static inline void gen_intermediate_code_internal(CPUS390XState *env,
max_insns = CF_COUNT_MASK; max_insns = CF_COUNT_MASK;
} }
gen_icount_start(); gen_tb_start();
do { do {
if (search_pc) { if (search_pc) {
@ -4845,7 +4845,7 @@ static inline void gen_intermediate_code_internal(CPUS390XState *env,
abort(); abort();
} }
gen_icount_end(tb, num_insns); gen_tb_end(tb, num_insns);
*tcg_ctx.gen_opc_ptr = INDEX_op_end; *tcg_ctx.gen_opc_ptr = INDEX_op_end;
if (search_pc) { if (search_pc) {
j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf; j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf;

4
target-sh4/translate.c
View file

@ -1959,7 +1959,7 @@ gen_intermediate_code_internal(CPUSH4State * env, TranslationBlock * tb,
max_insns = tb->cflags & CF_COUNT_MASK; max_insns = tb->cflags & CF_COUNT_MASK;
if (max_insns == 0) if (max_insns == 0)
max_insns = CF_COUNT_MASK; max_insns = CF_COUNT_MASK;
gen_icount_start(); gen_tb_start();
while (ctx.bstate == BS_NONE && tcg_ctx.gen_opc_ptr < gen_opc_end) { while (ctx.bstate == BS_NONE && tcg_ctx.gen_opc_ptr < gen_opc_end) {
if (unlikely(!QTAILQ_EMPTY(&env->breakpoints))) { if (unlikely(!QTAILQ_EMPTY(&env->breakpoints))) {
QTAILQ_FOREACH(bp, &env->breakpoints, entry) { 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; *tcg_ctx.gen_opc_ptr = INDEX_op_end;
if (search_pc) { if (search_pc) {
i = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf; i = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf;

4
target-sparc/translate.c
View file

@ -5249,7 +5249,7 @@ static inline void gen_intermediate_code_internal(TranslationBlock * tb,
max_insns = tb->cflags & CF_COUNT_MASK; max_insns = tb->cflags & CF_COUNT_MASK;
if (max_insns == 0) if (max_insns == 0)
max_insns = CF_COUNT_MASK; max_insns = CF_COUNT_MASK;
gen_icount_start(); gen_tb_start();
do { do {
if (unlikely(!QTAILQ_EMPTY(&env->breakpoints))) { if (unlikely(!QTAILQ_EMPTY(&env->breakpoints))) {
QTAILQ_FOREACH(bp, &env->breakpoints, entry) { QTAILQ_FOREACH(bp, &env->breakpoints, entry) {
@ -5319,7 +5319,7 @@ static inline void gen_intermediate_code_internal(TranslationBlock * tb,
tcg_gen_exit_tb(0); 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; *tcg_ctx.gen_opc_ptr = INDEX_op_end;
if (spc) { if (spc) {
j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf; j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf;

4
target-unicore32/translate.c
View file

@ -1921,7 +1921,7 @@ static inline void gen_intermediate_code_internal(CPUUniCore32State *env,
} }
#endif #endif
gen_icount_start(); gen_tb_start();
do { do {
if (unlikely(!QTAILQ_EMPTY(&env->breakpoints))) { if (unlikely(!QTAILQ_EMPTY(&env->breakpoints))) {
QTAILQ_FOREACH(bp, &env->breakpoints, entry) { QTAILQ_FOREACH(bp, &env->breakpoints, entry) {
@ -2041,7 +2041,7 @@ static inline void gen_intermediate_code_internal(CPUUniCore32State *env,
} }
done_generating: done_generating:
gen_icount_end(tb, num_insns); gen_tb_end(tb, num_insns);
*tcg_ctx.gen_opc_ptr = INDEX_op_end; *tcg_ctx.gen_opc_ptr = INDEX_op_end;
#ifdef DEBUG_DISAS #ifdef DEBUG_DISAS

4
target-xtensa/translate.c
View file

@ -2913,7 +2913,7 @@ static void gen_intermediate_code_internal(
dc.next_icount = tcg_temp_local_new_i32(); dc.next_icount = tcg_temp_local_new_i32();
} }
gen_icount_start(); gen_tb_start();
if (env->singlestep_enabled && env->exception_taken) { if (env->singlestep_enabled && env->exception_taken) {
env->exception_taken = 0; env->exception_taken = 0;
@ -2991,7 +2991,7 @@ static void gen_intermediate_code_internal(
if (dc.is_jmp == DISAS_NEXT) { if (dc.is_jmp == DISAS_NEXT) {
gen_jumpi(&dc, dc.pc, 0); 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; *tcg_ctx.gen_opc_ptr = INDEX_op_end;
if (search_pc) { if (search_pc) {