From 0c303e1a4a814aae705f1c1863de8fc0485544ca Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Tue, 28 Aug 2007 18:08:37 -0700 Subject: [PATCH] --- yaml --- r: 68431 b: refs/heads/master c: f6eed39135c03d39ff4095b1ddd947672469dfee h: refs/heads/master i: 68429: e4d4e49581e9b6a65357b77a2bc9606bd016c885 68427: 32a3ef748182e26847bcf1853241d0bba21ea79f 68423: ce0e9654c4023abfd13f4009334f1bf337b2c743 68415: f8c7535f6f86095b93d6fcdfe786c91d502258fb v: v3 --- [refs] | 2 +- trunk/drivers/kvm/x86_emulate.c | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 75af9534c786..39c4eddfc50c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d316911632acb8ba8cb7c1dd318ba723c9f1d50 +refs/heads/master: f6eed39135c03d39ff4095b1ddd947672469dfee diff --git a/trunk/drivers/kvm/x86_emulate.c b/trunk/drivers/kvm/x86_emulate.c index 4fc2da6aae7d..9f1772fd7480 100644 --- a/trunk/drivers/kvm/x86_emulate.c +++ b/trunk/drivers/kvm/x86_emulate.c @@ -150,7 +150,7 @@ static u8 opcode_table[256] = { /* 0xE0 - 0xE7 */ 0, 0, 0, 0, 0, 0, 0, 0, /* 0xE8 - 0xEF */ - 0, SrcImm|ImplicitOps, 0, SrcImmByte|ImplicitOps, 0, 0, 0, 0, + ImplicitOps, SrcImm|ImplicitOps, 0, SrcImmByte|ImplicitOps, 0, 0, 0, 0, /* 0xF0 - 0xF7 */ 0, 0, 0, 0, ImplicitOps, 0, @@ -1033,6 +1033,26 @@ x86_emulate_memop(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) case 0xd2 ... 0xd3: /* Grp2 */ src.val = _regs[VCPU_REGS_RCX]; goto grp2; + case 0xe8: /* call (near) */ { + long int rel; + switch (op_bytes) { + case 2: + rel = insn_fetch(s16, 2, _eip); + break; + case 4: + rel = insn_fetch(s32, 4, _eip); + break; + case 8: + rel = insn_fetch(s64, 8, _eip); + break; + default: + DPRINTF("Call: Invalid op_bytes\n"); + goto cannot_emulate; + } + src.val = (unsigned long) _eip; + JMP_REL(rel); + goto push; + } case 0xe9: /* jmp rel */ case 0xeb: /* jmp rel short */ JMP_REL(src.val);