Commit 27e38392 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Yongbok Kim
Browse files

mips: split cpu_mips_realize_env() out of cpu_mips_init() 



so it can be used in mips_cpu_realizefn() in the next commit

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: default avatarIgor Mammedov <imammedo@redhat.com>
Tested-by: default avatarJames Hogan <james.hogan@imgtec.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarYongbok Kim <yongbok.kim@imgtec.com>
parent 26aa3d9a

target/mips/internal.h

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ void mips_tcg_init(void); 


/* TODO QOM'ify CPU reset and remove */

void cpu_state_reset(CPUMIPSState *s);

void cpu_mips_realize_env(CPUMIPSState *env);



/* cp0_timer.c */

uint32_t cpu_mips_get_random(CPUMIPSState *env);

target/mips/translate.c

+12 −7
Original line number Diff line number Diff line
@@ -20512,6 +20512,17 @@ void mips_tcg_init(void) 








#include "translate_init.c"

















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, env->cpu_model);









}

















MIPSCPU *cpu_mips_init(const char *cpu_model)









{









    MIPSCPU *cpu;








@@ -20524,13 +20535,7 @@ MIPSCPU *cpu_mips_init(const char *cpu_model)







    cpu = MIPS_CPU(object_new(TYPE_MIPS_CPU));









    env = &cpu->env;









    env->cpu_model = def;









    env->exception_base = (int32_t)0xBFC00000;

















#ifndef CONFIG_USER_ONLY









    mmu_init(env, def);









#endif









    fpu_init(env, def);









    mvp_init(env, def);









    cpu_mips_realize_env(env);

















    object_property_set_bool(OBJECT(cpu), true, "realized", NULL);