lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: x86 emulator: convert group 7 to new style

Browse Source 
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:45 +03:00
parent b67f9f0741
commit 2f3a9bc9eb
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
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, Group7, Group8, Group9, NoGrp, Group8, Group9,
}; };
struct opcode { struct opcode {
@@ -152,11 +152,17 @@ static struct opcode group5[] = {
D(SrcMem | ModRM | Stack), N, D(SrcMem | ModRM | Stack), N,
}; };
static struct opcode group_table[] = { static struct group_dual group7 = { {
[Group7*8] =
N, N, D(ModRM | SrcMem | Priv), D(ModRM | SrcMem | Priv), N, N, D(ModRM | SrcMem | Priv), D(ModRM | SrcMem | Priv),
D(SrcNone | ModRM | DstMem | Mov), N, D(SrcNone | ModRM | DstMem | Mov), N,
D(SrcMem16 | ModRM | Mov | Priv), D(SrcMem | ModRM | ByteOp | Priv), D(SrcMem16 | ModRM | Mov | Priv), D(SrcMem | ModRM | ByteOp | Priv),
}, {
D(SrcNone | ModRM | Priv), N, N, D(SrcNone | ModRM | Priv),
D(SrcNone | ModRM | DstMem | Mov), N,
D(SrcMem16 | ModRM | Mov | Priv), N,
} };
static struct opcode group_table[] = {
[Group8*8] = [Group8*8] =
N, N, N, N, N, N, N, N,
D(DstMem | SrcImmByte | ModRM), D(DstMem | SrcImmByte | ModRM | Lock), D(DstMem | SrcImmByte | ModRM), D(DstMem | SrcImmByte | ModRM | Lock),
@@ -166,10 +172,6 @@ static struct opcode group_table[] = {
}; };
static struct opcode group2_table[] = { static struct opcode group2_table[] = {
[Group7*8] =
D(SrcNone | ModRM | Priv), N, N, D(SrcNone | ModRM | Priv),
D(SrcNone | ModRM | DstMem | Mov), N,
D(SrcMem16 | ModRM | Mov | Priv), N,
[Group9*8] = [Group9*8] =
N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, N,
}; };
@@ -290,7 +292,7 @@ static struct opcode opcode_table[256] = {
static struct opcode twobyte_table[256] = { static struct opcode twobyte_table[256] = {
/* 0x00 - 0x0F */ /* 0x00 - 0x0F */
N, D(Group | GroupDual | Group7), N, N, N, GD(0, &group7), N, N,
N, D(ImplicitOps), D(ImplicitOps | Priv), N, N, D(ImplicitOps), D(ImplicitOps | Priv), N,
D(ImplicitOps | Priv), D(ImplicitOps | Priv), N, N, D(ImplicitOps | Priv), D(ImplicitOps | Priv), N, N,
N, D(ImplicitOps | ModRM), N, N, N, D(ImplicitOps | ModRM), N, N,