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

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

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 781d0edc
...@@ -1389,14 +1389,11 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) ...@@ -1389,14 +1389,11 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
break; break;
case 0x58 ... 0x5f: /* pop reg */ case 0x58 ... 0x5f: /* pop reg */
pop_instruction: pop_instruction:
if ((rc = ops->read_std(register_address(c, ss_base(ctxt), c->src.bytes = c->op_bytes;
c->regs[VCPU_REGS_RSP]), c->dst.ptr, rc = emulate_pop(ctxt, ops);
c->op_bytes, ctxt->vcpu)) != 0) if (rc != 0)
goto done; goto done;
c->dst.val = c->src.val;
register_address_increment(c, &c->regs[VCPU_REGS_RSP],
c->op_bytes);
c->dst.type = OP_NONE; /* Disable writeback. */
break; break;
case 0x63: /* movsxd */ case 0x63: /* movsxd */
if (ctxt->mode != X86EMUL_MODE_PROT64) if (ctxt->mode != X86EMUL_MODE_PROT64)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment