[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/14] hvf: use new helper functions for put/get xsa
From: |
Sergio Andres Gomez Del Real |
Subject: |
[Qemu-devel] [PATCH 05/14] hvf: use new helper functions for put/get xsave |
Date: |
Sun, 27 Aug 2017 20:56:45 -0500 |
This commit makes use of the helper functions for handling xsave in
xsave_helper.c, which are shared with kvm.
Signed-off-by: Sergio Andres Gomez Del Real <address@hidden>
---
target/i386/hvf-utils/x86hvf.c | 63 ++++++------------------------------------
1 file changed, 8 insertions(+), 55 deletions(-)
diff --git a/target/i386/hvf-utils/x86hvf.c b/target/i386/hvf-utils/x86hvf.c
index d5668df37f..5c1d5ece36 100644
--- a/target/i386/hvf-utils/x86hvf.c
+++ b/target/i386/hvf-utils/x86hvf.c
@@ -76,36 +76,13 @@ void hvf_get_segment(SegmentCache *qseg, struct vmx_segment
*vmx_seg)
void hvf_put_xsave(CPUState *cpu_state)
{
- int x;
struct hvf_xsave_buf *xsave;
-
+
xsave = X86_CPU(cpu_state)->env.kvm_xsave_buf;
- memset(xsave, 0, sizeof(*xsave));
-
- memcpy(&xsave->data[4], &X86_CPU(cpu_state)->env.fpdp,
sizeof(X86_CPU(cpu_state)->env.fpdp));
- memcpy(&xsave->data[2], &X86_CPU(cpu_state)->env.fpip,
sizeof(X86_CPU(cpu_state)->env.fpip));
- memcpy(&xsave->data[8], &X86_CPU(cpu_state)->env.fpregs,
sizeof(X86_CPU(cpu_state)->env.fpregs));
- memcpy(&xsave->data[144], &X86_CPU(cpu_state)->env.ymmh_regs,
sizeof(X86_CPU(cpu_state)->env.ymmh_regs));
- memcpy(&xsave->data[288], &X86_CPU(cpu_state)->env.zmmh_regs,
sizeof(X86_CPU(cpu_state)->env.zmmh_regs));
- memcpy(&xsave->data[272], &X86_CPU(cpu_state)->env.opmask_regs,
sizeof(X86_CPU(cpu_state)->env.opmask_regs));
- memcpy(&xsave->data[240], &X86_CPU(cpu_state)->env.bnd_regs,
sizeof(X86_CPU(cpu_state)->env.bnd_regs));
- memcpy(&xsave->data[256], &X86_CPU(cpu_state)->env.bndcs_regs,
sizeof(X86_CPU(cpu_state)->env.bndcs_regs));
- memcpy(&xsave->data[416], &X86_CPU(cpu_state)->env.hi16_zmm_regs,
sizeof(X86_CPU(cpu_state)->env.hi16_zmm_regs));
-
- xsave->data[0] = (uint16_t)X86_CPU(cpu_state)->env.fpuc;
- xsave->data[0] |= (X86_CPU(cpu_state)->env.fpus << 16);
- xsave->data[0] |= (X86_CPU(cpu_state)->env.fpstt & 7) << 11;
-
- for (x = 0; x < 8; ++x)
- xsave->data[1] |= ((!X86_CPU(cpu_state)->env.fptags[x]) << x);
- xsave->data[1] |= (uint32_t)(X86_CPU(cpu_state)->env.fpop << 16);
-
- memcpy(&xsave->data[40], &X86_CPU(cpu_state)->env.xmm_regs,
sizeof(X86_CPU(cpu_state)->env.xmm_regs));
-
- xsave->data[6] = X86_CPU(cpu_state)->env.mxcsr;
- *(uint64_t *)&xsave->data[128] = X86_CPU(cpu_state)->env.xstate_bv;
-
- if (hv_vcpu_write_fpstate(cpu_state->hvf_fd, xsave->data, 4096)){
+
+ x86_cpu_xsave_all_areas(X86_CPU(cpu_state), xsave);
+
+ if (hv_vcpu_write_fpstate(cpu_state->hvf_fd, xsave->data, 4096)) {
abort();
}
}
@@ -185,39 +162,15 @@ void hvf_put_msrs(CPUState *cpu_state)
void hvf_get_xsave(CPUState *cpu_state)
{
- int x;
struct hvf_xsave_buf *xsave;
-
+
xsave = X86_CPU(cpu_state)->env.kvm_xsave_buf;
-
+
if (hv_vcpu_read_fpstate(cpu_state->hvf_fd, xsave->data, 4096)) {
abort();
}
- memcpy(&X86_CPU(cpu_state)->env.fpdp, &xsave->data[4],
sizeof(X86_CPU(cpu_state)->env.fpdp));
- memcpy(&X86_CPU(cpu_state)->env.fpip, &xsave->data[2],
sizeof(X86_CPU(cpu_state)->env.fpip));
- memcpy(&X86_CPU(cpu_state)->env.fpregs, &xsave->data[8],
sizeof(X86_CPU(cpu_state)->env.fpregs));
- memcpy(&X86_CPU(cpu_state)->env.ymmh_regs, &xsave->data[144],
sizeof(X86_CPU(cpu_state)->env.ymmh_regs));
- memcpy(&X86_CPU(cpu_state)->env.zmmh_regs, &xsave->data[288],
sizeof(X86_CPU(cpu_state)->env.zmmh_regs));
- memcpy(&X86_CPU(cpu_state)->env.opmask_regs, &xsave->data[272],
sizeof(X86_CPU(cpu_state)->env.opmask_regs));
- memcpy(&X86_CPU(cpu_state)->env.bnd_regs, &xsave->data[240],
sizeof(X86_CPU(cpu_state)->env.bnd_regs));
- memcpy(&X86_CPU(cpu_state)->env.bndcs_regs, &xsave->data[256],
sizeof(X86_CPU(cpu_state)->env.bndcs_regs));
- memcpy(&X86_CPU(cpu_state)->env.hi16_zmm_regs, &xsave->data[416],
sizeof(X86_CPU(cpu_state)->env.hi16_zmm_regs));
-
-
- X86_CPU(cpu_state)->env.fpuc = (uint16_t)xsave->data[0];
- X86_CPU(cpu_state)->env.fpus = (uint16_t)(xsave->data[0] >> 16);
- X86_CPU(cpu_state)->env.fpstt = (X86_CPU(cpu_state)->env.fpus >> 11) & 7;
- X86_CPU(cpu_state)->env.fpop = (uint16_t)(xsave->data[1] >> 16);
-
- for (x = 0; x < 8; ++x)
- X86_CPU(cpu_state)->env.fptags[x] =
- ((((uint16_t)xsave->data[1] >> x) & 1) == 0);
-
- memcpy(&X86_CPU(cpu_state)->env.xmm_regs, &xsave->data[40],
sizeof(X86_CPU(cpu_state)->env.xmm_regs));
-
- X86_CPU(cpu_state)->env.mxcsr = xsave->data[6];
- X86_CPU(cpu_state)->env.xstate_bv = *(uint64_t *)&xsave->data[128];
+ x86_cpu_xrstor_all_areas(X86_CPU(cpu_state), xsave);
}
void hvf_get_segments(CPUState *cpu_state)
--
2.14.1
- [Qemu-devel] [PATCH 00/14] add support for Hypervisor.framework in QEMU, Sergio Andres Gomez Del Real, 2017/08/27
- [Qemu-devel] [PATCH 01/14] hvf: add support for Hypervisor.framework in the configure script, Sergio Andres Gomez Del Real, 2017/08/27
- [Qemu-devel] [PATCH 03/14] hvf: add conditional macros around hvf code in cpus.c, Sergio Andres Gomez Del Real, 2017/08/27
- [Qemu-devel] [PATCH 04/14] hvf: add fields to CPUState and CPUX86State; add definitions, Sergio Andres Gomez Del Real, 2017/08/27
- [Qemu-devel] [PATCH 06/14] hvf: add compilation rules to Makefile.objs, Sergio Andres Gomez Del Real, 2017/08/27
- [Qemu-devel] [PATCH 05/14] hvf: use new helper functions for put/get xsave,
Sergio Andres Gomez Del Real <=
- [Qemu-devel] [PATCH 08/14] apic: add function to apic that will be used by hvf, Sergio Andres Gomez Del Real, 2017/08/27
- [Qemu-devel] [PATCH 09/14] hvf: implement hvf_get_supported_cpuid, Sergio Andres Gomez Del Real, 2017/08/27
- [Qemu-devel] [PATCH 11/14] hvf: implement vga dirty page tracking, Sergio Andres Gomez Del Real, 2017/08/27
- [Qemu-devel] [PATCH 10/14] hvf: refactor cpuid code, Sergio Andres Gomez Del Real, 2017/08/27
- [Qemu-devel] [PATCH 14/14] hvf: inject General Protection Fault when vmexit through vmcall, Sergio Andres Gomez Del Real, 2017/08/27
- [Qemu-devel] [PATCH 13/14] hvf: refactor event injection code for hvf, Sergio Andres Gomez Del Real, 2017/08/27
- [Qemu-devel] [PATCH 12/14] hvf: move fields from CPUState to CPUX86State, Sergio Andres Gomez Del Real, 2017/08/27
- [Qemu-devel] [PATCH 02/14] hvf: add code base from Google's QEMU repository, Sergio Andres Gomez Del Real, 2017/08/28