mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kvm: x86: Use symbols for all xsave field

Browse Source 
Field 0 (FCW+FSW) and 1 (FTW+FOP) were hard-coded so far.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Jan Kiszka 2011-10-27 19:26:02 +02:00 committed by Marcelo Tosatti
parent 03ecd2c80a
commit 6b42494b21
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
target-i386/kvm.c
View File

@ -759,6 +759,8 @@ static int kvm_put_fpu(CPUState *env)
return kvm_vcpu_ioctl(env, KVM_SET_FPU, &fpu); return kvm_vcpu_ioctl(env, KVM_SET_FPU, &fpu);
} }
#define XSAVE_FCW_FSW 0
#define XSAVE_FTW_FOP 1
#define XSAVE_CWD_RIP 2 #define XSAVE_CWD_RIP 2
#define XSAVE_CWD_RDP 4 #define XSAVE_CWD_RDP 4
#define XSAVE_MXCSR 6 #define XSAVE_MXCSR 6
@ -786,8 +788,8 @@ static int kvm_put_xsave(CPUState *env)
for (i = 0; i < 8; ++i) { for (i = 0; i < 8; ++i) {
twd |= (!env->fptags[i]) << i; twd |= (!env->fptags[i]) << i;
} }
xsave->region[0] = (uint32_t)(swd << 16) + cwd; xsave->region[XSAVE_FCW_FSW] = (uint32_t)(swd << 16) + cwd;
xsave->region[1] = (uint32_t)(env->fpop << 16) + twd; xsave->region[XSAVE_FTW_FOP] = (uint32_t)(env->fpop << 16) + twd;
memcpy(&xsave->region[XSAVE_CWD_RIP], &env->fpip, sizeof(env->fpip)); memcpy(&xsave->region[XSAVE_CWD_RIP], &env->fpip, sizeof(env->fpip));
memcpy(&xsave->region[XSAVE_CWD_RDP], &env->fpdp, sizeof(env->fpdp)); memcpy(&xsave->region[XSAVE_CWD_RDP], &env->fpdp, sizeof(env->fpdp));
memcpy(&xsave->region[XSAVE_ST_SPACE], env->fpregs, memcpy(&xsave->region[XSAVE_ST_SPACE], env->fpregs,
@ -991,10 +993,10 @@ static int kvm_get_xsave(CPUState *env)
return ret; return ret;
} }
cwd = (uint16_t)xsave->region[0]; cwd = (uint16_t)xsave->region[XSAVE_FCW_FSW];
swd = (uint16_t)(xsave->region[0] >> 16); swd = (uint16_t)(xsave->region[XSAVE_FCW_FSW] >> 16);
twd = (uint16_t)xsave->region[1]; twd = (uint16_t)xsave->region[XSAVE_FTW_FOP];
env->fpop = (uint16_t)(xsave->region[1] >> 16); env->fpop = (uint16_t)(xsave->region[XSAVE_FTW_FOP] >> 16);
env->fpstt = (swd >> 11) & 7; env->fpstt = (swd >> 11) & 7;
env->fpus = swd; env->fpus = swd;
env->fpuc = cwd; env->fpuc = cwd;