lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: x86 emulator: Make emulate_pop() a little more generic

Browse Source 
Allow emulate_pop() to read into arbitrary memory rather than just the
source operand.  Needed for complicated instructions like far returns.

Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity
2009-01-05 11:12:40 +02:00
parent 10f32d84c7
commit 350f69dcd1
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
arch/x86/kvm/x86_emulate.c
View File

@@ -1136,18 +1136,19 @@ static inline void emulate_push(struct x86_emulate_ctxt *ctxt)
} }
static int emulate_pop(struct x86_emulate_ctxt *ctxt, static int emulate_pop(struct x86_emulate_ctxt *ctxt,
struct x86_emulate_ops *ops) struct x86_emulate_ops *ops,
void *dest, int len)
{ {
struct decode_cache *c = &ctxt->decode; struct decode_cache *c = &ctxt->decode;
int rc; int rc;
rc = ops->read_emulated(register_address(c, ss_base(ctxt), rc = ops->read_emulated(register_address(c, ss_base(ctxt),
c->regs[VCPU_REGS_RSP]), c->regs[VCPU_REGS_RSP]),
&c->src.val, c->src.bytes, ctxt->vcpu); dest, len, ctxt->vcpu);
if (rc != 0) if (rc != 0)
return rc; return rc;
register_address_increment(c, &c->regs[VCPU_REGS_RSP], c->src.bytes); register_address_increment(c, &c->regs[VCPU_REGS_RSP], len);
return rc; return rc;
} }
@@ -1157,11 +1158,9 @@ static inline int emulate_grp1a(struct x86_emulate_ctxt *ctxt,
struct decode_cache *c = &ctxt->decode; struct decode_cache *c = &ctxt->decode;
int rc; int rc;
c->src.bytes = c->dst.bytes; rc = emulate_pop(ctxt, ops, &c->dst.val, c->dst.bytes);
rc = emulate_pop(ctxt, ops);
if (rc != 0) if (rc != 0)
return rc; return rc;
c->dst.val = c->src.val;
return 0; return 0;
} }
@@ -1467,11 +1466,9 @@ special_insn:
break; break;
case 0x58 ... 0x5f: /* pop reg */ case 0x58 ... 0x5f: /* pop reg */
pop_instruction: pop_instruction:
c->src.bytes = c->op_bytes; rc = emulate_pop(ctxt, ops, &c->dst.val, c->op_bytes);
rc = emulate_pop(ctxt, ops);
if (rc != 0) if (rc != 0)
goto done; goto done;
c->dst.val = c->src.val;
break; break;
case 0x63: /* movsxd */ case 0x63: /* movsxd */
if (ctxt->mode != X86EMUL_MODE_PROT64) if (ctxt->mode != X86EMUL_MODE_PROT64)