target-mips: fix user-mode emulation startup
Running programs with the MIPS user-mode emulator fails during dynamic loading, as floating-point instructions are not enabled in in env->hflags. Move the code for doing so from fpu_init to cpu_reset so the MIPS_HFLAG_{FPU,F64} setting doesn't get clobbered by cpu_reset setting env->hflags to MIPS_HFLAG_UM. The same end can be achieved by swapping the ordering of fpu_init and cpu_reset in cpu_mips_init, but it seemed better to consolidate the CONFIG_USER_ONLY code into a single location. Signed-off-by: Nathan Froyd <froydnj@codesourcery.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
parent
f1e00a9cf3
commit
91a7593526
|
@ -9845,6 +9845,14 @@ void cpu_reset (CPUMIPSState *env)
|
||||||
env->hflags = MIPS_HFLAG_UM;
|
env->hflags = MIPS_HFLAG_UM;
|
||||||
/* Enable access to the SYNCI_Step register. */
|
/* Enable access to the SYNCI_Step register. */
|
||||||
env->CP0_HWREna |= (1 << 1);
|
env->CP0_HWREna |= (1 << 1);
|
||||||
|
if (env->CP0_Config1 & (1 << CP0C1_FP)) {
|
||||||
|
env->hflags |= MIPS_HFLAG_FPU;
|
||||||
|
}
|
||||||
|
#ifdef TARGET_MIPS64
|
||||||
|
if (env->active_fpu.fcr0 & (1 << FCR0_F64)) {
|
||||||
|
env->hflags |= MIPS_HFLAG_F64;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
#else
|
#else
|
||||||
if (env->hflags & MIPS_HFLAG_BMASK) {
|
if (env->hflags & MIPS_HFLAG_BMASK) {
|
||||||
/* If the exception was raised from a delay slot,
|
/* If the exception was raised from a delay slot,
|
||||||
|
|
|
@ -533,14 +533,6 @@ static void fpu_init (CPUMIPSState *env, const mips_def_t *def)
|
||||||
env->fpus[i].fcr0 = def->CP1_fcr0;
|
env->fpus[i].fcr0 = def->CP1_fcr0;
|
||||||
|
|
||||||
memcpy(&env->active_fpu, &env->fpus[0], sizeof(env->active_fpu));
|
memcpy(&env->active_fpu, &env->fpus[0], sizeof(env->active_fpu));
|
||||||
#if defined(CONFIG_USER_ONLY)
|
|
||||||
if (env->CP0_Config1 & (1 << CP0C1_FP))
|
|
||||||
env->hflags |= MIPS_HFLAG_FPU;
|
|
||||||
#ifdef TARGET_MIPS64
|
|
||||||
if (env->active_fpu.fcr0 & (1 << FCR0_F64))
|
|
||||||
env->hflags |= MIPS_HFLAG_F64;
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mvp_init (CPUMIPSState *env, const mips_def_t *def)
|
static void mvp_init (CPUMIPSState *env, const mips_def_t *def)
|
||||||
|
|
Loading…
Reference in New Issue