|
@@ -2482,6 +2482,15 @@ static int em_das(struct x86_emulate_ctxt *ctxt)
|
|
|
return X86EMUL_CONTINUE;
|
|
|
}
|
|
|
|
|
|
+static int em_call(struct x86_emulate_ctxt *ctxt)
|
|
|
+{
|
|
|
+ long rel = ctxt->src.val;
|
|
|
+
|
|
|
+ ctxt->src.val = (unsigned long)ctxt->_eip;
|
|
|
+ jmp_rel(ctxt, rel);
|
|
|
+ return em_push(ctxt);
|
|
|
+}
|
|
|
+
|
|
|
static int em_call_far(struct x86_emulate_ctxt *ctxt)
|
|
|
{
|
|
|
u16 sel, old_cs;
|
|
@@ -3269,7 +3278,7 @@ static struct opcode opcode_table[256] = {
|
|
|
I2bvIP(SrcImmUByte | DstAcc, em_in, in, check_perm_in),
|
|
|
I2bvIP(SrcAcc | DstImmUByte, em_out, out, check_perm_out),
|
|
|
/* 0xE8 - 0xEF */
|
|
|
- D(SrcImm | Stack), D(SrcImm | ImplicitOps),
|
|
|
+ I(SrcImm | Stack, em_call), D(SrcImm | ImplicitOps),
|
|
|
I(SrcImmFAddr | No64, em_jmp_far), D(SrcImmByte | ImplicitOps),
|
|
|
I2bvIP(SrcDX | DstAcc, em_in, in, check_perm_in),
|
|
|
I2bvIP(SrcAcc | DstDX, em_out, out, check_perm_out),
|
|
@@ -3967,13 +3976,6 @@ special_insn:
|
|
|
ctxt->src.val = ctxt->regs[VCPU_REGS_RCX];
|
|
|
rc = em_grp2(ctxt);
|
|
|
break;
|
|
|
- case 0xe8: /* call (near) */ {
|
|
|
- long int rel = ctxt->src.val;
|
|
|
- ctxt->src.val = (unsigned long) ctxt->_eip;
|
|
|
- jmp_rel(ctxt, rel);
|
|
|
- rc = em_push(ctxt);
|
|
|
- break;
|
|
|
- }
|
|
|
case 0xe9: /* jmp rel */
|
|
|
case 0xeb: /* jmp rel short */
|
|
|
jmp_rel(ctxt, ctxt->src.val);
|