[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/10] accel/tcg: Restrict cpu_io_recompile() from other accelerat
From: |
Richard Henderson |
Subject: |
[PULL 09/10] accel/tcg: Restrict cpu_io_recompile() from other accelerators |
Date: |
Sat, 23 Jan 2021 08:50:19 -1000 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
As cpu_io_recompile() is only called within TCG accelerator
in cputlb.c, declare it locally.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210117164813.4101761-6-f4bug@amsat.org>
[rth: Adjust vs changed tb_flush_jmp_cache patch.]
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/internal.h | 2 ++
include/exec/exec-all.h | 1 -
accel/tcg/cputlb.c | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/accel/tcg/internal.h b/accel/tcg/internal.h
index 06b341fceb..e9c145e0fb 100644
--- a/accel/tcg/internal.h
+++ b/accel/tcg/internal.h
@@ -15,4 +15,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu, target_ulong pc,
target_ulong cs_base, uint32_t flags,
int cflags);
+void QEMU_NORETURN cpu_io_recompile(CPUState *cpu, uintptr_t retaddr);
+
#endif /* ACCEL_TCG_INTERNAL_H */
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index 3acc7c2943..125000bcf7 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -63,7 +63,6 @@ void restore_state_to_opc(CPUArchState *env, TranslationBlock
*tb,
bool cpu_restore_state(CPUState *cpu, uintptr_t searched_pc, bool will_exit);
void QEMU_NORETURN cpu_loop_exit_noexc(CPUState *cpu);
-void QEMU_NORETURN cpu_io_recompile(CPUState *cpu, uintptr_t retaddr);
void QEMU_NORETURN cpu_loop_exit(CPUState *cpu);
void QEMU_NORETURN cpu_loop_exit_restore(CPUState *cpu, uintptr_t pc);
void QEMU_NORETURN cpu_loop_exit_atomic(CPUState *cpu, uintptr_t pc);
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index 0fa1643ed3..7a69726ba4 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -37,6 +37,7 @@
#include "exec/translate-all.h"
#include "trace/trace-root.h"
#include "trace/mem.h"
+#include "internal.h"
#ifdef CONFIG_PLUGIN
#include "qemu/plugin-memory.h"
#endif
--
2.25.1
- [PULL 00/10] tcg patch queue, Richard Henderson, 2021/01/23
- [PULL 01/10] tcg: update the cpu running flag in cpu_exec_step_atomic, Richard Henderson, 2021/01/23
- [PULL 03/10] tcg: Optimize inline dup_const for MO_64, Richard Henderson, 2021/01/23
- [PULL 05/10] accel/tcg: Make cpu_gen_init() static, Richard Henderson, 2021/01/23
- [PULL 04/10] tcg: Increase the static number of temporaries, Richard Henderson, 2021/01/23
- [PULL 02/10] qemu/compiler: Split out qemu_build_not_reached_always, Richard Henderson, 2021/01/23
- [PULL 07/10] accel/tcg: Restrict tb_gen_code() from other accelerators, Richard Henderson, 2021/01/23
- [PULL 06/10] accel/tcg: Move tb_flush_jmp_cache() to cputlb.c, Richard Henderson, 2021/01/23
- [PULL 08/10] accel/tcg: Declare missing cpu_loop_exit*() stubs, Richard Henderson, 2021/01/23
- [PULL 09/10] accel/tcg: Restrict cpu_io_recompile() from other accelerators,
Richard Henderson <=
- [PULL 10/10] tcg: Toggle page execution for Apple Silicon, Richard Henderson, 2021/01/23
- Re: [PULL 00/10] tcg patch queue, Richard Henderson, 2021/01/23