mirror of https://gitlab.com/qemu-project/qemu
x86: fpuc is uint16_t not unsigned int
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
5ee0ffaa42
commit
eb83162311
|
@ -594,7 +594,7 @@ typedef struct CPUX86State {
|
||||||
/* FPU state */
|
/* FPU state */
|
||||||
unsigned int fpstt; /* top of stack index */
|
unsigned int fpstt; /* top of stack index */
|
||||||
unsigned int fpus;
|
unsigned int fpus;
|
||||||
unsigned int fpuc;
|
uint16_t fpuc;
|
||||||
uint8_t fptags[8]; /* 0 = valid, 1 = empty */
|
uint8_t fptags[8]; /* 0 = valid, 1 = empty */
|
||||||
union {
|
union {
|
||||||
#ifdef USE_X86LDOUBLE
|
#ifdef USE_X86LDOUBLE
|
||||||
|
|
|
@ -26,7 +26,7 @@ static void cpu_get_seg(QEMUFile *f, SegmentCache *dt)
|
||||||
void cpu_save(QEMUFile *f, void *opaque)
|
void cpu_save(QEMUFile *f, void *opaque)
|
||||||
{
|
{
|
||||||
CPUState *env = opaque;
|
CPUState *env = opaque;
|
||||||
uint16_t fptag, fpus, fpuc, fpregs_format;
|
uint16_t fptag, fpus, fpregs_format;
|
||||||
int32_t pending_irq;
|
int32_t pending_irq;
|
||||||
int i, bit;
|
int i, bit;
|
||||||
|
|
||||||
|
@ -39,14 +39,13 @@ void cpu_save(QEMUFile *f, void *opaque)
|
||||||
qemu_put_be32s(f, &env->hflags);
|
qemu_put_be32s(f, &env->hflags);
|
||||||
|
|
||||||
/* FPU */
|
/* FPU */
|
||||||
fpuc = env->fpuc;
|
|
||||||
fpus = (env->fpus & ~0x3800) | (env->fpstt & 0x7) << 11;
|
fpus = (env->fpus & ~0x3800) | (env->fpstt & 0x7) << 11;
|
||||||
fptag = 0;
|
fptag = 0;
|
||||||
for(i = 0; i < 8; i++) {
|
for(i = 0; i < 8; i++) {
|
||||||
fptag |= ((!env->fptags[i]) << i);
|
fptag |= ((!env->fptags[i]) << i);
|
||||||
}
|
}
|
||||||
|
|
||||||
qemu_put_be16s(f, &fpuc);
|
qemu_put_be16s(f, &env->fpuc);
|
||||||
qemu_put_be16s(f, &fpus);
|
qemu_put_be16s(f, &fpus);
|
||||||
qemu_put_be16s(f, &fptag);
|
qemu_put_be16s(f, &fptag);
|
||||||
|
|
||||||
|
@ -198,7 +197,7 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
|
||||||
{
|
{
|
||||||
CPUState *env = opaque;
|
CPUState *env = opaque;
|
||||||
int i, guess_mmx;
|
int i, guess_mmx;
|
||||||
uint16_t fpus, fpuc, fptag, fpregs_format;
|
uint16_t fpus, fptag, fpregs_format;
|
||||||
int32_t pending_irq;
|
int32_t pending_irq;
|
||||||
|
|
||||||
cpu_synchronize_state(env);
|
cpu_synchronize_state(env);
|
||||||
|
@ -210,7 +209,7 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
|
||||||
qemu_get_betls(f, &env->eflags);
|
qemu_get_betls(f, &env->eflags);
|
||||||
qemu_get_be32s(f, &env->hflags);
|
qemu_get_be32s(f, &env->hflags);
|
||||||
|
|
||||||
qemu_get_be16s(f, &fpuc);
|
qemu_get_be16s(f, &env->fpuc);
|
||||||
qemu_get_be16s(f, &fpus);
|
qemu_get_be16s(f, &fpus);
|
||||||
qemu_get_be16s(f, &fptag);
|
qemu_get_be16s(f, &fptag);
|
||||||
qemu_get_be16s(f, &fpregs_format);
|
qemu_get_be16s(f, &fpregs_format);
|
||||||
|
@ -260,7 +259,6 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
env->fpuc = fpuc;
|
|
||||||
/* XXX: restore FPU round state */
|
/* XXX: restore FPU round state */
|
||||||
env->fpstt = (fpus >> 11) & 7;
|
env->fpstt = (fpus >> 11) & 7;
|
||||||
env->fpus = fpus & ~0x3800;
|
env->fpus = fpus & ~0x3800;
|
||||||
|
|
Loading…
Reference in New Issue