Commit 7d5993d6 authored Jun 17, 2010 by Wei Yongjun Committed by Avi Kivity Aug 01, 2010

KVM: x86 emulator: fix group3 instruction decoding



Group 3 instruction with ModRM reg field as 001 is
defined as test instruction under AMD arch, and
emulate_grp3() is ready for emulate it, so fix the
decoding.

static inline int emulate_grp3(...)
{
	...
	switch (c->modrm_reg) {
	case 0 ... 1:   /* test */
		emulate_2op_SrcV("test", c->src, c->dst, ctxt->eflags);
	...
}

Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

parent 6045be5d

arch/x86/kvm/emulate.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -336,11 +336,11 @@ static u32 group_table[] = {
		[Group1A*8] =
		DstMem \| SrcNone \| ModRM \| Mov \| Stack, 0, 0, 0, 0, 0, 0, 0,
		[Group3_Byte*8] =
		ByteOp \| SrcImm \| DstMem \| ModRM, 0,
		ByteOp \| SrcImm \| DstMem \| ModRM, ByteOp \| SrcImm \| DstMem \| ModRM,
		ByteOp \| DstMem \| SrcNone \| ModRM, ByteOp \| DstMem \| SrcNone \| ModRM,
		0, 0, 0, 0,
		[Group3*8] =
		DstMem \| SrcImm \| ModRM, 0,
		DstMem \| SrcImm \| ModRM, DstMem \| SrcImm \| ModRM,
		DstMem \| SrcNone \| ModRM, DstMem \| SrcNone \| ModRM,
		0, 0, 0, 0,
		[Group4*8] =