summaryrefslogtreecommitdiff
path: root/target-i386
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-09-29 22:48:51 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-05 09:32:40 -0500
commit67b8f419575b9e4521f0fa59b7a0faee401502ca (patch)
treebfe63e4bbab2ba3c1fe2a9107d6e98abe892d1e6 /target-i386
parenteb831623114b6b74172629f9f6db7b7eb979d90b (diff)
downloadqemu-67b8f419575b9e4521f0fa59b7a0faee401502ca.tar.gz
x86: fpus is uint16_t not unsigned int
We save more that fpus on that 16 bits (fpstt), we need an additional field Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'target-i386')
-rw-r--r--target-i386/cpu.h3
-rw-r--r--target-i386/machine.c16
2 files changed, 10 insertions, 9 deletions
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 3e0dbd44e0..685b828297 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -593,7 +593,8 @@ typedef struct CPUX86State {
/* FPU state */
unsigned int fpstt; /* top of stack index */
- unsigned int fpus;
+ uint16_t fpus;
+ uint16_t fpus_vmstate;
uint16_t fpuc;
uint8_t fptags[8]; /* 0 = valid, 1 = empty */
union {
diff --git a/target-i386/machine.c b/target-i386/machine.c
index 912c74dfbc..4584de90f6 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -26,7 +26,7 @@ static void cpu_get_seg(QEMUFile *f, SegmentCache *dt)
void cpu_save(QEMUFile *f, void *opaque)
{
CPUState *env = opaque;
- uint16_t fptag, fpus, fpregs_format;
+ uint16_t fptag, fpregs_format;
int32_t pending_irq;
int i, bit;
@@ -39,14 +39,14 @@ void cpu_save(QEMUFile *f, void *opaque)
qemu_put_be32s(f, &env->hflags);
/* FPU */
- fpus = (env->fpus & ~0x3800) | (env->fpstt & 0x7) << 11;
+ env->fpus_vmstate = (env->fpus & ~0x3800) | (env->fpstt & 0x7) << 11;
fptag = 0;
for(i = 0; i < 8; i++) {
fptag |= ((!env->fptags[i]) << i);
}
qemu_put_be16s(f, &env->fpuc);
- qemu_put_be16s(f, &fpus);
+ qemu_put_be16s(f, &env->fpus_vmstate);
qemu_put_be16s(f, &fptag);
#ifdef USE_X86LDOUBLE
@@ -197,7 +197,7 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
{
CPUState *env = opaque;
int i, guess_mmx;
- uint16_t fpus, fptag, fpregs_format;
+ uint16_t fptag, fpregs_format;
int32_t pending_irq;
cpu_synchronize_state(env);
@@ -210,14 +210,14 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
qemu_get_be32s(f, &env->hflags);
qemu_get_be16s(f, &env->fpuc);
- qemu_get_be16s(f, &fpus);
+ qemu_get_be16s(f, &env->fpus_vmstate);
qemu_get_be16s(f, &fptag);
qemu_get_be16s(f, &fpregs_format);
/* NOTE: we cannot always restore the FPU state if the image come
from a host with a different 'USE_X86LDOUBLE' define. We guess
if we are in an MMX state to restore correctly in that case. */
- guess_mmx = ((fptag == 0xff) && (fpus & 0x3800) == 0);
+ guess_mmx = ((fptag == 0xff) && (env->fpus_vmstate & 0x3800) == 0);
for(i = 0; i < 8; i++) {
uint64_t mant;
uint16_t exp;
@@ -260,8 +260,8 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
}
/* XXX: restore FPU round state */
- env->fpstt = (fpus >> 11) & 7;
- env->fpus = fpus & ~0x3800;
+ env->fpstt = (env->fpus_vmstate >> 11) & 7;
+ env->fpus = env->fpus_vmstate & ~0x3800;
fptag ^= 0xff;
for(i = 0; i < 8; i++) {
env->fptags[i] = (fptag >> i) & 1;