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);