xsave_helper: pull xsave and xrstor out of kvm.c into helper function
This patch pulls out of kvm.c and into the new files the implementation for the xsave and xrstor instructions. This so they can be shared by kvm and hvf. Signed-off-by: Sergio Andres Gomez Del Real <Sergio.G.DelReal@gmail.com> Message-Id: <20170626200832.11058-1-Sergio.G.DelReal@gmail.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Sergio Andres Gomez Del Real <sergio.g.delreal@gmail.com>
This commit is contained in:
Sergio Andres Gomez Del Real
Paolo Bonzini
parent
56382bd577
commit
86a57621ce
@ -1,6 +1,7 @@
|
|||||||
obj-y += translate.o helper.o cpu.o bpt_helper.o
|
obj-y += translate.o helper.o cpu.o bpt_helper.o
|
||||||
obj-y += excp_helper.o fpu_helper.o cc_helper.o int_helper.o svm_helper.o
|
obj-y += excp_helper.o fpu_helper.o cc_helper.o int_helper.o svm_helper.o
|
||||||
obj-y += smm_helper.o misc_helper.o mem_helper.o seg_helper.o mpx_helper.o
|
obj-y += smm_helper.o misc_helper.o mem_helper.o seg_helper.o mpx_helper.o
|
||||||
|
obj-y += xsave_helper.o
|
||||||
obj-y += gdbstub.o
|
obj-y += gdbstub.o
|
||||||
obj-$(CONFIG_SOFTMMU) += machine.o arch_memory_mapping.o arch_dump.o monitor.o
|
obj-$(CONFIG_SOFTMMU) += machine.o arch_memory_mapping.o arch_dump.o monitor.o
|
||||||
obj-$(CONFIG_KVM) += kvm.o hyperv.o
|
obj-$(CONFIG_KVM) += kvm.o hyperv.o
|
||||||
|
|||||||
@ -1697,4 +1697,6 @@ void x86_cpu_dump_local_apic_state(CPUState *cs, FILE *f,
|
|||||||
/* cpu.c */
|
/* cpu.c */
|
||||||
bool cpu_is_bsp(X86CPU *cpu);
|
bool cpu_is_bsp(X86CPU *cpu);
|
||||||
|
|
||||||
|
void x86_cpu_xrstor_all_areas(X86CPU *cpu, const X86XSaveArea *buf);
|
||||||
|
void x86_cpu_xsave_all_areas(X86CPU *cpu, X86XSaveArea *buf);
|
||||||
#endif /* I386_CPU_H */
|
#endif /* I386_CPU_H */
|
||||||
|
|||||||
@ -1433,56 +1433,12 @@ static int kvm_put_xsave(X86CPU *cpu)
|
|||||||
{
|
{
|
||||||
CPUX86State *env = &cpu->env;
|
CPUX86State *env = &cpu->env;
|
||||||
X86XSaveArea *xsave = env->kvm_xsave_buf;
|
X86XSaveArea *xsave = env->kvm_xsave_buf;
|
||||||
uint16_t cwd, swd, twd;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
if (!has_xsave) {
|
if (!has_xsave) {
|
||||||
return kvm_put_fpu(cpu);
|
return kvm_put_fpu(cpu);
|
||||||
}
|
}
|
||||||
|
x86_cpu_xsave_all_areas(cpu, xsave);
|
||||||
|
|
||||||
memset(xsave, 0, sizeof(struct kvm_xsave));
|
|
||||||
twd = 0;
|
|
||||||
swd = env->fpus & ~(7 << 11);
|
|
||||||
swd |= (env->fpstt & 7) << 11;
|
|
||||||
cwd = env->fpuc;
|
|
||||||
for (i = 0; i < 8; ++i) {
|
|
||||||
twd |= (!env->fptags[i]) << i;
|
|
||||||
}
|
|
||||||
xsave->legacy.fcw = cwd;
|
|
||||||
xsave->legacy.fsw = swd;
|
|
||||||
xsave->legacy.ftw = twd;
|
|
||||||
xsave->legacy.fpop = env->fpop;
|
|
||||||
xsave->legacy.fpip = env->fpip;
|
|
||||||
xsave->legacy.fpdp = env->fpdp;
|
|
||||||
memcpy(&xsave->legacy.fpregs, env->fpregs,
|
|
||||||
sizeof env->fpregs);
|
|
||||||
xsave->legacy.mxcsr = env->mxcsr;
|
|
||||||
xsave->header.xstate_bv = env->xstate_bv;
|
|
||||||
memcpy(&xsave->bndreg_state.bnd_regs, env->bnd_regs,
|
|
||||||
sizeof env->bnd_regs);
|
|
||||||
xsave->bndcsr_state.bndcsr = env->bndcs_regs;
|
|
||||||
memcpy(&xsave->opmask_state.opmask_regs, env->opmask_regs,
|
|
||||||
sizeof env->opmask_regs);
|
|
||||||
|
|
||||||
for (i = 0; i < CPU_NB_REGS; i++) {
|
|
||||||
uint8_t *xmm = xsave->legacy.xmm_regs[i];
|
|
||||||
uint8_t *ymmh = xsave->avx_state.ymmh[i];
|
|
||||||
uint8_t *zmmh = xsave->zmm_hi256_state.zmm_hi256[i];
|
|
||||||
stq_p(xmm, env->xmm_regs[i].ZMM_Q(0));
|
|
||||||
stq_p(xmm+8, env->xmm_regs[i].ZMM_Q(1));
|
|
||||||
stq_p(ymmh, env->xmm_regs[i].ZMM_Q(2));
|
|
||||||
stq_p(ymmh+8, env->xmm_regs[i].ZMM_Q(3));
|
|
||||||
stq_p(zmmh, env->xmm_regs[i].ZMM_Q(4));
|
|
||||||
stq_p(zmmh+8, env->xmm_regs[i].ZMM_Q(5));
|
|
||||||
stq_p(zmmh+16, env->xmm_regs[i].ZMM_Q(6));
|
|
||||||
stq_p(zmmh+24, env->xmm_regs[i].ZMM_Q(7));
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef TARGET_X86_64
|
|
||||||
memcpy(&xsave->hi16_zmm_state.hi16_zmm, &env->xmm_regs[16],
|
|
||||||
16 * sizeof env->xmm_regs[16]);
|
|
||||||
memcpy(&xsave->pkru_state, &env->pkru, sizeof env->pkru);
|
|
||||||
#endif
|
|
||||||
return kvm_vcpu_ioctl(CPU(cpu), KVM_SET_XSAVE, xsave);
|
return kvm_vcpu_ioctl(CPU(cpu), KVM_SET_XSAVE, xsave);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1868,8 +1824,7 @@ static int kvm_get_xsave(X86CPU *cpu)
|
|||||||
{
|
{
|
||||||
CPUX86State *env = &cpu->env;
|
CPUX86State *env = &cpu->env;
|
||||||
X86XSaveArea *xsave = env->kvm_xsave_buf;
|
X86XSaveArea *xsave = env->kvm_xsave_buf;
|
||||||
int ret, i;
|
int ret;
|
||||||
uint16_t cwd, swd, twd;
|
|
||||||
|
|
||||||
if (!has_xsave) {
|
if (!has_xsave) {
|
||||||
return kvm_get_fpu(cpu);
|
return kvm_get_fpu(cpu);
|
||||||
@ -1879,48 +1834,8 @@ static int kvm_get_xsave(X86CPU *cpu)
|
|||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
x86_cpu_xrstor_all_areas(cpu, xsave);
|
||||||
|
|
||||||
cwd = xsave->legacy.fcw;
|
|
||||||
swd = xsave->legacy.fsw;
|
|
||||||
twd = xsave->legacy.ftw;
|
|
||||||
env->fpop = xsave->legacy.fpop;
|
|
||||||
env->fpstt = (swd >> 11) & 7;
|
|
||||||
env->fpus = swd;
|
|
||||||
env->fpuc = cwd;
|
|
||||||
for (i = 0; i < 8; ++i) {
|
|
||||||
env->fptags[i] = !((twd >> i) & 1);
|
|
||||||
}
|
|
||||||
env->fpip = xsave->legacy.fpip;
|
|
||||||
env->fpdp = xsave->legacy.fpdp;
|
|
||||||
env->mxcsr = xsave->legacy.mxcsr;
|
|
||||||
memcpy(env->fpregs, &xsave->legacy.fpregs,
|
|
||||||
sizeof env->fpregs);
|
|
||||||
env->xstate_bv = xsave->header.xstate_bv;
|
|
||||||
memcpy(env->bnd_regs, &xsave->bndreg_state.bnd_regs,
|
|
||||||
sizeof env->bnd_regs);
|
|
||||||
env->bndcs_regs = xsave->bndcsr_state.bndcsr;
|
|
||||||
memcpy(env->opmask_regs, &xsave->opmask_state.opmask_regs,
|
|
||||||
sizeof env->opmask_regs);
|
|
||||||
|
|
||||||
for (i = 0; i < CPU_NB_REGS; i++) {
|
|
||||||
uint8_t *xmm = xsave->legacy.xmm_regs[i];
|
|
||||||
uint8_t *ymmh = xsave->avx_state.ymmh[i];
|
|
||||||
uint8_t *zmmh = xsave->zmm_hi256_state.zmm_hi256[i];
|
|
||||||
env->xmm_regs[i].ZMM_Q(0) = ldq_p(xmm);
|
|
||||||
env->xmm_regs[i].ZMM_Q(1) = ldq_p(xmm+8);
|
|
||||||
env->xmm_regs[i].ZMM_Q(2) = ldq_p(ymmh);
|
|
||||||
env->xmm_regs[i].ZMM_Q(3) = ldq_p(ymmh+8);
|
|
||||||
env->xmm_regs[i].ZMM_Q(4) = ldq_p(zmmh);
|
|
||||||
env->xmm_regs[i].ZMM_Q(5) = ldq_p(zmmh+8);
|
|
||||||
env->xmm_regs[i].ZMM_Q(6) = ldq_p(zmmh+16);
|
|
||||||
env->xmm_regs[i].ZMM_Q(7) = ldq_p(zmmh+24);
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef TARGET_X86_64
|
|
||||||
memcpy(&env->xmm_regs[16], &xsave->hi16_zmm_state.hi16_zmm,
|
|
||||||
16 * sizeof env->xmm_regs[16]);
|
|
||||||
memcpy(&env->pkru, &xsave->pkru_state, sizeof env->pkru);
|
|
||||||
#endif
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
114
target/i386/xsave_helper.c
Normal file
114
target/i386/xsave_helper.c
Normal file
@ -0,0 +1,114 @@
|
|||||||
|
/*
|
||||||
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
||||||
|
* See the COPYING file in the top-level directory.
|
||||||
|
*/
|
||||||
|
#include "qemu/osdep.h"
|
||||||
|
#include "qapi/error.h"
|
||||||
|
|
||||||
|
#include "qemu-common.h"
|
||||||
|
#include "cpu.h"
|
||||||
|
|
||||||
|
void x86_cpu_xsave_all_areas(X86CPU *cpu, X86XSaveArea *buf)
|
||||||
|
{
|
||||||
|
CPUX86State *env = &cpu->env;
|
||||||
|
X86XSaveArea *xsave = buf;
|
||||||
|
|
||||||
|
uint16_t cwd, swd, twd;
|
||||||
|
int i;
|
||||||
|
memset(xsave, 0, sizeof(X86XSaveArea));
|
||||||
|
twd = 0;
|
||||||
|
swd = env->fpus & ~(7 << 11);
|
||||||
|
swd |= (env->fpstt & 7) << 11;
|
||||||
|
cwd = env->fpuc;
|
||||||
|
for (i = 0; i < 8; ++i) {
|
||||||
|
twd |= (!env->fptags[i]) << i;
|
||||||
|
}
|
||||||
|
xsave->legacy.fcw = cwd;
|
||||||
|
xsave->legacy.fsw = swd;
|
||||||
|
xsave->legacy.ftw = twd;
|
||||||
|
xsave->legacy.fpop = env->fpop;
|
||||||
|
xsave->legacy.fpip = env->fpip;
|
||||||
|
xsave->legacy.fpdp = env->fpdp;
|
||||||
|
memcpy(&xsave->legacy.fpregs, env->fpregs,
|
||||||
|
sizeof env->fpregs);
|
||||||
|
xsave->legacy.mxcsr = env->mxcsr;
|
||||||
|
xsave->header.xstate_bv = env->xstate_bv;
|
||||||
|
memcpy(&xsave->bndreg_state.bnd_regs, env->bnd_regs,
|
||||||
|
sizeof env->bnd_regs);
|
||||||
|
xsave->bndcsr_state.bndcsr = env->bndcs_regs;
|
||||||
|
memcpy(&xsave->opmask_state.opmask_regs, env->opmask_regs,
|
||||||
|
sizeof env->opmask_regs);
|
||||||
|
|
||||||
|
for (i = 0; i < CPU_NB_REGS; i++) {
|
||||||
|
uint8_t *xmm = xsave->legacy.xmm_regs[i];
|
||||||
|
uint8_t *ymmh = xsave->avx_state.ymmh[i];
|
||||||
|
uint8_t *zmmh = xsave->zmm_hi256_state.zmm_hi256[i];
|
||||||
|
stq_p(xmm, env->xmm_regs[i].ZMM_Q(0));
|
||||||
|
stq_p(xmm+8, env->xmm_regs[i].ZMM_Q(1));
|
||||||
|
stq_p(ymmh, env->xmm_regs[i].ZMM_Q(2));
|
||||||
|
stq_p(ymmh+8, env->xmm_regs[i].ZMM_Q(3));
|
||||||
|
stq_p(zmmh, env->xmm_regs[i].ZMM_Q(4));
|
||||||
|
stq_p(zmmh+8, env->xmm_regs[i].ZMM_Q(5));
|
||||||
|
stq_p(zmmh+16, env->xmm_regs[i].ZMM_Q(6));
|
||||||
|
stq_p(zmmh+24, env->xmm_regs[i].ZMM_Q(7));
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef TARGET_X86_64
|
||||||
|
memcpy(&xsave->hi16_zmm_state.hi16_zmm, &env->xmm_regs[16],
|
||||||
|
16 * sizeof env->xmm_regs[16]);
|
||||||
|
memcpy(&xsave->pkru_state, &env->pkru, sizeof env->pkru);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void x86_cpu_xrstor_all_areas(X86CPU *cpu, const X86XSaveArea *buf)
|
||||||
|
{
|
||||||
|
|
||||||
|
CPUX86State *env = &cpu->env;
|
||||||
|
const X86XSaveArea *xsave = buf;
|
||||||
|
|
||||||
|
int i;
|
||||||
|
uint16_t cwd, swd, twd;
|
||||||
|
cwd = xsave->legacy.fcw;
|
||||||
|
swd = xsave->legacy.fsw;
|
||||||
|
twd = xsave->legacy.ftw;
|
||||||
|
env->fpop = xsave->legacy.fpop;
|
||||||
|
env->fpstt = (swd >> 11) & 7;
|
||||||
|
env->fpus = swd;
|
||||||
|
env->fpuc = cwd;
|
||||||
|
for (i = 0; i < 8; ++i) {
|
||||||
|
env->fptags[i] = !((twd >> i) & 1);
|
||||||
|
}
|
||||||
|
env->fpip = xsave->legacy.fpip;
|
||||||
|
env->fpdp = xsave->legacy.fpdp;
|
||||||
|
env->mxcsr = xsave->legacy.mxcsr;
|
||||||
|
memcpy(env->fpregs, &xsave->legacy.fpregs,
|
||||||
|
sizeof env->fpregs);
|
||||||
|
env->xstate_bv = xsave->header.xstate_bv;
|
||||||
|
memcpy(env->bnd_regs, &xsave->bndreg_state.bnd_regs,
|
||||||
|
sizeof env->bnd_regs);
|
||||||
|
env->bndcs_regs = xsave->bndcsr_state.bndcsr;
|
||||||
|
memcpy(env->opmask_regs, &xsave->opmask_state.opmask_regs,
|
||||||
|
sizeof env->opmask_regs);
|
||||||
|
|
||||||
|
for (i = 0; i < CPU_NB_REGS; i++) {
|
||||||
|
const uint8_t *xmm = xsave->legacy.xmm_regs[i];
|
||||||
|
const uint8_t *ymmh = xsave->avx_state.ymmh[i];
|
||||||
|
const uint8_t *zmmh = xsave->zmm_hi256_state.zmm_hi256[i];
|
||||||
|
env->xmm_regs[i].ZMM_Q(0) = ldq_p(xmm);
|
||||||
|
env->xmm_regs[i].ZMM_Q(1) = ldq_p(xmm+8);
|
||||||
|
env->xmm_regs[i].ZMM_Q(2) = ldq_p(ymmh);
|
||||||
|
env->xmm_regs[i].ZMM_Q(3) = ldq_p(ymmh+8);
|
||||||
|
env->xmm_regs[i].ZMM_Q(4) = ldq_p(zmmh);
|
||||||
|
env->xmm_regs[i].ZMM_Q(5) = ldq_p(zmmh+8);
|
||||||
|
env->xmm_regs[i].ZMM_Q(6) = ldq_p(zmmh+16);
|
||||||
|
env->xmm_regs[i].ZMM_Q(7) = ldq_p(zmmh+24);
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef TARGET_X86_64
|
||||||
|
memcpy(&env->xmm_regs[16], &xsave->hi16_zmm_state.hi16_zmm,
|
||||||
|
16 * sizeof env->xmm_regs[16]);
|
||||||
|
memcpy(&env->pkru, &xsave->pkru_state, sizeof env->pkru);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user