Commit a7e6c88a authored by Sheng Yang's avatar Sheng Yang Committed by Avi Kivity
Browse files

KVM: x86 emulator: modify 'lods', and 'stos' not to depend on CR2 



The current 'lods' and 'stos' is depending on incoming CR2 rather than decode
memory address from registers.

Signed-off-by: default avatarSheng Yang <sheng.yang@intel.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent f8c16bba

drivers/kvm/x86_emulate.c

+10 −4
Original line number Diff line number Diff line
@@ -1528,7 +1528,9 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
	case 0xaa ... 0xab:	/* stos */

		c->dst.type = OP_MEM;

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

		c->dst.ptr = (unsigned long *)cr2;

		c->dst.ptr = (unsigned long *)register_address(

						   ctxt->es_base,

						   c->regs[VCPU_REGS_RDI]);

		c->dst.val = c->regs[VCPU_REGS_RAX];

		register_address_increment(c->regs[VCPU_REGS_RDI],

				       (ctxt->eflags & EFLG_DF) ? -c->dst.bytes
@@ -1538,7 +1540,11 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
		c->dst.type = OP_REG;

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

		c->dst.ptr = (unsigned long *)&c->regs[VCPU_REGS_RAX];

		if ((rc = ops->read_emulated(cr2, &c->dst.val,

		if ((rc = ops->read_emulated(register_address(

				c->override_base ? *c->override_base :

						   ctxt->ds_base,

						 c->regs[VCPU_REGS_RSI]),

						 &c->dst.val,

						 c->dst.bytes,

						 ctxt->vcpu)) != 0)

			goto done;