Commit d6d367d6 authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity
Browse files

KVM: x86 emulator: Fix DstAcc decoding. 



Set correct operation length. Add RAX (64bit) handling.

Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 08e850c6

arch/x86/kvm/emulate.c

+5 −2
Original line number Diff line number Diff line
@@ -1194,9 +1194,9 @@ x86_decode_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
		break;

	case DstAcc:

		c->dst.type = OP_REG;

		c->dst.bytes = c->op_bytes;

		c->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;

		c->dst.ptr = &c->regs[VCPU_REGS_RAX];

		switch (c->op_bytes) {

		switch (c->dst.bytes) {

			case 1:

				c->dst.val = *(u8 *)c->dst.ptr;

				break;
@@ -1206,6 +1206,9 @@ x86_decode_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
			case 4:

				c->dst.val = *(u32 *)c->dst.ptr;

				break;

			case 8:

				c->dst.val = *(u64 *)c->dst.ptr;

				break;

		}

		c->dst.orig_val = c->dst.val;

		break;