From patchwork Sat Feb 9 09:31:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 2119891 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 95D08DFE82 for ; Sat, 9 Feb 2013 09:32:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752612Ab3BIJcP (ORCPT ); Sat, 9 Feb 2013 04:32:15 -0500 Received: from mail-wi0-f176.google.com ([209.85.212.176]:44539 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752474Ab3BIJcK (ORCPT ); Sat, 9 Feb 2013 04:32:10 -0500 Received: by mail-wi0-f176.google.com with SMTP id hm14so1687632wib.9 for ; Sat, 09 Feb 2013 01:32:08 -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=jGR6cZYIOUymPfX8B7sHE63gGtioBh8ww2Cc3oDTQEk=; b=RWl38oPIFByT7QwlwAi8Hi0y3F6pqhivTfJCYpHZ/UU9S/nCCyi19o1CevB9pEy6Xv ws0aX2rf/GKZGCB4p9cZT6eNG1tXA3yKgXIF5D1+Y8VG+IGBxMtvDpqwpoyfZ7a6oKgf g+TZH+DIE59Hjg0wF+ufZCTCpiY55HTcI1MUIw1Hg/NFggy//RkIqzA6a7slV9biVz8u KYzW/Ts+/rcMRwy/Vag8IDI4UOMkYda/XCvz6H8FUvLG1k7k38xn8+r5s8VNnWmpF+Zh c9QAXyesq5r/zMX8iDGat3X+XYTwp49n/io6MVlcf0BEM40oyjIAUKy4z5/jYna0/5RX PtBw== X-Received: by 10.180.100.169 with SMTP id ez9mr6346556wib.3.1360402328759; Sat, 09 Feb 2013 01:32:08 -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.32.07 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 09 Feb 2013 01:32:08 -0800 (PST) From: Avi Kivity To: Gleb Natapov , Marcelo Tosatti Cc: kvm@vger.kernel.org Subject: [PATCH 8/8] KVM: x86 emulator: convert XADD to fastop Date: Sat, 9 Feb 2013 11:31:51 +0200 Message-Id: <1360402311-19904-9-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 | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index a706e52..2f895c2 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -847,6 +847,8 @@ FASTOP2W(bts); FASTOP2W(btr); FASTOP2W(btc); +FASTOP2(xadd); + static u8 test_cc(unsigned int condition, unsigned long flags) { u8 rc; @@ -3824,7 +3826,7 @@ static const struct opcode twobyte_table[256] = { F(DstReg | SrcMem | ModRM, em_bsf), F(DstReg | SrcMem | ModRM, em_bsr), D(DstReg | SrcMem8 | ModRM | Mov), D(DstReg | SrcMem16 | ModRM | Mov), /* 0xC0 - 0xC7 */ - D2bv(DstMem | SrcReg | ModRM | Lock), + F2bv(DstMem | SrcReg | ModRM | SrcWrite | Lock, em_xadd), N, D(DstMem | SrcReg | ModRM | Mov), N, N, N, GD(0, &group9), /* 0xC8 - 0xCF */ @@ -4643,12 +4645,6 @@ twobyte_insn: ctxt->dst.val = (ctxt->src.bytes == 1) ? (s8) ctxt->src.val : (s16) ctxt->src.val; break; - case 0xc0 ... 0xc1: /* xadd */ - fastop(ctxt, em_add); - /* Write back the register source. */ - ctxt->src.val = ctxt->dst.orig_val; - write_register_operand(&ctxt->src); - break; case 0xc3: /* movnti */ ctxt->dst.bytes = ctxt->op_bytes; ctxt->dst.val = (ctxt->op_bytes == 4) ? (u32) ctxt->src.val :