ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/mips: Simplify msa_reset() 

Call msa_reset() unconditionally, but only reset
the MSA registers if MSA is implemented.

Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Message-Id: <20201208003702.4088927-3-f4bug@amsat.org>
This commit is contained in:
Philippe Mathieu-Daudé 2020-11-29 23:57:02 +01:00
parent 25a1362875
commit 72f31f60f8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/mips/cpu-defs.c.inc
View File

@ -978,6 +978,10 @@ static void mvp_init(CPUMIPSState *env)
static void msa_reset(CPUMIPSState *env) static void msa_reset(CPUMIPSState *env)
{ {
if (!ase_msa_available(env)) {
return;
}
#ifdef CONFIG_USER_ONLY #ifdef CONFIG_USER_ONLY
/* MSA access enabled */ /* MSA access enabled */
env->CP0_Config5 |= 1 << CP0C5_MSAEn; env->CP0_Config5 |= 1 << CP0C5_MSAEn;

5
target/mips/cpu.c
View File

@ -532,10 +532,7 @@ static void mips_cpu_reset(DeviceState *dev)
env->hflags |= MIPS_HFLAG_M16; env->hflags |= MIPS_HFLAG_M16;
} }
/* MSA */ msa_reset(env);
if (ase_msa_available(env)) {
msa_reset(env);
}
compute_hflags(env); compute_hflags(env);
restore_fp_status(env); restore_fp_status(env);