From patchwork Wed Jan 25 15:05:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 9537235 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5BBB86046A for ; Wed, 25 Jan 2017 15:08:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E4651FE82 for ; Wed, 25 Jan 2017 15:08:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 42ECB27FA6; Wed, 25 Jan 2017 15:08:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D06B91FE82 for ; Wed, 25 Jan 2017 15:08:01 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cWP96-0000T6-Ft; Wed, 25 Jan 2017 15:06:00 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cWP95-0000Sy-WB for xen-devel@lists.xenproject.org; Wed, 25 Jan 2017 15:06:00 +0000 Received: from [85.158.143.35] by server-2.bemta-6.messagelabs.com id 11/B6-22326-7DEB8885; Wed, 25 Jan 2017 15:05:59 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrGIsWRWlGSWpSXmKPExsXS6fjDS/favo4 Ig6l9chbft0xmcmD0OPzhCksAYxRrZl5SfkUCa0Zj23GWgv26Ff9+trM1MF5X6GLk5BASyJP4 cOUeC4jNK2An8enZZTYQW0LAUOLp++tgNouAqsT1C91MIDabgLpE27PtrF2MHBwiAgYS544mg ZjMAvoS29axgJjCAhYSjz6oQwy3k+j6cY4dxOYUsJc4deY3G0gJr4CgxN8dwiBhZrCdN5kmMP LMQsjMQpKBsLUkHv66xQJha0ssW/iaeRbYWmmJ5f84IML2EmffnGZDVQJie0ksadvMtICRYxW jenFqUVlqka6RXlJRZnpGSW5iZo6uoYGZXm5qcXFiempOYlKxXnJ+7iZGYJgyAMEOxmV/nQ4x SnIwKYnyGi/tiBDiS8pPqcxILM6ILyrNSS0+xKjBwSGwbdfqC4xSLHn5ealKErwT9gLVCRalp qdWpGXmACMJplSCg0dJhPciSJq3uCAxtzgzHSJ1ilFRSpz3BUhCACSRUZoH1waL3kuMslLCvI xARwnxFKQW5WaWoMq/YhTnYFQS5l0DMoUnM68EbvoroMVMQIsvMLeDLC5JREhJNTCmf7Zj1nd ev+v3ujVyxdpXOrZvL43vEnaZIyGjsn5J2pmiS8fslu7kvL9z+gOTjsJlnWc0jv7qaLL4rjld aLpdieT1CVcPpp41u5cnflG/vvHgbz2uBBWBj3LrP/l1VVXlbKh13Nf9o7r3s+GkD0Ivb5dvi q5647R+r/ZWjY6Ev298TF8HCH9QYinOSDTUYi4qTgQAykccKNkCAAA= X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1485356756!40542080!1 X-Originating-IP: [137.65.248.74] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 60108 invoked from network); 25 Jan 2017 15:05:58 -0000 Received: from prv-mh.provo.novell.com (HELO prv-mh.provo.novell.com) (137.65.248.74) by server-2.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 25 Jan 2017 15:05:58 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Wed, 25 Jan 2017 08:05:56 -0700 Message-Id: <5888CCDF0200007800133DB7@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.1 Date: Wed, 25 Jan 2017 08:05:51 -0700 From: "Jan Beulich" To: "xen-devel" References: <5888C9110200007800133D98@prv-mh.provo.novell.com> In-Reply-To: <5888C9110200007800133D98@prv-mh.provo.novell.com> Mime-Version: 1.0 Cc: Andrew Cooper Subject: [Xen-devel] [PATCH 5/8] x86emul: support {,V}{,U}COMIS{S,D} X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jan Beulich x86emul: support {,V}{,U}COMIS{S,D} Signed-off-by: Jan Beulich --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -256,7 +256,7 @@ static const struct { [0x2a] = { DstImplicit|SrcMem|ModRM, simd_other }, [0x2b] = { DstMem|SrcImplicit|ModRM|Mov, simd_any_fp }, [0x2c ... 0x2d] = { DstImplicit|SrcMem|ModRM, simd_other }, - [0x2e ... 0x2f] = { ImplicitOps|ModRM }, + [0x2e ... 0x2f] = { ImplicitOps|ModRM|TwoOp }, [0x30] = { ImplicitOps }, [0x31] = { ImplicitOps }, [0x32] = { ImplicitOps }, @@ -5501,6 +5501,54 @@ x86_emulate( state->simd_size = simd_none; break; + CASE_SIMD_PACKED_FP(, 0x0f, 0x2e): /* ucomis{s,d} xmm/mem,xmm */ + CASE_SIMD_PACKED_FP(_VEX, 0x0f, 0x2e): /* vucomis{s,d} xmm/mem,xmm */ + CASE_SIMD_PACKED_FP(, 0x0f, 0x2f): /* comis{s,d} xmm/mem,xmm */ + CASE_SIMD_PACKED_FP(_VEX, 0x0f, 0x2f): /* vcomis{s,d} xmm/mem,xmm */ + if ( vex.opcx == vex_none ) + { + if ( vex.pfx ) + vcpu_must_have(sse2); + else + vcpu_must_have(sse); + get_fpu(X86EMUL_FPU_xmm, &fic); + } + else + { + generate_exception_if(vex.reg != 0xf, EXC_UD); + fail_if(vex.l); + host_and_vcpu_must_have(avx); + get_fpu(X86EMUL_FPU_ymm, &fic); + } + + opc = init_prefixes(stub); + opc[0] = b; + opc[1] = modrm; + if ( ea.type == OP_MEM ) + { + rc = ops->read(ea.mem.seg, ea.mem.off, mmvalp, vex.pfx ? 8 : 4, + ctxt); + if ( rc != X86EMUL_OKAY ) + goto done; + + /* Convert memory operand to (%rAX). */ + rex_prefix &= ~REX_B; + vex.b = 1; + opc[1] &= 0x38; + } + fic.insn_bytes = PFX_BYTES + 2; + + invoke_stub(_PRE_EFLAGS("[eflags]", "[mask]", "[tmp]"), + _POST_EFLAGS("[eflags]", "[mask]", "[tmp]"), + [eflags] "+g" (_regs._eflags), + [tmp] "=&r" (cr4), "+m" (*mmvalp) + : [func] "rm" (stub.func), "a" (mmvalp), + [mask] "i" (EFLAGS_MASK)); + + put_stub(stub); + put_fpu(&fic); + break; + case X86EMUL_OPC(0x0f, 0x30): /* wrmsr */ generate_exception_if(!mode_ring0(), EXC_GP, 0); fail_if(ops->write_msr == NULL); --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -256,7 +256,7 @@ static const struct { [0x2a] = { DstImplicit|SrcMem|ModRM, simd_other }, [0x2b] = { DstMem|SrcImplicit|ModRM|Mov, simd_any_fp }, [0x2c ... 0x2d] = { DstImplicit|SrcMem|ModRM, simd_other }, - [0x2e ... 0x2f] = { ImplicitOps|ModRM }, + [0x2e ... 0x2f] = { ImplicitOps|ModRM|TwoOp }, [0x30] = { ImplicitOps }, [0x31] = { ImplicitOps }, [0x32] = { ImplicitOps }, @@ -5501,6 +5501,54 @@ x86_emulate( state->simd_size = simd_none; break; + CASE_SIMD_PACKED_FP(, 0x0f, 0x2e): /* ucomis{s,d} xmm/mem,xmm */ + CASE_SIMD_PACKED_FP(_VEX, 0x0f, 0x2e): /* vucomis{s,d} xmm/mem,xmm */ + CASE_SIMD_PACKED_FP(, 0x0f, 0x2f): /* comis{s,d} xmm/mem,xmm */ + CASE_SIMD_PACKED_FP(_VEX, 0x0f, 0x2f): /* vcomis{s,d} xmm/mem,xmm */ + if ( vex.opcx == vex_none ) + { + if ( vex.pfx ) + vcpu_must_have(sse2); + else + vcpu_must_have(sse); + get_fpu(X86EMUL_FPU_xmm, &fic); + } + else + { + generate_exception_if(vex.reg != 0xf, EXC_UD); + fail_if(vex.l); + host_and_vcpu_must_have(avx); + get_fpu(X86EMUL_FPU_ymm, &fic); + } + + opc = init_prefixes(stub); + opc[0] = b; + opc[1] = modrm; + if ( ea.type == OP_MEM ) + { + rc = ops->read(ea.mem.seg, ea.mem.off, mmvalp, vex.pfx ? 8 : 4, + ctxt); + if ( rc != X86EMUL_OKAY ) + goto done; + + /* Convert memory operand to (%rAX). */ + rex_prefix &= ~REX_B; + vex.b = 1; + opc[1] &= 0x38; + } + fic.insn_bytes = PFX_BYTES + 2; + + invoke_stub(_PRE_EFLAGS("[eflags]", "[mask]", "[tmp]"), + _POST_EFLAGS("[eflags]", "[mask]", "[tmp]"), + [eflags] "+g" (_regs._eflags), + [tmp] "=&r" (cr4), "+m" (*mmvalp) + : [func] "rm" (stub.func), "a" (mmvalp), + [mask] "i" (EFLAGS_MASK)); + + put_stub(stub); + put_fpu(&fic); + break; + case X86EMUL_OPC(0x0f, 0x30): /* wrmsr */ generate_exception_if(!mode_ring0(), EXC_GP, 0); fail_if(ops->write_msr == NULL);