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

KVM: x86 emulator: Use opcode::execute for Group 1A instruction 



Group 1A: 8F

Register em_pop() directly and remove em_grp1a().

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

arch/x86/kvm/emulate.c

+1 −9
Original line number Original line Diff line number Diff line
@@ -1675,11 +1675,6 @@ static int em_jmp_far(struct x86_emulate_ctxt *ctxt) 
	return X86EMUL_CONTINUE;

	return X86EMUL_CONTINUE;

}

}





static int em_grp1a(struct x86_emulate_ctxt *ctxt)

{

	return emulate_pop(ctxt, &ctxt->dst.val, ctxt->dst.bytes);

}



static int em_grp2(struct x86_emulate_ctxt *ctxt)

static int em_grp2(struct x86_emulate_ctxt *ctxt)

{

{

	switch (ctxt->modrm_reg) {

	switch (ctxt->modrm_reg) {
@@ -3203,7 +3198,7 @@ static struct opcode group1[] = { 
};

};





static struct opcode group1A[] = {

static struct opcode group1A[] = {

	D(DstMem | SrcNone | ModRM | Mov | Stack), N, N, N, N, N, N, N,

	I(DstMem | SrcNone | ModRM | Mov | Stack, em_pop), N, N, N, N, N, N, N,

};

};





static struct opcode group3[] = {

static struct opcode group3[] = {
@@ -4031,9 +4026,6 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt) 
	case 0x8d: /* lea r16/r32, m */

	case 0x8d: /* lea r16/r32, m */

		ctxt->dst.val = ctxt->src.addr.mem.ea;

		ctxt->dst.val = ctxt->src.addr.mem.ea;

		break;

		break;

	case 0x8f:		/* pop (sole member of Grp1a) */

		rc = em_grp1a(ctxt);

		break;

	case 0x90 ... 0x97: /* nop / xchg reg, rax */

	case 0x90 ... 0x97: /* nop / xchg reg, rax */

		if (ctxt->dst.addr.reg == &ctxt->regs[VCPU_REGS_RAX])

		if (ctxt->dst.addr.reg == &ctxt->regs[VCPU_REGS_RAX])

			break;

			break;