[PATCH 3/3] KVM: x86 emulator: mask group 8 instruction as BitOp

[Wei Yongjun]

Mask group 8 instruction as BitOp, so we can share the
code for adjust the source operand.

Signed-off-by: Wei Yongjun <yj...@cn.fujitsu.com>
---
 arch/x86/kvm/emulate.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index e7e3d2d..dc6a74e 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -746,6 +746,9 @@ static void fetch_bit_operand(struct decode_cache *c)
                        c->dst.addr.mem += (c->src.val & mask) / 8;
                }
        }
+
+       /* only subword offset */
+       c->src.val &= (c->dst.bytes << 3) - 1;
 }
 
 static int read_emulated(struct x86_emulate_ctxt *ctxt,
@@ -2346,7 +2349,7 @@ static struct opcode twobyte_table[256] = {
            D(DstReg | SrcMem16 | ModRM | Mov),
        /* 0xB8 - 0xBF */
        N, N,
-       G(0, group8), D(DstMem | SrcReg | ModRM | BitOp | Lock),
+       G(BitOp, group8), D(DstMem | SrcReg | ModRM | BitOp | Lock),
        N, N, D(ByteOp | DstReg | SrcMem | ModRM | Mov),
            D(DstReg | SrcMem16 | ModRM | Mov),
        /* 0xC0 - 0xCF */
@@ -3420,8 +3423,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 */
@@ -3449,8 +3450,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 */
@@ -3472,8 +3471,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 */
-- 
1.7.0.4


--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html