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

Commit 1a52e051 authored by Nitin A Kamble's avatar Nitin A Kamble Committed by Avi Kivity
Browse files

KVM: x86 emulator: fix merge screwup due to emulator split 



This code has gone to wrong place in the file. Moving it back to
right location.

Signed-off-by: default avatarNitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 55b70a03

drivers/kvm/x86_emulate.c

+26 −25
Original line number Diff line number Diff line
@@ -1083,31 +1083,6 @@ 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);

		no_wb = 1; /* Disable writeback. */

		break;

	case 0xf6 ... 0xf7:	/* Grp3 */

		switch (modrm_reg) {

		case 0 ... 1:	/* test */
@@ -1350,6 +1325,32 @@ x86_emulate_memop(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
	case 0xae ... 0xaf:	/* scas */

		DPRINTF("Urk! I don't handle SCAS.\n");

		goto cannot_emulate;

	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);

		no_wb = 1; /* Disable writeback. */

		break;





	}

	goto writeback;