diff options
| author | Avi Kivity <avi@redhat.com> | 2012-06-12 20:19:40 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2012-07-09 14:19:03 +0300 |
| commit | 51ddff50cbd77568fe40e17a966b3a2ef1231b36 (patch) | |
| tree | a1a0e2ef3bbeadcf84efc090e3f9953904bd91c0 /arch/x86/kvm/emulate.c | |
| parent | 361cad2b50a2c92b91b6f568db860fabad3bf149 (diff) | |
| download | op-kernel-dev-51ddff50cbd77568fe40e17a966b3a2ef1231b36.zip op-kernel-dev-51ddff50cbd77568fe40e17a966b3a2ef1231b36.tar.gz | |
KVM: x86 emulator: split push logic from push opcode emulation
This allows us to reuse the code without populating ctxt->src and
overriding ctxt->op_bytes.
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/emulate.c')
| -rw-r--r-- | arch/x86/kvm/emulate.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 30f4912..acc647d 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -1505,17 +1505,22 @@ static int writeback(struct x86_emulate_ctxt *ctxt) return X86EMUL_CONTINUE; } -static int em_push(struct x86_emulate_ctxt *ctxt) +static int push(struct x86_emulate_ctxt *ctxt, void *data, int bytes) { struct segmented_address addr; - register_address_increment(ctxt, &ctxt->regs[VCPU_REGS_RSP], -ctxt->op_bytes); + register_address_increment(ctxt, &ctxt->regs[VCPU_REGS_RSP], -bytes); addr.ea = register_address(ctxt, ctxt->regs[VCPU_REGS_RSP]); addr.seg = VCPU_SREG_SS; + return segmented_write(ctxt, addr, data, bytes); +} + +static int em_push(struct x86_emulate_ctxt *ctxt) +{ /* Disable writeback. */ ctxt->dst.type = OP_NONE; - return segmented_write(ctxt, addr, &ctxt->src.val, ctxt->op_bytes); + return push(ctxt, &ctxt->src.val, ctxt->op_bytes); } static int emulate_pop(struct x86_emulate_ctxt *ctxt, |
