From patchwork Wed Aug 4 09:37:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 116984 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 o749dHNH004166 for ; Wed, 4 Aug 2010 09:39:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756951Ab0HDJjQ (ORCPT ); Wed, 4 Aug 2010 05:39:16 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:56506 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1756262Ab0HDJjP (ORCPT ); Wed, 4 Aug 2010 05:39:15 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id AD7A517013A; Wed, 4 Aug 2010 17:39:13 +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 o749aBGM022748; Wed, 4 Aug 2010 17:36:11 +0800 Received: from [10.167.141.76] (unknown [10.167.141.76]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id 244E92913EA; Wed, 4 Aug 2010 17:40:00 +0800 (CST) Message-ID: <4C5934CB.3000500@cn.fujitsu.com> Date: Wed, 04 Aug 2010 17:37:15 +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 CC: Avi Kivity , kvm@vger.kernel.org Subject: [PATCHv2] KVM: x86 emulator: cleanup for BitOp instruction emulation References: <4C592470.1010608@cn.fujitsu.com> <4C592C55.8080607@cn.fujitsu.com> <4C593257.2090702@redhat.com> In-Reply-To: <4C593257.2090702@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]); Wed, 04 Aug 2010 09:39:18 +0000 (UTC) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index eba5a67..74008ed 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -2617,6 +2617,10 @@ done_prefixes: return 0; } + /* Only subword offset for BitOp: bt/bts/btr/btc. */ + if (c->d & BitOp) + c->src.val &= (c->dst.bytes << 3) - 1; + done: return (rc == X86EMUL_UNHANDLEABLE) ? -1 : 0; } @@ -3303,8 +3307,6 @@ twobyte_insn: case 0xa3: bt: /* bt */ c->dst.type = OP_NONE; - /* only subword offset */ - c->src.val &= (c->dst.bytes << 3) - 1; emulate_2op_SrcV_nobyte("bt", c->src, c->dst, ctxt->eflags); break; case 0xa4: /* shld imm8, r, r/m */ @@ -3321,8 +3323,6 @@ twobyte_insn: break; case 0xab: bts: /* bts */ - /* only subword offset */ - c->src.val &= (c->dst.bytes << 3) - 1; emulate_2op_SrcV_nobyte("bts", c->src, c->dst, ctxt->eflags); break; case 0xac: /* shrd imm8, r, r/m */ @@ -3350,8 +3350,6 @@ twobyte_insn: break; case 0xb3: btr: /* btr */ - /* only subword offset */ - c->src.val &= (c->dst.bytes << 3) - 1; emulate_2op_SrcV_nobyte("btr", c->src, c->dst, ctxt->eflags); break; case 0xb6 ... 0xb7: /* movzx */ @@ -3373,8 +3371,6 @@ twobyte_insn: break; case 0xbb: btc: /* btc */ - /* only subword offset */ - c->src.val &= (c->dst.bytes << 3) - 1; emulate_2op_SrcV_nobyte("btc", c->src, c->dst, ctxt->eflags); break; case 0xbe ... 0xbf: /* movsx */