diff options
| author |   Avi Kivity <avi@redhat.com> | 2008-11-27 18:06:33 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2008-12-31 16:55:04 +0200 |
| commit | 8a09b6877f3100207b3572e7e12ea796493fe914 (patch) | |
| tree | 6feab30b0db09d445d9a1750ebef759a3bcb30d7 /arch/x86/kvm/x86_emulate.c | |
| parent | KVM: x86 emulator: allow pop from mmio (diff) | |
| download | linux-dev-8a09b6877f3100207b3572e7e12ea796493fe914.tar.xz linux-dev-8a09b6877f3100207b3572e7e12ea796493fe914.zip | |
KVM: x86 emulator: switch 'pop reg' instruction to emulate_pop()
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | arch/x86/kvm/x86_emulate.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c index 70242f5f0964..702de9869c19 100644 --- a/arch/x86/kvm/x86_emulate.c +++ b/arch/x86/kvm/x86_emulate.c @@ -1389,14 +1389,11 @@ special_insn: 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) |