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

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

KVM: x86 emulator: Completely decode in/out at decoding stage 



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

arch/x86/kvm/x86_emulate.c

+4 −4
Original line number Diff line number Diff line
@@ -190,8 +190,8 @@ static u32 opcode_table[256] = { 
	0, 0, 0, 0, 0, 0, 0, 0,

	/* 0xE0 - 0xE7 */

	0, 0, 0, 0,

	SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,

	SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,

	ByteOp | SrcImmUByte, SrcImmUByte,

	ByteOp | SrcImmUByte, SrcImmUByte,

	/* 0xE8 - 0xEF */

	SrcImm | Stack, SrcImm | ImplicitOps,

	SrcImm | Src2Imm16, SrcImmByte | ImplicitOps,
@@ -1777,12 +1777,12 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
		break;

	case 0xe4: 	/* inb */

	case 0xe5: 	/* in */

		port = insn_fetch(u8, 1, c->eip);

		port = c->src.val;

		io_dir_in = 1;

		goto do_io;

	case 0xe6: /* outb */

	case 0xe7: /* out */

		port = insn_fetch(u8, 1, c->eip);

		port = c->src.val;

		io_dir_in = 0;

		goto do_io;

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