SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/ppc: Properly sync cpu state with new msr in cpu_load_old

Browse Source 
Match cpu_post_load in using ppc_store_msr to set all of
the cpu state implied by the value of msr.  Do not restore
hflags or hflags_nmsr, as we recompute them in ppc_store_msr.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210315184615.1985590-4-richard.henderson@linaro.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Richard Henderson 2021-03-15 12:46:01 -06:00 committed by David Gibson
parent 1828504672
commit dafe299cf0
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
target/ppc/machine.c
View File

@ -21,6 +21,7 @@ static int cpu_load_old(QEMUFile *f, void *opaque, int version_id)
int32_t slb_nr; int32_t slb_nr;
#endif #endif
target_ulong xer; target_ulong xer;
target_ulong msr;
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
qemu_get_betls(f, &env->gpr[i]); qemu_get_betls(f, &env->gpr[i]);
@ -111,11 +112,19 @@ static int cpu_load_old(QEMUFile *f, void *opaque, int version_id)
qemu_get_betls(f, &env->ivpr_mask); qemu_get_betls(f, &env->ivpr_mask);
qemu_get_betls(f, &env->hreset_vector); qemu_get_betls(f, &env->hreset_vector);
qemu_get_betls(f, &env->nip); qemu_get_betls(f, &env->nip);
qemu_get_betls(f, &env->hflags); qemu_get_sbetl(f); /* Discard unused hflags */
qemu_get_betls(f, &env->hflags_nmsr); qemu_get_sbetl(f); /* Discard unused hflags_nmsr */
qemu_get_sbe32(f); /* Discard unused mmu_idx */ qemu_get_sbe32(f); /* Discard unused mmu_idx */
qemu_get_sbe32(f); /* Discard unused power_mode */ qemu_get_sbe32(f); /* Discard unused power_mode */
/*
* Invalidate all supported msr bits except MSR_TGPR/MSR_HVB
* before restoring. Note that this recomputes hflags and mem_idx.
*/
msr = env->msr;
env->msr ^= env->msr_mask & ~((1ULL << MSR_TGPR) | MSR_HVB);
ppc_store_msr(env, msr);
/* Recompute mmu indices */ /* Recompute mmu indices */
hreg_compute_mem_idx(env); hreg_compute_mem_idx(env);