[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 32/49] x86: fpus is uint16_t not unsigned int
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 32/49] x86: fpus is uint16_t not unsigned int |
Date: |
Tue, 29 Sep 2009 22:48:51 +0200 |
We save more that fpus on that 16 bits (fpstt), we need an additional field
Signed-off-by: Juan Quintela <address@hidden>
---
target-i386/cpu.h | 3 ++-
target-i386/machine.c | 16 ++++++++--------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 4969dd1..d5c64e6 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -592,7 +592,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 852eeb7..7da5d6a 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
@@ -196,7 +196,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);
@@ -209,14 +209,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;
@@ -259,8 +259,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;
--
1.6.2.5
- [Qemu-devel] Re: [PATCH 27/49] ac97: add active to the state, (continued)
- [Qemu-devel] Re: [PATCH 27/49] ac97: add active to the state, Juan Quintela, 2009/09/30
- Re: [Qemu-devel] Re: [PATCH 27/49] ac97: add active to the state, Anthony Liguori, 2009/09/30
- [Qemu-devel] Re: [PATCH 27/49] ac97: add active to the state, Juan Quintela, 2009/09/30
- Re: [Qemu-devel] Re: [PATCH 27/49] ac97: add active to the state, malc, 2009/09/30
- Re: [Qemu-devel] Re: [PATCH 27/49] ac97: add active to the state, Anthony Liguori, 2009/09/30
- Re: [Qemu-devel] Re: [PATCH 27/49] ac97: add active to the state, malc, 2009/09/30
[Qemu-devel] [PATCH 28/49] vmstate: port ac97 device, Juan Quintela, 2009/09/29
[Qemu-devel] [PATCH 29/49] x86: hflags is not modified at all, just save it directly, Juan Quintela, 2009/09/29
[Qemu-devel] [PATCH 30/49] x86: make a20_mask int32_t, Juan Quintela, 2009/09/29
[Qemu-devel] [PATCH 31/49] x86: fpuc is uint16_t not unsigned int, Juan Quintela, 2009/09/29
[Qemu-devel] [PATCH 32/49] x86: fpus is uint16_t not unsigned int,
Juan Quintela <=
[Qemu-devel] [PATCH 33/49] x86: add fptag_vmstate to the state, Juan Quintela, 2009/09/29
[Qemu-devel] [PATCH 34/49] x86: add pending_irq_vmstate to the state, Juan Quintela, 2009/09/29
[Qemu-devel] [PATCH 35/49] x86: add fpregs_format_vmstate, Juan Quintela, 2009/09/29
[Qemu-devel] [PATCH 36/49] x86: mce_banks always have the same size, Juan Quintela, 2009/09/29
[Qemu-devel] [PATCH 37/49] x86: send mce_banks as an array, Juan Quintela, 2009/09/29
[Qemu-devel] [PATCH 39/49] x86: split FPReg union, Juan Quintela, 2009/09/29
[Qemu-devel] [PATCH 38/49] x86: mcg_cap is never 0, Juan Quintela, 2009/09/29
[Qemu-devel] [PATCH 40/49] x86: split MTRRVar union, Juan Quintela, 2009/09/29
[Qemu-devel] [PATCH 41/49] Add *TL functions to vmstate, Juan Quintela, 2009/09/29
[Qemu-devel] [PATCH 42/49] x86: port segments to vmstate, Juan Quintela, 2009/09/29