[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/22] translate-all: Change tb_flush() env argument
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 07/22] translate-all: Change tb_flush() env argument to cpu |
Date: |
Tue, 7 Jul 2015 01:13:50 +0200 |
From: Peter Crosthwaite <address@hidden>
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 <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Acked-by: Eduardo Habkost <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
exec.c | 3 +--
gdbstub.c | 6 ++----
include/exec/exec-all.h | 2 +-
linux-user/signal.c | 2 +-
target-alpha/sys_helper.c | 2 +-
target-i386/translate.c | 2 +-
translate-all.c | 6 ++----
7 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/exec.c b/exec.c
index a64c3ae..a33d9b2 100644
--- a/exec.c
+++ b/exec.c
@@ -813,8 +813,7 @@ void cpu_single_step(CPUState *cpu, int enabled)
} else {
/* must flush all the translated code to avoid inconsistencies */
/* XXX: only flush what is necessary */
- CPUArchState *env = cpu->env_ptr;
- tb_flush(env);
+ tb_flush(cpu);
}
}
}
diff --git a/gdbstub.c b/gdbstub.c
index cea2a84..0fa8dd8 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -1226,7 +1226,6 @@ void gdb_set_stop_cpu(CPUState *cpu)
static void gdb_vm_state_change(void *opaque, int running, RunState state)
{
GDBState *s = gdbserver_state;
- CPUArchState *env = s->c_cpu->env_ptr;
CPUState *cpu = s->c_cpu;
char buf[256];
const char *type;
@@ -1261,7 +1260,7 @@ static void gdb_vm_state_change(void *opaque, int
running, RunState state)
cpu->watchpoint_hit = NULL;
goto send_packet;
}
- tb_flush(env);
+ tb_flush(cpu);
ret = GDB_SIGNAL_TRAP;
break;
case RUN_STATE_PAUSED:
@@ -1490,7 +1489,6 @@ gdb_queuesig (void)
int
gdb_handlesig(CPUState *cpu, int sig)
{
- CPUArchState *env = cpu->env_ptr;
GDBState *s;
char buf[256];
int n;
@@ -1502,7 +1500,7 @@ gdb_handlesig(CPUState *cpu, int sig)
/* disable single step if it was enabled */
cpu_single_step(cpu, 0);
- tb_flush(env);
+ tb_flush(cpu);
if (sig != 0) {
snprintf(buf, sizeof(buf), "S%02x", target_signal_to_gdb(sig));
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index 01d9996..5a73bcb 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -196,7 +196,7 @@ struct TBContext {
};
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);
#if defined(USE_DIRECT_JUMP)
diff --git a/linux-user/signal.c b/linux-user/signal.c
index 1166f2f..9d4cef4 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -2348,7 +2348,7 @@ static void setup_frame(int sig, struct target_sigaction
*ka,
/* Flush instruction space. */
//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));
return;
diff --git a/target-alpha/sys_helper.c b/target-alpha/sys_helper.c
index ae2e174..1c59e10 100644
--- a/target-alpha/sys_helper.c
+++ b/target-alpha/sys_helper.c
@@ -74,7 +74,7 @@ void helper_tbis(CPUAlphaState *env, uint64_t p)
void helper_tb_flush(CPUAlphaState *env)
{
- tb_flush(env);
+ tb_flush(CPU(alpha_env_get_cpu(env)));
}
void helper_halt(uint64_t restart)
diff --git a/target-i386/translate.c b/target-i386/translate.c
index 7a1bdee..82e2245 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -6925,7 +6925,7 @@ static target_ulong disas_insn(CPUX86State *env,
DisasContext *s,
gen_debug(s, pc_start - s->cs_base);
#else
/* start debug */
- tb_flush(env);
+ tb_flush(CPU(x86_env_get_cpu(env)));
qemu_set_log(CPU_LOG_INT | CPU_LOG_TB_IN_ASM);
#endif
break;
diff --git a/translate-all.c b/translate-all.c
index 412bc90..b27c056 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -770,10 +770,8 @@ static void page_flush_tb(void)
/* flush all the translation blocks */
/* 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)
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),
@@ -1012,7 +1010,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
tb = tb_alloc(pc);
if (!tb) {
/* flush must be done */
- tb_flush(env);
+ tb_flush(cpu);
/* cannot fail at this point */
tb = tb_alloc(pc);
/* Don't forget to invalidate previous TB info. */
--
2.1.4
- [Qemu-devel] [PULL 00/22] QOM CPUState patch queue 2015-07-06, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 01/22] cpu: No need to zero-initialize CPUState::numa_node, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 02/22] cpu: Initialize breakpoint/watchpoint lists in cpu_common_initfn(), Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 03/22] cpu: Reorder cpu->as, cpu->thread_id, cpu->memory_dispatch init, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 05/22] cpu: Convert cpu_index into a bitmap, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 06/22] target-ppc: Move cpu_exec_init() call to realize function, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 04/22] cpu: Add Error argument to cpu_exec_init(), Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 09/22] cpu: Change tcg_cpu_exec() arg to cpu, not env, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 12/22] cpu: Add wrapper for the set_pc() hook, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 07/22] translate-all: Change tb_flush() env argument to cpu,
Andreas Färber <=
- [Qemu-devel] [PULL 08/22] gdbstub: Change gdbserver_fork() to accept cpu instead of env, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 15/22] microblaze: boot: Use cpu_set_pc(), Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 13/22] gdbstub: Use cpu_set_pc() helper, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 14/22] hw/arm/boot: Use cpu_set_pc(), Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 10/22] cpu: Change cpu_exec_init() arg to cpu, not env, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 17/22] disas: QOMify target specific setup, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 11/22] cpu-exec: Purge all uses of ENV_GET_CPU(), Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 18/22] disas: arm-a64: Make printfer and stream variable, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 16/22] disas: Add print_insn to disassemble info, Andreas Färber, 2015/07/06
- [Qemu-devel] [PULL 19/22] disas: arm: QOMify target specific disas setup, Andreas Färber, 2015/07/06