KVM: x86 emulator: consolidate Jcc rel8 decoding

Signed-off-by: Avi Kivity <[email protected]>
Signed-off-by: Marcelo Tosatti <[email protected]>

diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 68e5b73d22ab73dd29a104a1b3bf5a3a7480b503..78708211f18b873959ff4a1ac785fc8f78ff6b36 100644 (file)
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -161,12 +161,8 @@ static u32 opcode_table[256] = {
        SrcImm | Mov | Stack, 0, SrcImmByte | Mov | Stack, 0,
        DstDI | ByteOp | Mov | String, DstDI | Mov | String, /* insb, insw/insd */
        SrcSI | ByteOp | ImplicitOps | String, SrcSI | ImplicitOps | String, /* outsb, outsw/outsd */
-       /* 0x70 - 0x77 */
-       SrcImmByte, SrcImmByte, SrcImmByte, SrcImmByte,
-       SrcImmByte, SrcImmByte, SrcImmByte, SrcImmByte,
-       /* 0x78 - 0x7F */
-       SrcImmByte, SrcImmByte, SrcImmByte, SrcImmByte,
-       SrcImmByte, SrcImmByte, SrcImmByte, SrcImmByte,
+       /* 0x70 - 0x7F */
+       X16(SrcImmByte),
        /* 0x80 - 0x87 */
        Group | Group1_80, Group | Group1_81,
        Group | Group1_82, Group | Group1_83,