[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 12/14] target-mips: fix broken snapshotting
From: |
Leon Alrae |
Subject: |
[Qemu-devel] [PULL v2 12/14] target-mips: fix broken snapshotting |
Date: |
Sat, 14 Feb 2015 17:45:02 +0000 |
Recently added CP0.BadInstr and CP0.BadInstrP registers ended up in cpu_load()
under different offset than in cpu_save(). These and all registers between were
incorrectly restored.
Signed-off-by: Leon Alrae <address@hidden>
---
target-mips/machine.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/target-mips/machine.c b/target-mips/machine.c
index 0ba7d73..6c76dfb 100644
--- a/target-mips/machine.c
+++ b/target-mips/machine.c
@@ -285,6 +285,10 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
qemu_get_sbe32s(f, &env->CP0_SRSConf4);
qemu_get_sbe32s(f, &env->CP0_HWREna);
qemu_get_betls(f, &env->CP0_BadVAddr);
+ if (version_id >= 5) {
+ qemu_get_be32s(f, &env->CP0_BadInstr);
+ qemu_get_be32s(f, &env->CP0_BadInstrP);
+ }
qemu_get_sbe32s(f, &env->CP0_Count);
qemu_get_betls(f, &env->CP0_EntryHi);
qemu_get_sbe32s(f, &env->CP0_Compare);
@@ -319,8 +323,6 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
qemu_get_betls(f, &env->CP0_ErrorEPC);
qemu_get_sbe32s(f, &env->CP0_DESAVE);
if (version_id >= 5) {
- qemu_get_be32s(f, &env->CP0_BadInstr);
- qemu_get_be32s(f, &env->CP0_BadInstrP);
for (i = 0; i < MIPS_KSCRATCH_NUM; i++) {
qemu_get_betls(f, &env->CP0_KScratch[i]);
}
--
2.1.0
- [Qemu-devel] [PULL v2 13/14] target-mips: pass 0 instead of -1 as rs in microMIPS LUI instruction, (continued)
- [Qemu-devel] [PULL v2 13/14] target-mips: pass 0 instead of -1 as rs in microMIPS LUI instruction, Leon Alrae, 2015/02/14
- [Qemu-devel] [PULL v2 08/14] target-mips: Make CP0.Status.CU1 read-only for the 5Kc and 5KEc processors, Leon Alrae, 2015/02/14
- [Qemu-devel] [PULL v2 06/14] gt64xxx: remove isa_mem_base usage, Leon Alrae, 2015/02/14
- [Qemu-devel] [PULL v2 04/14] mips: remove isa_mem_base usage, Leon Alrae, 2015/02/14
- [Qemu-devel] [PULL v2 03/14] jazz: remove usage of isa_mem_base, Leon Alrae, 2015/02/14
- [Qemu-devel] [PULL v2 05/14] piix4: use PCI address space instead of system memory, Leon Alrae, 2015/02/14
- [Qemu-devel] [PULL v2 11/14] target-mips: use CP0EnLo_XI instead of magic number, Leon Alrae, 2015/02/14
- [Qemu-devel] [PULL v2 07/14] isa: remove isa_mem_base variable, Leon Alrae, 2015/02/14
- [Qemu-devel] [PULL v2 14/14] linux-user: correct stat structure in MIPS N32, Leon Alrae, 2015/02/14
- [Qemu-devel] [PULL v2 10/14] target-mips: ll and lld cause AdEL exception for unaligned address, Leon Alrae, 2015/02/14
- [Qemu-devel] [PULL v2 12/14] target-mips: fix broken snapshotting,
Leon Alrae <=
- Re: [Qemu-devel] [PULL v2 00/14] target-mips queue, Peter Maydell, 2015/02/17
- Re: [Qemu-devel] [PULL v2 00/14] target-mips queue, Peter Maydell, 2015/02/24