From patchwork Fri Jan 4 10:47:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 1932551 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 1B8A33FDDA for ; Fri, 4 Jan 2013 10:56:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753868Ab3ADK4O (ORCPT ); Fri, 4 Jan 2013 05:56:14 -0500 Received: from mail-wi0-f181.google.com ([209.85.212.181]:57019 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753164Ab3ADK4M (ORCPT ); Fri, 4 Jan 2013 05:56:12 -0500 X-Greylist: delayed 498 seconds by postgrey-1.27 at vger.kernel.org; Fri, 04 Jan 2013 05:56:12 EST Received: by mail-wi0-f181.google.com with SMTP id hm9so9147315wib.14 for ; Fri, 04 Jan 2013 02:56:11 -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=33pneWRAQ65fevN0Uq+EwwGtLIzEAKJRClgRAnRaBGI=; b=01q3xge+yXcMN68djGXA73WemzlJGA35TumW3o+ZIixFKPq62ojzYZ4KhsoFoQo1LJ vXjlw7dpsBx2DZPucFCNh8Cbs26gnjbXqVIcLkWJ1Huz52lE+f5msC2XcnsHwunF1GsJ wko3LGtCMWAt2sBOdQgeTisocGSN8SSe4FFiFsU5KuRfE48AXVcEyWKox3REiZ6XW0ii oK7JBTcqXTLCTqz0YFYxS+enNjXT8cqNVYTfZ7M+F4y3NkUGu0tDUbCaiQ92+xysrOHI oE3E+4VVvkbK0l7JIem/M+aW9sMTQ45aqsATk3Y/qkmP5bNYg/roj8FecHcxp6loawsU 75SA== X-Received: by 10.194.92.180 with SMTP id cn20mr83136488wjb.51.1357296474080; Fri, 04 Jan 2013 02:47:54 -0800 (PST) Received: from localhost.localdomain (93-172-35-137.bb.netvision.net.il. [93.172.35.137]) by mx.google.com with ESMTPS id g2sm89641674wiy.0.2013.01.04.02.47.52 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 04 Jan 2013 02:47:53 -0800 (PST) From: Avi Kivity To: Marcelo Tosatti , Gleb Natapov Cc: kvm@vger.kernel.org Subject: [PATCH v2 6/7] KVM: x86 emulator: add macros for defining 2-operand fastop emulation Date: Fri, 4 Jan 2013 12:47:38 +0200 Message-Id: <1357296459-8951-7-git-send-email-avi.kivity@gmail.com> X-Mailer: git-send-email 1.8.0.1 In-Reply-To: <1357296459-8951-1-git-send-email-avi.kivity@gmail.com> References: <1357296459-8951-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 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 09dbdc5..9a39689 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -465,6 +465,17 @@ static void invalidate_registers(struct x86_emulate_ctxt *ctxt) ON64(FOP1E(op##q, rax)) \ FOP_END +#define FOP2E(op, dst, src) \ + FOP_ALIGN #op " %" #dst ", %" #src " \n\t" FOP_RET + +#define FASTOP2(op) \ + FOP_START(op) \ + FOP2E(op##b, al, bl) \ + FOP2E(op##w, ax, bx) \ + FOP2E(op##l, eax, ebx) \ + ON64(FOP2E(op##q, rax, rbx)) \ + FOP_END + #define __emulate_1op_rax_rdx(ctxt, _op, _suffix, _ex) \ do { \ unsigned long _tmp; \ @@ -3696,6 +3707,7 @@ static int check_perm_out(struct x86_emulate_ctxt *ctxt) #define D2bv(_f) D((_f) | ByteOp), D(_f) #define D2bvIP(_f, _i, _p) DIP((_f) | ByteOp, _i, _p), DIP(_f, _i, _p) #define I2bv(_f, _e) I((_f) | ByteOp, _e), I(_f, _e) +#define F2bv(_f, _e) F((_f) | ByteOp, _e), F(_f, _e) #define I2bvIP(_f, _e, _i, _p) \ IIP((_f) | ByteOp, _e, _i, _p), IIP(_f, _e, _i, _p)