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

Commit a6a3034c authored by Mohammed Gamal's avatar Mohammed Gamal Committed by Avi Kivity
Browse files

KVM: x86 emulator: Add in/out instructions (opcodes 0xe4-0xe7, 0xec-0xef) 



The patch adds in/out instructions to the x86 emulator.

The instruction was encountered while running the BIOS while using
the invalid guest state emulation patch.

Signed-off-by: default avatarMohammed Gamal <m.gamal005@gmail.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent fa89a817

arch/x86/kvm/x86_emulate.c

+33 −2
Original line number Original line Diff line number Diff line
@@ -177,11 +177,14 @@ static u16 opcode_table[256] = { 
	/* 0xD8 - 0xDF */

	/* 0xD8 - 0xDF */

	0, 0, 0, 0, 0, 0, 0, 0,

	0, 0, 0, 0, 0, 0, 0, 0,

	/* 0xE0 - 0xE7 */

	/* 0xE0 - 0xE7 */

	0, 0, 0, 0, 0, 0, 0, 0,

	0, 0, 0, 0,

	SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,

	SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,

	/* 0xE8 - 0xEF */

	/* 0xE8 - 0xEF */

	ImplicitOps | Stack, SrcImm | ImplicitOps,

	ImplicitOps | Stack, SrcImm | ImplicitOps,

	ImplicitOps, SrcImmByte | ImplicitOps,

	ImplicitOps, SrcImmByte | ImplicitOps,

	0, 0, 0, 0,

	SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,

	SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,

	/* 0xF0 - 0xF7 */

	/* 0xF0 - 0xF7 */

	0, 0, 0, 0,

	0, 0, 0, 0,

	ImplicitOps, ImplicitOps, Group | Group3_Byte, Group | Group3,

	ImplicitOps, ImplicitOps, Group | Group3_Byte, Group | Group3,
@@ -1259,6 +1262,8 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
	u64 msr_data;

	u64 msr_data;

	unsigned long saved_eip = 0;

	unsigned long saved_eip = 0;

	struct decode_cache *c = &ctxt->decode;

	struct decode_cache *c = &ctxt->decode;

	unsigned int port;

	int io_dir_in;

	int rc = 0;

	int rc = 0;





	/* Shadow copy of register state. Committed on successful emulation.

	/* Shadow copy of register state. Committed on successful emulation.
@@ -1687,6 +1692,16 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
		c->src.val = c->regs[VCPU_REGS_RCX];

		c->src.val = c->regs[VCPU_REGS_RCX];

		emulate_grp2(ctxt);

		emulate_grp2(ctxt);

		break;

		break;

	case 0xe4: 	/* inb */

	case 0xe5: 	/* in */

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

		io_dir_in = 1;

		goto do_io;

	case 0xe6: /* outb */

	case 0xe7: /* out */

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

		io_dir_in = 0;

		goto do_io;

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

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

		long int rel;

		long int rel;

		switch (c->op_bytes) {

		switch (c->op_bytes) {
@@ -1737,6 +1752,22 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
		jmp_rel(c, c->src.val);

		jmp_rel(c, c->src.val);

		c->dst.type = OP_NONE; /* Disable writeback. */

		c->dst.type = OP_NONE; /* Disable writeback. */

		break;

		break;

	case 0xec: /* in al,dx */

	case 0xed: /* in (e/r)ax,dx */

		port = c->regs[VCPU_REGS_RDX];

		io_dir_in = 1;

		goto do_io;

	case 0xee: /* out al,dx */

	case 0xef: /* out (e/r)ax,dx */

		port = c->regs[VCPU_REGS_RDX];

		io_dir_in = 0;

	do_io:	if (kvm_emulate_pio(ctxt->vcpu, NULL, io_dir_in,

				   (c->d & ByteOp) ? 1 : c->op_bytes,

				   port) != 0) {

			c->eip = saved_eip;

			goto cannot_emulate;

		}

		return 0;

	case 0xf4:              /* hlt */

	case 0xf4:              /* hlt */

		ctxt->vcpu->arch.halt_request = 1;

		ctxt->vcpu->arch.halt_request = 1;

		break;

		break;