lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: x86 emulator: mask group 8 instruction as BitOp

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

Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Wei Yongjun
2010-08-09 11:39:14 +08:00
committed by Avi Kivity
parent 3885f18fe3
commit ba7ff2b76d
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/kvm/emulate.c
View File

@@ -737,6 +737,9 @@ static void fetch_bit_operand(struct decode_cache *c)
c->dst.addr.mem += (sv >> 3); c->dst.addr.mem += (sv >> 3);
} }
/* only subword offset */
c->src.val &= (c->dst.bytes << 3) - 1;
} }
static int read_emulated(struct x86_emulate_ctxt *ctxt, static int read_emulated(struct x86_emulate_ctxt *ctxt,
@@ -2336,7 +2339,7 @@ static struct opcode twobyte_table[256] = {
D(DstReg | SrcMem16 | ModRM | Mov), D(DstReg | SrcMem16 | ModRM | Mov),
/* 0xB8 - 0xBF */ /* 0xB8 - 0xBF */
N, N, 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), N, N, D(ByteOp | DstReg | SrcMem | ModRM | Mov),
D(DstReg | SrcMem16 | ModRM | Mov), D(DstReg | SrcMem16 | ModRM | Mov),
/* 0xC0 - 0xCF */ /* 0xC0 - 0xCF */
@@ -3419,8 +3422,6 @@ twobyte_insn:
break; break;
case 0xab: case 0xab:
bts: /* bts */ bts: /* bts */
/* only subword offset */
c->src.val &= (c->dst.bytes << 3) - 1;
emulate_2op_SrcV_nobyte("bts", c->src, c->dst, ctxt->eflags); emulate_2op_SrcV_nobyte("bts", c->src, c->dst, ctxt->eflags);
break; break;
case 0xac: /* shrd imm8, r, r/m */ case 0xac: /* shrd imm8, r, r/m */
@@ -3448,8 +3449,6 @@ twobyte_insn:
break; break;
case 0xb3: case 0xb3:
btr: /* btr */ btr: /* btr */
/* only subword offset */
c->src.val &= (c->dst.bytes << 3) - 1;
emulate_2op_SrcV_nobyte("btr", c->src, c->dst, ctxt->eflags); emulate_2op_SrcV_nobyte("btr", c->src, c->dst, ctxt->eflags);
break; break;
case 0xb6 ... 0xb7: /* movzx */ case 0xb6 ... 0xb7: /* movzx */
@@ -3471,8 +3470,6 @@ twobyte_insn:
break; break;
case 0xbb: case 0xbb:
btc: /* btc */ btc: /* btc */
/* only subword offset */
c->src.val &= (c->dst.bytes << 3) - 1;
emulate_2op_SrcV_nobyte("btc", c->src, c->dst, ctxt->eflags); emulate_2op_SrcV_nobyte("btc", c->src, c->dst, ctxt->eflags);
break; break;
case 0xbe ... 0xbf: /* movsx */ case 0xbe ... 0xbf: /* movsx */