From patchwork Fri Aug 13 05:13:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 119376 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7D5G3X2014052 for ; Fri, 13 Aug 2010 05:16:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751903Ab0HMFQA (ORCPT ); Fri, 13 Aug 2010 01:16:00 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:52313 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751640Ab0HMFQA (ORCPT ); Fri, 13 Aug 2010 01:16:00 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 085FB170124; Fri, 13 Aug 2010 13:15:56 +0800 (CST) Received: from fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id o7D5Ckgu001475; Fri, 13 Aug 2010 13:12:47 +0800 Received: from [10.167.141.76] (unknown [10.167.141.76]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id 4BAC810C1F6; Fri, 13 Aug 2010 13:16:53 +0800 (CST) Message-ID: <4C64D471.2090905@cn.fujitsu.com> Date: Fri, 13 Aug 2010 13:13:21 +0800 From: Wei Yongjun User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.10) Gecko/20100528 Thunderbird/3.0.5 MIME-Version: 1.0 To: Paolo Bonzini , Avi Kivity CC: kvm@vger.kernel.org Subject: [PATCH 2/2 v2] KVM: x86 emulator: add XADD instruction emulation References: <4C63F947.7020808@cn.fujitsu.com> <4C63FA04.3030403@cn.fujitsu.com> <4C64148D.4080103@redhat.com> In-Reply-To: <4C64148D.4080103@redhat.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 13 Aug 2010 05:16:03 +0000 (UTC) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 8bf80a9..279547a 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -2387,7 +2387,8 @@ static struct opcode twobyte_table[256] = { D(DstReg | SrcMem | ModRM), D(DstReg | SrcMem | ModRM), D(ByteOp | DstReg | SrcMem | ModRM | Mov), D(DstReg | SrcMem16 | ModRM | Mov), /* 0xC0 - 0xCF */ - N, N, N, D(DstMem | SrcReg | ModRM | Mov), + D(ByteOp | DstMem | SrcReg | ModRM), D(DstMem | SrcReg | ModRM), + N, D(DstMem | SrcReg | ModRM | Mov), N, N, N, GD(0, &group9), N, N, N, N, N, N, N, N, /* 0xD0 - 0xDF */ @@ -3532,6 +3533,10 @@ twobyte_insn: c->dst.val = (c->d & ByteOp) ? (s8) c->src.val : (s16) c->src.val; break; + case 0xc0 ... 0xc1: /* xadd */ + /* Write back the register source. */ + write_register_operand(&c->src, c->dst.val, c->dst.bytes); + goto add; case 0xc3: /* movnti */ c->dst.bytes = c->op_bytes; c->dst.val = (c->op_bytes == 4) ? (u32) c->src.val :