From patchwork Sat Feb 9 09:31:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 2119861 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 6D20FDF24C for ; Sat, 9 Feb 2013 09:32:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752557Ab3BIJcF (ORCPT ); Sat, 9 Feb 2013 04:32:05 -0500 Received: from mail-wi0-f177.google.com ([209.85.212.177]:64951 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752496Ab3BIJcB (ORCPT ); Sat, 9 Feb 2013 04:32:01 -0500 Received: by mail-wi0-f177.google.com with SMTP id hm14so1662544wib.4 for ; Sat, 09 Feb 2013 01:32:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=qddsEP71YuSJ7WYeLqMWOCOa3MlEHm/jGu6vHC3v/fQ=; b=zEYDxt8hRLOUhI32oLypwFFoPVE5W3mJZain9m8+57C1gAFTTi0aaG4oeq5B+rrf6y Has7h5sD3xMDxWqDgrY0FyoyjxCFerU2uwJuo/d1myeiOS1SpbNoikI61PmGckWJbOjj kufvDXEJ7M7whgyb+0TX87lDMubaJUirDRvAdCaY6xgA29k4sb79pTWFAPWeNhHyh2ms 6hha/8y2Gejd3S/gyGdFe8EqXquu0EUd+ozi3sqL3ii+M4aC9YAaFaEJaVGmyWvGwLTh iTpAT9jwqePLocMylf6X6Kg5FJdXGKaWK2fKO941cuvTfiTdC1um00vw741TNWYTGnMI 8K3Q== X-Received: by 10.180.79.201 with SMTP id l9mr6764338wix.20.1360402320114; Sat, 09 Feb 2013 01:32:00 -0800 (PST) Received: from localhost.localdomain (93-172-168-34.bb.netvision.net.il. [93.172.168.34]) by mx.google.com with ESMTPS id fg6sm419274wib.10.2013.02.09.01.31.58 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 09 Feb 2013 01:31:59 -0800 (PST) From: Avi Kivity To: Gleb Natapov , Marcelo Tosatti Cc: kvm@vger.kernel.org Subject: [PATCH 3/8] KVM: x86 emulator: switch MUL/DIV to DstXacc Date: Sat, 9 Feb 2013 11:31:46 +0200 Message-Id: <1360402311-19904-4-git-send-email-avi.kivity@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1360402311-19904-1-git-send-email-avi.kivity@gmail.com> References: <1360402311-19904-1-git-send-email-avi.kivity@gmail.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Signed-off-by: Avi Kivity --- arch/x86/kvm/emulate.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index aa8516e..d51f6f4 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -139,6 +139,7 @@ /* Source 2 operand type */ #define Src2Shift (30) #define Src2None (OpNone << Src2Shift) +#define Src2Mem (OpMem << Src2Shift) #define Src2CL (OpCL << Src2Shift) #define Src2ImmByte (OpImmByte << Src2Shift) #define Src2One (OpOne << Src2Shift) @@ -542,8 +543,8 @@ FOP_END; #define __emulate_1op_rax_rdx(ctxt, _op, _suffix, _ex) \ do { \ unsigned long _tmp; \ - ulong *rax = reg_rmw((ctxt), VCPU_REGS_RAX); \ - ulong *rdx = reg_rmw((ctxt), VCPU_REGS_RDX); \ + ulong *rax = &ctxt->dst.val; \ + ulong *rdx = &ctxt->src.val; \ \ __asm__ __volatile__ ( \ _PRE_EFLAGS("0", "5", "1") \ @@ -558,7 +559,7 @@ FOP_END; _ASM_EXTABLE(1b, 3b) \ : "=m" ((ctxt)->eflags), "=&r" (_tmp), \ "+a" (*rax), "+d" (*rdx), "+qm"(_ex) \ - : "i" (EFLAGS_MASK), "m" ((ctxt)->src.val)); \ + : "i" (EFLAGS_MASK), "m" ((ctxt)->src2.val)); \ } while (0) /* instruction has only one source operand, destination is implicit (e.g. mul, div, imul, idiv) */ @@ -3701,10 +3702,10 @@ static const struct opcode group3[] = { F(DstMem | SrcImm | NoWrite, em_test), F(DstMem | SrcNone | Lock, em_not), F(DstMem | SrcNone | Lock, em_neg), - I(SrcMem, em_mul_ex), - I(SrcMem, em_imul_ex), - I(SrcMem, em_div_ex), - I(SrcMem, em_idiv_ex), + I(DstXacc | Src2Mem, em_mul_ex), + I(DstXacc | Src2Mem, em_imul_ex), + I(DstXacc | Src2Mem, em_div_ex), + I(DstXacc | Src2Mem, em_idiv_ex), }; static const struct opcode group4[] = {