KVM: x86 emulator: unify four switch statements into two

Unify the special instruction switch with the regular instruction switch,
and the two byte special instruction switch with the regular two byte
instruction switch.  That makes it much easier to find an instruction or
the place an instruction needs to be added in.

Signed-off-by: Avi Kivity <avi@qumranet.com>

1 files changed, 168 insertions, 174 deletions

diff --git a/drivers/kvm/x86_emulate.c b/drivers/kvm/x86_emulate.c
index 499d1ad42bc4..3e3eba70d5ac 100644
--- a/drivers/kvm/x86_emulate.c
+++ b/drivers/kvm/x86_emulate.c
@@ -1294,6 +1294,8 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
         }
         c->dst.orig_val = c->dst.val;
 
+special_insn:
+
         if (c->twobyte)
                 goto twobyte_insn;
 
@@ -1378,6 +1380,52 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
                         goto cannot_emulate;
                 c->dst.val = (s32) c->src.val;
                 break;
+        case 0x6a: /* push imm8 */
+                c->src.val = 0L;
+                c->src.val = insn_fetch(s8, 1, c->eip);
+                emulate_push(ctxt);
+                break;
+        case 0x6c:              /* insb */
+        case 0x6d:              /* insw/insd */
+                 if (kvm_emulate_pio_string(ctxt->vcpu, NULL,
+                                1,
+                                (c->d & ByteOp) ? 1 : c->op_bytes,
+                                c->rep_prefix ?
+                                address_mask(c->regs[VCPU_REGS_RCX]) : 1,
+                                (ctxt->eflags & EFLG_DF),
+                                register_address(ctxt->es_base,
+                                                 c->regs[VCPU_REGS_RDI]),
+                                c->rep_prefix,
+                                c->regs[VCPU_REGS_RDX]) == 0) {
+                        c->eip = saved_eip;
+                        return -1;
+                }
+                return 0;
+        case 0x6e:              /* outsb */
+        case 0x6f:              /* outsw/outsd */
+                if (kvm_emulate_pio_string(ctxt->vcpu, NULL,
+                                0,
+                                (c->d & ByteOp) ? 1 : c->op_bytes,
+                                c->rep_prefix ?
+                                address_mask(c->regs[VCPU_REGS_RCX]) : 1,
+                                (ctxt->eflags & EFLG_DF),
+                                register_address(c->override_base ?
+                                                        *c->override_base :
+                                                        ctxt->ds_base,
+                                                 c->regs[VCPU_REGS_RSI]),
+                                c->rep_prefix,
+                                c->regs[VCPU_REGS_RDX]) == 0) {
+                        c->eip = saved_eip;
+                        return -1;
+                }
+                return 0;
+        case 0x70 ... 0x7f: /* jcc (short) */ {
+                int rel = insn_fetch(s8, 1, c->eip);
+
+                if (test_cc(c->b, ctxt->eflags))
+                        JMP_REL(rel);
+                break;
+        }
         case 0x80 ... 0x83:     /* Grp1 */
                 switch (c->modrm_reg) {
                 case 0:
@@ -1434,106 +1482,6 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
                 if (rc != 0)
                         goto done;
                 break;
-        case 0xa0 ... 0xa1:     /* mov */
-                c->dst.ptr = (unsigned long *)&c->regs[VCPU_REGS_RAX];
-                c->dst.val = c->src.val;
-                break;
-        case 0xa2 ... 0xa3:     /* mov */
-                c->dst.val = (unsigned long)c->regs[VCPU_REGS_RAX];
-                break;
-        case 0xc0 ... 0xc1:
-                emulate_grp2(ctxt);
-                break;
-        case 0xc6 ... 0xc7:     /* mov (sole member of Grp11) */
-        mov:
-                c->dst.val = c->src.val;
-                break;
-        case 0xd0 ... 0xd1:     /* Grp2 */
-                c->src.val = 1;
-                emulate_grp2(ctxt);
-                break;
-        case 0xd2 ... 0xd3:     /* Grp2 */
-                c->src.val = c->regs[VCPU_REGS_RCX];
-                emulate_grp2(ctxt);
-                break;
-        case 0xf6 ... 0xf7:     /* Grp3 */
-                rc = emulate_grp3(ctxt, ops);
-                if (rc != 0)
-                        goto done;
-                break;
-        case 0xfe ... 0xff:     /* Grp4/Grp5 */
-                rc = emulate_grp45(ctxt, ops);
-                if (rc != 0)
-                        goto done;
-                break;
-        }
-
-writeback:
-        rc = writeback(ctxt, ops);
-        if (rc != 0)
-                goto done;
-
-        /* Commit shadow register state. */
-        memcpy(ctxt->vcpu->regs, c->regs, sizeof c->regs);
-        ctxt->vcpu->rip = c->eip;
-
-done:
-        if (rc == X86EMUL_UNHANDLEABLE) {
-                c->eip = saved_eip;
-                return -1;
-        }
-        return 0;
-
-special_insn:
-        if (c->twobyte)
-                goto twobyte_special_insn;
-        switch (c->b) {
-        case 0x6a: /* push imm8 */
-                c->src.val = 0L;
-                c->src.val = insn_fetch(s8, 1, c->eip);
-                emulate_push(ctxt);
-                break;
-        case 0x6c:              /* insb */
-        case 0x6d:              /* insw/insd */
-                 if (kvm_emulate_pio_string(ctxt->vcpu, NULL,
-                                1,
-                                (c->d & ByteOp) ? 1 : c->op_bytes,
-                                c->rep_prefix ?
-                                address_mask(c->regs[VCPU_REGS_RCX]) : 1,
-                                (ctxt->eflags & EFLG_DF),
-                                register_address(ctxt->es_base,
-                                                 c->regs[VCPU_REGS_RDI]),
-                                c->rep_prefix,
-                                c->regs[VCPU_REGS_RDX]) == 0) {
-                        c->eip = saved_eip;
-                        return -1;
-                }
-                return 0;
-        case 0x6e:              /* outsb */
-        case 0x6f:              /* outsw/outsd */
-                if (kvm_emulate_pio_string(ctxt->vcpu, NULL,
-                                0,
-                                (c->d & ByteOp) ? 1 : c->op_bytes,
-                                c->rep_prefix ?
-                                address_mask(c->regs[VCPU_REGS_RCX]) : 1,
-                                (ctxt->eflags & EFLG_DF),
-                                register_address(c->override_base ?
-                                                        *c->override_base :
-                                                        ctxt->ds_base,
-                                                 c->regs[VCPU_REGS_RSI]),
-                                c->rep_prefix,
-                                c->regs[VCPU_REGS_RDX]) == 0) {
-                        c->eip = saved_eip;
-                        return -1;
-                }
-                return 0;
-        case 0x70 ... 0x7f: /* jcc (short) */ {
-                int rel = insn_fetch(s8, 1, c->eip);
-
-                if (test_cc(c->b, ctxt->eflags))
-                JMP_REL(rel);
-                break;
-        }
         case 0x9c: /* pushf */
                 c->src.val =  (unsigned long) ctxt->eflags;
                 emulate_push(ctxt);
@@ -1541,6 +1489,13 @@ special_insn:
         case 0x9d: /* popf */
                 c->dst.ptr = (unsigned long *) &ctxt->eflags;
                 goto pop_instruction;
+        case 0xa0 ... 0xa1:     /* mov */
+                c->dst.ptr = (unsigned long *)&c->regs[VCPU_REGS_RAX];
+                c->dst.val = c->src.val;
+                break;
+        case 0xa2 ... 0xa3:     /* mov */
+                c->dst.val = (unsigned long)c->regs[VCPU_REGS_RAX];
+                break;