Commit 60a29d4e authored by Gleb Natapov's avatar Gleb Natapov Committed by Marcelo Tosatti

KVM: x86 emulator: Add group9 instruction decoding

Use groups mechanism to decode 0F C7 instructions.
Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Cc: stable@kernel.org
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 2db2c2eb
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
enum { enum {
Group1_80, Group1_81, Group1_82, Group1_83, Group1_80, Group1_81, Group1_82, Group1_83,
Group1A, Group3_Byte, Group3, Group4, Group5, Group7, Group1A, Group3_Byte, Group3, Group4, Group5, Group7,
Group8, Group8, Group9,
}; };
static u32 opcode_table[256] = { static u32 opcode_table[256] = {
...@@ -272,7 +272,8 @@ static u32 twobyte_table[256] = { ...@@ -272,7 +272,8 @@ static u32 twobyte_table[256] = {
0, 0, ByteOp | DstReg | SrcMem | ModRM | Mov, 0, 0, ByteOp | DstReg | SrcMem | ModRM | Mov,
DstReg | SrcMem16 | ModRM | Mov, DstReg | SrcMem16 | ModRM | Mov,
/* 0xC0 - 0xCF */ /* 0xC0 - 0xCF */
0, 0, 0, DstMem | SrcReg | ModRM | Mov, 0, 0, 0, ImplicitOps | ModRM, 0, 0, 0, DstMem | SrcReg | ModRM | Mov,
0, 0, 0, Group | GroupDual | Group9,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/* 0xD0 - 0xDF */ /* 0xD0 - 0xDF */
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
...@@ -328,6 +329,8 @@ static u32 group_table[] = { ...@@ -328,6 +329,8 @@ static u32 group_table[] = {
0, 0, 0, 0, 0, 0, 0, 0,
DstMem | SrcImmByte | ModRM, DstMem | SrcImmByte | ModRM, DstMem | SrcImmByte | ModRM, DstMem | SrcImmByte | ModRM,
DstMem | SrcImmByte | ModRM, DstMem | SrcImmByte | ModRM, DstMem | SrcImmByte | ModRM, DstMem | SrcImmByte | ModRM,
[Group9*8] =
0, ImplicitOps | ModRM, 0, 0, 0, 0, 0, 0,
}; };
static u32 group2_table[] = { static u32 group2_table[] = {
...@@ -335,6 +338,8 @@ static u32 group2_table[] = { ...@@ -335,6 +338,8 @@ static u32 group2_table[] = {
SrcNone | ModRM, 0, 0, SrcNone | ModRM, SrcNone | ModRM, 0, 0, SrcNone | ModRM,
SrcNone | ModRM | DstMem | Mov, 0, SrcNone | ModRM | DstMem | Mov, 0,
SrcMem16 | ModRM | Mov, 0, SrcMem16 | ModRM | Mov, 0,
[Group9*8] =
0, 0, 0, 0, 0, 0, 0, 0,
}; };
/* EFLAGS bit definitions. */ /* EFLAGS bit definitions. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment