[Qemu-devel] [4334] Correctly save and restore env->a20_mask now that it is a 64-bit

[Qemu-devel] [4334] Correctly save and restore env->a20_mask now that it is a 64-bit

[Aurelien Jarno]

Revision: 4334
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4334
Author:   aurel32
Date:     2008-05-04 20:11:44 +0000 (Sun, 04 May 2008)

Log Message:
-----------
Correctly save and restore env->a20_mask now that it is a 64-bit
variable. Noticed by Erik de Castro Lopo.

Modified Paths:
--------------
    trunk/target-i386/machine.c

Modified: trunk/target-i386/machine.c
===================================================================
--- trunk/target-i386/machine.c	2008-05-04 20:11:34 UTC (rev 4333)
+++ trunk/target-i386/machine.c	2008-05-04 20:11:44 UTC (rev 4334)
@@ -32,6 +32,7 @@
     CPUState *env = opaque;
     uint16_t fptag, fpus, fpuc, fpregs_format;
     uint32_t hflags;
+    int32_t a20_mask;
     int i;
 
     for(i = 0; i < CPU_NB_REGS; i++)
@@ -100,7 +101,8 @@
         qemu_put_betls(f, &env->dr[i]);
 
     /* MMU */
-    qemu_put_be32s(f, &env->a20_mask);
+    a20_mask = (int32_t) env->a20_mask;
+    qemu_put_be32s(f, &a20_mask);
 
     /* XMM */
     qemu_put_be32s(f, &env->mxcsr);
@@ -150,6 +152,7 @@
     int i, guess_mmx;
     uint32_t hflags;
     uint16_t fpus, fpuc, fptag, fpregs_format;
+    int32_t a20_mask;
 
     if (version_id != 3 && version_id != 4)
         return -EINVAL;
@@ -238,7 +241,8 @@
         qemu_get_betls(f, &env->dr[i]);
 
     /* MMU */
-    qemu_get_be32s(f, &env->a20_mask);
+    qemu_get_be32s(f, &a20_mask);
+    env->a20_mask = a20_mask;
 
     qemu_get_be32s(f, &env->mxcsr);
     for(i = 0; i < CPU_NB_REGS; i++) {