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

Commit c54fe504 authored by Takuya Yoshikawa's avatar Takuya Yoshikawa Committed by Avi Kivity
Browse files

KVM: x86 emulator: Use opcode::execute for POP reg (58-5F) 



In addition, the RET emulation is changed to call em_pop() to remove
the pop_instruction label.

Signed-off-by: default avatarTakuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent d67fc27a

arch/x86/kvm/emulate.c

+10 −6
Original line number Original line Diff line number Diff line
@@ -1400,6 +1400,13 @@ static int emulate_pop(struct x86_emulate_ctxt *ctxt, 
	return rc;

	return rc;

}

}





static int em_pop(struct x86_emulate_ctxt *ctxt)

{

	struct decode_cache *c = &ctxt->decode;



	return emulate_pop(ctxt, ctxt->ops, &c->dst.val, c->op_bytes);

}



static int emulate_popf(struct x86_emulate_ctxt *ctxt,

static int emulate_popf(struct x86_emulate_ctxt *ctxt,

		       struct x86_emulate_ops *ops,

		       struct x86_emulate_ops *ops,

		       void *dest, int len)

		       void *dest, int len)
@@ -3089,7 +3096,7 @@ static struct opcode opcode_table[256] = { 
	/* 0x50 - 0x57 */

	/* 0x50 - 0x57 */

	X8(I(SrcReg | Stack, em_push)),

	X8(I(SrcReg | Stack, em_push)),

	/* 0x58 - 0x5F */

	/* 0x58 - 0x5F */

	X8(D(DstReg | Stack)),

	X8(I(DstReg | Stack, em_pop)),

	/* 0x60 - 0x67 */

	/* 0x60 - 0x67 */

	D(ImplicitOps | Stack | No64), D(ImplicitOps | Stack | No64),

	D(ImplicitOps | Stack | No64), D(ImplicitOps | Stack | No64),

	N, D(DstReg | SrcMem32 | ModRM | Mov) /* movsxd (x86/64) */ ,

	N, D(DstReg | SrcMem32 | ModRM | Mov) /* movsxd (x86/64) */ ,
@@ -3816,10 +3823,6 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt) 
	case 0x48 ... 0x4f: /* dec r16/r32 */

	case 0x48 ... 0x4f: /* dec r16/r32 */

		emulate_1op("dec", c->dst, ctxt->eflags);

		emulate_1op("dec", c->dst, ctxt->eflags);

		break;

		break;

	case 0x58 ... 0x5f: /* pop reg */

	pop_instruction:

		rc = emulate_pop(ctxt, ops, &c->dst.val, c->op_bytes);

		break;

	case 0x60:	/* pusha */

	case 0x60:	/* pusha */

		rc = emulate_pusha(ctxt);

		rc = emulate_pusha(ctxt);

		break;

		break;
@@ -3922,7 +3925,8 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt) 
		c->dst.type = OP_REG;

		c->dst.type = OP_REG;

		c->dst.addr.reg = &c->eip;

		c->dst.addr.reg = &c->eip;

		c->dst.bytes = c->op_bytes;

		c->dst.bytes = c->op_bytes;

		goto pop_instruction;

		rc = em_pop(ctxt);

		break;

	case 0xc4:		/* les */

	case 0xc4:		/* les */

		rc = emulate_load_segment(ctxt, ops, VCPU_SREG_ES);

		rc = emulate_load_segment(ctxt, ops, VCPU_SREG_ES);

		break;

		break;