| Message ID | 20090816175138.GA8521@mohd-laptop (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 08/16/2009 08:51 PM, Mohammed Gamal wrote: > > +static void emulate_push_sreg(struct x86_emulate_ctxt *ctxt, int seg) > +{ > + struct decode_cache *c =&ctxt->decode; > + struct kvm_segment segment; > + kvm_x86_ops->get_segment(ctxt->vcpu,&segment, seg); > + c->src.ptr = (unsigned long *)&segment.selector; > + emulate_push(ctxt); > +} > This will pick up random junk from segment.type if used in 32-bit mode, since segment.selector is only 16 bits wide. btw, I see that emulate_push() uses src.val, not src.ptr. Have you tested this?
On Mon, Aug 17, 2009 at 11:03 AM, Avi Kivity<avi@redhat.com> wrote: > On 08/16/2009 08:51 PM, Mohammed Gamal wrote: >> >> +static void emulate_push_sreg(struct x86_emulate_ctxt *ctxt, int seg) >> +{ >> + Â Â Â struct decode_cache *c =&ctxt->decode; >> + Â Â Â struct kvm_segment segment; >> + Â Â Â kvm_x86_ops->get_segment(ctxt->vcpu,&segment, seg); >> + Â Â Â c->src.ptr = (unsigned long *)&segment.selector; >> + Â Â Â emulate_push(ctxt); >> +} >> > > This will pick up random junk from segment.type if used in 32-bit mode, > since segment.selector is only 16 bits wide. > > btw, I see that emulate_push() uses src.val, not src.ptr. Â Have you tested > this? > Hmmm, there are no test cases that test conventional push/pop instructions. I'll write a test case and see if the function behaves correctly. > > -- > error compiling committee.c: too many arguments to function > > -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 2eb807a..7688c0b 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -92,7 +92,7 @@ static u32 opcode_table[256] = { /* 0x00 - 0x07 */ ByteOp | DstMem | SrcReg | ModRM, DstMem | SrcReg | ModRM, ByteOp | DstReg | SrcMem | ModRM, DstReg | SrcMem | ModRM, - ByteOp | DstAcc | SrcImm, DstAcc | SrcImm, 0, 0, + ByteOp | DstAcc | SrcImm, DstAcc | SrcImm, ImplicitOps | Stack, 0, /* 0x08 - 0x0F */ ByteOp | DstMem | SrcReg | ModRM, DstMem | SrcReg | ModRM, ByteOp | DstReg | SrcMem | ModRM, DstReg | SrcMem | ModRM, @@ -1186,6 +1186,15 @@ static int emulate_pop(struct x86_emulate_ctxt *ctxt, return rc; } +static void emulate_push_sreg(struct x86_emulate_ctxt *ctxt, int seg) +{ + struct decode_cache *c = &ctxt->decode; + struct kvm_segment segment; + kvm_x86_ops->get_segment(ctxt->vcpu, &segment, seg); + c->src.ptr = (unsigned long *) &segment.selector; + emulate_push(ctxt); +} + static inline int emulate_grp1a(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) { @@ -1707,6 +1716,9 @@ special_insn: add: /* add */ emulate_2op_SrcV("add", c->src, c->dst, ctxt->eflags); break; + case 0x06: /* push es */ + emulate_push_sreg(ctxt, VCPU_SREG_ES); + break; case 0x08 ... 0x0d: or: /* or */ emulate_2op_SrcV("or", c->src, c->dst, ctxt->eflags);
Signed-off-by: Mohammed Gamal <m.gamal005@gmail.com> --- arch/x86/kvm/emulate.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-)