Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d53c4777 authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity
Browse files

KVM: x86 emulator: Complete decoding of call near in decode stage 



Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent b2833e3c

arch/x86/kvm/x86_emulate.c

+2 −13
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static u32 opcode_table[256] = { 
	SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,

	SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,

	/* 0xE8 - 0xEF */

	ImplicitOps | Stack, SrcImm | ImplicitOps,

	SrcImm | Stack, SrcImm | ImplicitOps,

	SrcImm | Src2Imm16, SrcImmByte | ImplicitOps,

	SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,

	SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,
@@ -1781,18 +1781,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
		io_dir_in = 0;

		goto do_io;

	case 0xe8: /* call (near) */ {

		long int rel;

		switch (c->op_bytes) {

		case 2:

			rel = insn_fetch(s16, 2, c->eip);

			break;

		case 4:

			rel = insn_fetch(s32, 4, c->eip);

			break;

		default:

			DPRINTF("Call: Invalid op_bytes\n");

			goto cannot_emulate;

		}

		long int rel = c->src.val;

		c->src.val = (unsigned long) c->eip;

		jmp_rel(c, rel);

		emulate_push(ctxt);