diff options
| author | Philippe Mathieu-Daudé | 2020-12-06 23:49:07 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé | 2020-12-13 20:27:11 +0100 |
| commit | 7b884bf51e7feb6aee2a6293aee0c40a07bf8080 (patch) | |
| tree | 301e6d3d43794301b86e210bdd4789962b862367 /target | |
| parent | target/mips: Move cpu definitions, reset() and realize() to cpu.c (diff) | |
| download | qemu-7b884bf51e7feb6aee2a6293aee0c40a07bf8080.tar.gz qemu-7b884bf51e7feb6aee2a6293aee0c40a07bf8080.tar.xz qemu-7b884bf51e7feb6aee2a6293aee0c40a07bf8080.zip | |
target/mips: Inline cpu_mips_realize_env() in mips_cpu_realizefn()
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20201206233949.3783184-17-f4bug@amsat.org>
Diffstat (limited to 'target')
| -rw-r--r-- | target/mips/cpu.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/target/mips/cpu.c b/target/mips/cpu.c index f2c4de7d07..aadc6f8e74 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -104,17 +104,6 @@ static bool mips_cpu_has_work(CPUState *cs) #include "translate_init.c.inc" -static void cpu_mips_realize_env(CPUMIPSState *env) -{ - env->exception_base = (int32_t)0xBFC00000; - -#ifndef CONFIG_USER_ONLY - mmu_init(env, env->cpu_model); -#endif - fpu_init(env, env->cpu_model); - mvp_init(env); -} - /* TODO QOM'ify CPU reset and remove */ static void cpu_state_reset(CPUMIPSState *env) { @@ -400,6 +389,7 @@ static void mips_cpu_realizefn(DeviceState *dev, Error **errp) { CPUState *cs = CPU(dev); MIPSCPU *cpu = MIPS_CPU(dev); + CPUMIPSState *env = &cpu->env; MIPSCPUClass *mcc = MIPS_CPU_GET_CLASS(dev); Error *local_err = NULL; @@ -423,7 +413,13 @@ static void mips_cpu_realizefn(DeviceState *dev, Error **errp) return; } - cpu_mips_realize_env(&cpu->env); + env->exception_base = (int32_t)0xBFC00000; + +#ifndef CONFIG_USER_ONLY + mmu_init(env, env->cpu_model); +#endif + fpu_init(env, env->cpu_model); + mvp_init(env); cpu_reset(cs); qemu_init_vcpu(cs); |