From 5ee0ffaa42b02e04d8047c7fc32687b348719294 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 29 Sep 2009 22:48:49 +0200 Subject: x86: make a20_mask int32_t This makes the savevm code correct, and sign extensins gives us exactly what we need (namely, sign extend to 64 bits when used with 64bit addresess. Once there, change 0x100000 for 1 << 20, that maks all a20 use the same syntax. Signed-off-by: Juan Quintela Signed-off-by: Anthony Liguori --- target-i386/machine.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'target-i386/machine.c') diff --git a/target-i386/machine.c b/target-i386/machine.c index adbb16fb87..23c01ee409 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -27,7 +27,6 @@ void cpu_save(QEMUFile *f, void *opaque) { CPUState *env = opaque; uint16_t fptag, fpus, fpuc, fpregs_format; - int32_t a20_mask; int32_t pending_irq; int i, bit; @@ -98,8 +97,7 @@ void cpu_save(QEMUFile *f, void *opaque) qemu_put_betls(f, &env->dr[i]); /* MMU */ - a20_mask = (int32_t) env->a20_mask; - qemu_put_sbe32s(f, &a20_mask); + qemu_put_sbe32s(f, &env->a20_mask); /* XMM */ qemu_put_be32s(f, &env->mxcsr); @@ -201,7 +199,6 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) CPUState *env = opaque; int i, guess_mmx; uint16_t fpus, fpuc, fptag, fpregs_format; - int32_t a20_mask; int32_t pending_irq; cpu_synchronize_state(env); @@ -300,9 +297,7 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) for (i = 0; i < 4; i++) hw_breakpoint_insert(env, i); - /* MMU */ - qemu_get_sbe32s(f, &a20_mask); - env->a20_mask = a20_mask; + qemu_get_sbe32s(f, &env->a20_mask); qemu_get_be32s(f, &env->mxcsr); for(i = 0; i < CPU_NB_REGS; i++) { -- cgit v1.2.3