openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

KVM: x86 emulator: convert group 4 to new style 

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Avi Kivity 2010-07-29 15:11:43 +03:00
parent ee70ea30ee
commit 591c9d20a3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86/kvm/emulate.c
View File

@ -105,7 +105,7 @@
#define X16(x) X8(x), X8(x) #define X16(x) X8(x), X8(x)
enum { enum {
NoGrp, Group4, Group5, Group7, Group8, Group9, NoGrp, Group5, Group7, Group8, Group9,
}; };
struct opcode { struct opcode {
@ -140,10 +140,12 @@ static struct opcode group3[] = {
X4(D(Undefined)), X4(D(Undefined)),
}; };
static struct opcode group_table[] = { static struct opcode group4[] = {
[Group4*8] =
D(ByteOp | DstMem | SrcNone | ModRM | Lock), D(ByteOp | DstMem | SrcNone | ModRM | Lock), D(ByteOp | DstMem | SrcNone | ModRM | Lock), D(ByteOp | DstMem | SrcNone | ModRM | Lock),
N, N, N, N, N, N, N, N, N, N, N, N,
};
static struct opcode group_table[] = {
[Group5*8] = [Group5*8] =
D(DstMem | SrcNone | ModRM | Lock), D(DstMem | SrcNone | ModRM | Lock), D(DstMem | SrcNone | ModRM | Lock), D(DstMem | SrcNone | ModRM | Lock),
D(SrcMem | ModRM | Stack), N, D(SrcMem | ModRM | Stack), N,
@ -281,7 +283,7 @@ static struct opcode opcode_table[256] = {
D(ImplicitOps | Priv), D(ImplicitOps), G(ByteOp, group3), G(0, group3), D(ImplicitOps | Priv), D(ImplicitOps), G(ByteOp, group3), G(0, group3),
/* 0xF8 - 0xFF */ /* 0xF8 - 0xFF */
D(ImplicitOps), N, D(ImplicitOps), D(ImplicitOps), D(ImplicitOps), N, D(ImplicitOps), D(ImplicitOps),
D(ImplicitOps), D(ImplicitOps), D(Group | Group4), D(Group | Group5), D(ImplicitOps), D(ImplicitOps), G(0, group4), D(Group | Group5),
}; };
static struct opcode twobyte_table[256] = { static struct opcode twobyte_table[256] = {