motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-01 06:21:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86: add fpregs_format_vmstate

Browse source 
Don't even ask, being able to load/save between 64<->80bit floats should be forbidden

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2009-09-29 22:48:54 +02:00 • committed by Anthony Liguori
parent bfc179b60c
commit 60a902f1c3
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
target-i386/cpu.h
View file

@ -596,6 +596,7 @@ typedef struct CPUX86State {
uint16_t fpus; uint16_t fpus;
uint16_t fpus_vmstate; uint16_t fpus_vmstate;
uint16_t fptag_vmstate; uint16_t fptag_vmstate;
uint16_t fpregs_format_vmstate;
uint16_t fpuc; uint16_t fpuc;
uint8_t fptags[8]; /* 0 = valid, 1 = empty */ uint8_t fptags[8]; /* 0 = valid, 1 = empty */
union { union {

12
target-i386/machine.c
View file

@ -26,7 +26,6 @@ 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 fpregs_format;
int i, bit; int i, bit;
cpu_synchronize_state(env); cpu_synchronize_state(env);
@ -49,11 +48,11 @@ void cpu_save(QEMUFile *f, void *opaque)
qemu_put_be16s(f, &env->fptag_vmstate); qemu_put_be16s(f, &env->fptag_vmstate);
#ifdef USE_X86LDOUBLE #ifdef USE_X86LDOUBLE
fpregs_format = 0; env->fpregs_format_vmstate = 0;
#else #else
fpregs_format = 1; env->fpregs_format_vmstate = 1;
#endif #endif
qemu_put_be16s(f, &fpregs_format); qemu_put_be16s(f, &env->fpregs_format_vmstate);
for(i = 0; i < 8; i++) { for(i = 0; i < 8; i++) {
#ifdef USE_X86LDOUBLE #ifdef USE_X86LDOUBLE
@ -196,7 +195,6 @@ 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 fpregs_format;
cpu_synchronize_state(env); cpu_synchronize_state(env);
if (version_id < 3 || version_id > CPU_SAVE_VERSION) if (version_id < 3 || version_id > CPU_SAVE_VERSION)
@ -210,7 +208,7 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
qemu_get_be16s(f, &env->fpuc); qemu_get_be16s(f, &env->fpuc);
qemu_get_be16s(f, &env->fpus_vmstate); qemu_get_be16s(f, &env->fpus_vmstate);
qemu_get_be16s(f, &env->fptag_vmstate); qemu_get_be16s(f, &env->fptag_vmstate);
qemu_get_be16s(f, &fpregs_format); qemu_get_be16s(f, &env->fpregs_format_vmstate);
/* NOTE: we cannot always restore the FPU state if the image come /* NOTE: we cannot always restore the FPU state if the image come
from a host with a different 'USE_X86LDOUBLE' define. We guess from a host with a different 'USE_X86LDOUBLE' define. We guess
@ -220,7 +218,7 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
uint64_t mant; uint64_t mant;
uint16_t exp; uint16_t exp;
switch(fpregs_format) { switch(env->fpregs_format_vmstate) {
case 0: case 0:
mant = qemu_get_be64(f); mant = qemu_get_be64(f);
exp = qemu_get_be16(f); exp = qemu_get_be16(f);