Commit 8a09b687 authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: x86 emulator: switch 'pop reg' instruction to emulate_pop() 



Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 781d0edc

arch/x86/kvm/x86_emulate.c

+4 −7
Original line number Diff line number Diff line
@@ -1389,14 +1389,11 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
		break;

	case 0x58 ... 0x5f: /* pop reg */

	pop_instruction:

		if ((rc = ops->read_std(register_address(c, ss_base(ctxt),

			c->regs[VCPU_REGS_RSP]), c->dst.ptr,

			c->op_bytes, ctxt->vcpu)) != 0)

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

		rc = emulate_pop(ctxt, ops);

		if (rc != 0)

			goto done;



		register_address_increment(c, &c->regs[VCPU_REGS_RSP],

					   c->op_bytes);

		c->dst.type = OP_NONE;	/* Disable writeback. */

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

		break;

	case 0x63:		/* movsxd */

		if (ctxt->mode != X86EMUL_MODE_PROT64)