[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 20/30] target/mips: Restrict mmu_init() to TCG
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v4 20/30] target/mips: Restrict mmu_init() to TCG |
Date: |
Wed, 28 Apr 2021 19:04:00 +0200 |
mmu_init() is only required by TCG accelerator.
Restrict its declaration and call to TCG.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
target/mips/internal.h | 3 ---
target/mips/tcg/tcg-internal.h | 2 ++
target/mips/cpu.c | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/target/mips/internal.h b/target/mips/internal.h
index 6bac8ef704a..2c9666905df 100644
--- a/target/mips/internal.h
+++ b/target/mips/internal.h
@@ -233,9 +233,6 @@ void cpu_mips_store_compare(CPUMIPSState *env, uint32_t
value);
void cpu_mips_start_count(CPUMIPSState *env);
void cpu_mips_stop_count(CPUMIPSState *env);
-/* helper.c */
-void mmu_init(CPUMIPSState *env, const mips_def_t *def);
-
static inline void mips_env_set_pc(CPUMIPSState *env, target_ulong value)
{
env->active_tc.PC = value & ~(target_ulong)1;
diff --git a/target/mips/tcg/tcg-internal.h b/target/mips/tcg/tcg-internal.h
index b65580af211..70655bab45c 100644
--- a/target/mips/tcg/tcg-internal.h
+++ b/target/mips/tcg/tcg-internal.h
@@ -20,6 +20,8 @@ bool mips_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
#if !defined(CONFIG_USER_ONLY)
+void mmu_init(CPUMIPSState *env, const mips_def_t *def);
+
void update_pagemask(CPUMIPSState *env, target_ulong arg1, int32_t *pagemask);
uint32_t cpu_mips_get_random(CPUMIPSState *env);
diff --git a/target/mips/cpu.c b/target/mips/cpu.c
index a751c958329..c3159e3d7f3 100644
--- a/target/mips/cpu.c
+++ b/target/mips/cpu.c
@@ -708,7 +708,7 @@ static void mips_cpu_realizefn(DeviceState *dev, Error
**errp)
env->exception_base = (int32_t)0xBFC00000;
-#ifndef CONFIG_USER_ONLY
+#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY)
mmu_init(env, env->cpu_model);
#endif
fpu_init(env, env->cpu_model);
--
2.26.3
- [PATCH v4 10/30] target/mips: Extract load/store helpers to ldst_helper.c, (continued)
- [PATCH v4 10/30] target/mips: Extract load/store helpers to ldst_helper.c, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 11/30] meson: Introduce meson_user_arch source set for arch-specific user-mode, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 12/30] target/mips: Introduce tcg-internal.h for TCG specific declarations, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 13/30] target/mips: Add simple user-mode mips_cpu_do_interrupt(), Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 14/30] target/mips: Add simple user-mode mips_cpu_tlb_fill(), Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 15/30] target/mips: Move cpu_signal_handler definition around, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 16/30] target/mips: Move sysemu specific files under sysemu/ subfolder, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 17/30] target/mips: Move physical addressing code to sysemu/physaddr.c, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 18/30] target/mips: Restrict cpu_mips_get_random() / update_pagemask() to TCG, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 19/30] target/mips: Move sysemu TCG-specific code to tcg/sysemu/ subfolder, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 20/30] target/mips: Restrict mmu_init() to TCG,
Philippe Mathieu-Daudé <=
- [PATCH v4 21/30] target/mips: Move tlb_helper.c to tcg/sysemu/, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 22/30] target/mips: Restrict CPUMIPSTLBContext::map_address() handlers scope, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 23/30] target/mips: Move Special opcodes to tcg/sysemu/special_helper.c, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 24/30] target/mips: Move helper_cache() to tcg/sysemu/special_helper.c, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 25/30] target/mips: Move TLB management helpers to tcg/sysemu/tlb_helper.c, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 26/30] target/mips: Move exception management code to exception.c, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 27/30] target/mips: Move CP0 helpers to sysemu/cp0.c, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 28/30] target/mips: Move TCG source files under tcg/ sub directory, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 29/30] hw/mips: Restrict non-virtualized machines to TCG, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v4 30/30] gitlab-ci: Add KVM mips64el cross-build jobs, Philippe Mathieu-Daudé, 2021/04/28