KVM: x86 emulator: qualify OpReg inhibit_byte_regs hack
authorAvi Kivity <avi@redhat.com>
Tue, 13 Sep 2011 07:45:46 +0000 (10:45 +0300)
committerAvi Kivity <avi@redhat.com>
Sun, 25 Sep 2011 16:52:53 +0000 (19:52 +0300)
OpReg decoding has a hack that inhibits byte registers for movsx and movzx
instructions.  It should be replaced by something better, but meanwhile,
qualify that the hack is only active for the destination operand.

Note these instructions only use OpReg for the destination, but better to
be explicit about it.

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
arch/x86/kvm/emulate.c

index a0d6ceb4b4547c4f106d9fcdcffa44820ebe0597..17a8910f28ce66887ece850af8ba465e1bc7cb5a 100644 (file)
@@ -3346,6 +3346,7 @@ static int decode_operand(struct x86_emulate_ctxt *ctxt, struct operand *op,
        switch (d) {
        case OpReg:
                decode_register_operand(ctxt, op,
+                        op == &ctxt->dst &&
                         ctxt->twobyte && (ctxt->b == 0xb6 || ctxt->b == 0xb7));
                break;
        case OpImmUByte: