OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

translate-all: Change tb_flush() env argument to cpu 

All of the core-code usages of this API have the cpu pointer handy so
pass it in. There are only 3 architecture specific usages (2 of which
are commented out) which can just use ENV_GET_CPU() locally to get the
cpu pointer. The reduces core code usage of the CPU env, which brings
us closer to common-obj'ing these core files.

Cc: Riku Voipio <riku.voipio@iki.fi>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Acked-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Peter Crosthwaite 2015-06-23 19:31:15 -07:00 committed by Andreas Färber
parent 6dd0f8342d
commit bbd77c180d
7 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
exec.c
View File

@ -816,8 +816,7 @@ void cpu_single_step(CPUState *cpu, int enabled)
} else { } else {
/* must flush all the translated code to avoid inconsistencies */ /* must flush all the translated code to avoid inconsistencies */
/* XXX: only flush what is necessary */ /* XXX: only flush what is necessary */
CPUArchState *env = cpu->env_ptr; tb_flush(cpu);
tb_flush(env);
} }
} }
} }

6
gdbstub.c
View File

@ -1226,7 +1226,6 @@ void gdb_set_stop_cpu(CPUState *cpu)
static void gdb_vm_state_change(void *opaque, int running, RunState state) static void gdb_vm_state_change(void *opaque, int running, RunState state)
{ {
GDBState *s = gdbserver_state; GDBState *s = gdbserver_state;
CPUArchState *env = s->c_cpu->env_ptr;
CPUState *cpu = s->c_cpu; CPUState *cpu = s->c_cpu;
char buf[256]; char buf[256];
const char *type; const char *type;
@ -1261,7 +1260,7 @@ static void gdb_vm_state_change(void *opaque, int running, RunState state)
cpu->watchpoint_hit = NULL; cpu->watchpoint_hit = NULL;
goto send_packet; goto send_packet;
} }
tb_flush(env); tb_flush(cpu);
ret = GDB_SIGNAL_TRAP; ret = GDB_SIGNAL_TRAP;
break; break;
case RUN_STATE_PAUSED: case RUN_STATE_PAUSED:
@ -1490,7 +1489,6 @@ gdb_queuesig (void)
int int
gdb_handlesig(CPUState *cpu, int sig) gdb_handlesig(CPUState *cpu, int sig)
{ {
CPUArchState *env = cpu->env_ptr;
GDBState *s; GDBState *s;
char buf[256]; char buf[256];
int n; int n;
@ -1502,7 +1500,7 @@ gdb_handlesig(CPUState *cpu, int sig)
/* disable single step if it was enabled */ /* disable single step if it was enabled */
cpu_single_step(cpu, 0); cpu_single_step(cpu, 0);
tb_flush(env); tb_flush(cpu);
if (sig != 0) { if (sig != 0) {
snprintf(buf, sizeof(buf), "S%02x", target_signal_to_gdb(sig)); snprintf(buf, sizeof(buf), "S%02x", target_signal_to_gdb(sig));

2
include/exec/exec-all.h
View File

@ -196,7 +196,7 @@ struct TBContext {
}; };
void tb_free(TranslationBlock *tb); void tb_free(TranslationBlock *tb);
void tb_flush(CPUArchState *env); void tb_flush(CPUState *cpu);
void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr); void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr);
#if defined(USE_DIRECT_JUMP) #if defined(USE_DIRECT_JUMP)

2
linux-user/signal.c
View File

@ -2348,7 +2348,7 @@ static void setup_frame(int sig, struct target_sigaction *ka,
/* Flush instruction space. */ /* Flush instruction space. */
//flush_sig_insns(current->mm, (unsigned long) &(sf->insns[0])); //flush_sig_insns(current->mm, (unsigned long) &(sf->insns[0]));
// tb_flush(env); // tb_flush(CPU(sparc_env_get_cpu(env)));
} }
unlock_user(sf, sf_addr, sizeof(struct target_signal_frame)); unlock_user(sf, sf_addr, sizeof(struct target_signal_frame));
return; return;

2
target-alpha/sys_helper.c
View File

@ -74,7 +74,7 @@ void helper_tbis(CPUAlphaState *env, uint64_t p)
void helper_tb_flush(CPUAlphaState *env) void helper_tb_flush(CPUAlphaState *env)
{ {
tb_flush(env); tb_flush(CPU(alpha_env_get_cpu(env)));
} }
void helper_halt(uint64_t restart) void helper_halt(uint64_t restart)

2
target-i386/translate.c
View File

@ -6925,7 +6925,7 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
gen_debug(s, pc_start - s->cs_base); gen_debug(s, pc_start - s->cs_base);
#else #else
/* start debug */ /* start debug */
tb_flush(env); tb_flush(CPU(x86_env_get_cpu(env)));
qemu_set_log(CPU_LOG_INT | CPU_LOG_TB_IN_ASM); qemu_set_log(CPU_LOG_INT | CPU_LOG_TB_IN_ASM);
#endif #endif
break; break;

6
translate-all.c
View File

@ -772,10 +772,8 @@ static void page_flush_tb(void)
/* flush all the translation blocks */ /* flush all the translation blocks */
/* XXX: tb_flush is currently not thread safe */ /* XXX: tb_flush is currently not thread safe */
void tb_flush(CPUArchState *env1) void tb_flush(CPUState *cpu)
{ {
CPUState *cpu = ENV_GET_CPU(env1);
#if defined(DEBUG_FLUSH) #if defined(DEBUG_FLUSH)
printf("qemu: flush code_size=%ld nb_tbs=%d avg_tb_size=%ld\n", printf("qemu: flush code_size=%ld nb_tbs=%d avg_tb_size=%ld\n",
(unsigned long)(tcg_ctx.code_gen_ptr - tcg_ctx.code_gen_buffer), (unsigned long)(tcg_ctx.code_gen_ptr - tcg_ctx.code_gen_buffer),
@ -1014,7 +1012,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
tb = tb_alloc(pc); tb = tb_alloc(pc);
if (!tb) { if (!tb) {
/* flush must be done */ /* flush must be done */
tb_flush(env); tb_flush(cpu);
/* cannot fail at this point */ /* cannot fail at this point */
tb = tb_alloc(pc); tb = tb_alloc(pc);
/* Don't forget to invalidate previous TB info. */ /* Don't forget to invalidate previous TB info. */