KVM: x86 emulator: fix negative bit offset BitOp instruction emulation
[pandora-kernel.git] / arch / x86 / kvm / emulate.c
index 9674d97..5fc441c 100644 (file)
  */
 
 /* Operand sizes: 8-bit operands or specified/overridden size. */
-#define ByteOp      (1<<16)    /* 8-bit operands. */
+#define ByteOp      (1<<0)     /* 8-bit operands. */
 /* Destination operand type. */
-#define ImplicitOps (1<<17)    /* Implicit in opcode. No generic decode. */
-#define DstReg      (2<<17)    /* Register operand. */
-#define DstMem      (3<<17)    /* Memory operand. */
-#define DstAcc      (4<<17)    /* Destination Accumulator */
-#define DstDI       (5<<17)    /* Destination is in ES:(E)DI */
-#define DstMem64    (6<<17)    /* 64bit memory operand */
-#define DstMask     (7<<17)
+#define ImplicitOps (1<<1    /* Implicit in opcode. No generic decode. */
+#define DstReg      (2<<1    /* Register operand. */
+#define DstMem      (3<<1    /* Memory operand. */
+#define DstAcc      (4<<1    /* Destination Accumulator */
+#define DstDI       (5<<1    /* Destination is in ES:(E)DI */
+#define DstMem64    (6<<1    /* 64bit memory operand */
+#define DstMask     (7<<1)
 /* Source operand type. */
 #define SrcNone     (0<<4)     /* No source operand. */
 #define SrcImplicit (0<<4)     /* Source operand is implicit in the opcode. */
@@ -82,8 +82,9 @@
 #define Stack       (1<<13)     /* Stack instruction (push/pop) */
 #define Group       (1<<14)     /* Bits 3:5 of modrm byte extend opcode */
 #define GroupDual   (1<<15)     /* Alternate decoding of mod == 3 */
-#define GroupMask   0x0f        /* Group number stored in bits 0:3 */
 /* Misc flags */
+#define NoAccess    (1<<23) /* Don't access memory (lea/invlpg/verr etc) */
+#define Op3264      (1<<24) /* Operand is 64b in long mode, 32b otherwise */
 #define Undefined   (1<<25) /* No Such Instruction */
 #define Lock        (1<<26) /* lock prefix is allowed for the instruction */
 #define Priv        (1<<27) /* instruction generates #GP if current CPL != 0 */
 #define Src2One     (3<<29)
 #define Src2Mask    (7<<29)
 
-#define X2(x) x, x
-#define X3(x) X2(x), x
-#define X4(x) X2(x), X2(x)
-#define X5(x) X4(x), x
-#define X6(x) X4(x), X2(x)
-#define X7(x) X4(x), X3(x)
-#define X8(x) X4(x), X4(x)
-#define X16(x) X8(x), X8(x)
-
-enum {
-       NoGrp, Group7, Group8, Group9,
-};
+#define X2(x...) x, x
+#define X3(x...) X2(x), x
+#define X4(x...) X2(x), X2(x)
+#define X5(x...) X4(x), x
+#define X6(x...) X4(x), X2(x)
+#define X7(x...) X4(x), X3(x)
+#define X8(x...) X4(x), X4(x)
+#define X16(x...) X8(x), X8(x)
 
 struct opcode {
        u32 flags;
        union {
+               int (*execute)(struct x86_emulate_ctxt *ctxt);
                struct opcode *group;
                struct group_dual *gdual;
        } u;
@@ -121,240 +119,6 @@ struct group_dual {
        struct opcode mod3[8];
 };
 
-#define D(_y) { .flags = (_y) }
-#define N    D(0)
-#define G(_f, _g) { .flags = ((_f) | Group), .u.group = (_g) }
-#define GD(_f, _g) { .flags = ((_f) | Group | GroupDual), .u.gdual = (_g) }
-
-static struct opcode group1[] = {
-       X7(D(Lock)), N
-};
-
-static struct opcode group1A[] = {
-       D(DstMem | SrcNone | ModRM | Mov | Stack), N, N, N, N, N, N, N,
-};
-
-static struct opcode group3[] = {
-       D(DstMem | SrcImm | ModRM), D(DstMem | SrcImm | ModRM),
-       D(DstMem | SrcNone | ModRM | Lock), D(DstMem | SrcNone | ModRM | Lock),
-       X4(D(Undefined)),
-};
-
-static struct opcode group4[] = {
-       D(ByteOp | DstMem | SrcNone | ModRM | Lock), D(ByteOp | DstMem | SrcNone | ModRM | Lock),
-       N, N, N, N, N, N,
-};
-
-static struct opcode group5[] = {
-       D(DstMem | SrcNone | ModRM | Lock), D(DstMem | SrcNone | ModRM | Lock),
-       D(SrcMem | ModRM | Stack), N,
-       D(SrcMem | ModRM | Stack), D(SrcMemFAddr | ModRM | ImplicitOps),
-       D(SrcMem | ModRM | Stack), N,
-};
-
-static struct opcode group_table[] = {
-       [Group7*8] =
-       N, N, D(ModRM | SrcMem | Priv), D(ModRM | SrcMem | Priv),
-       D(SrcNone | ModRM | DstMem | Mov), N,
-       D(SrcMem16 | ModRM | Mov | Priv), D(SrcMem | ModRM | ByteOp | Priv),
-       [Group8*8] =
-       N, N, N, N,
-       D(DstMem | SrcImmByte | ModRM), D(DstMem | SrcImmByte | ModRM | Lock),
-       D(DstMem | SrcImmByte | ModRM | Lock), D(DstMem | SrcImmByte | ModRM | Lock),
-       [Group9*8] =
-       N, D(DstMem64 | ModRM | Lock), N, N, N, N, N, N,
-};
-
-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] =
-       N, N, N, N, N, N, N, N,
-};
-
-static struct opcode opcode_table[256] = {
-       /* 0x00 - 0x07 */
-       D(ByteOp | DstMem | SrcReg | ModRM | Lock), D(DstMem | SrcReg | ModRM | Lock),
-       D(ByteOp | DstReg | SrcMem | ModRM), D(DstReg | SrcMem | ModRM),
-       D(ByteOp | DstAcc | SrcImm), D(DstAcc | SrcImm),
-       D(ImplicitOps | Stack | No64), D(ImplicitOps | Stack | No64),
-       /* 0x08 - 0x0F */
-       D(ByteOp | DstMem | SrcReg | ModRM | Lock), D(DstMem | SrcReg | ModRM | Lock),
-       D(ByteOp | DstReg | SrcMem | ModRM), D(DstReg | SrcMem | ModRM),
-       D(ByteOp | DstAcc | SrcImm), D(DstAcc | SrcImm),
-       D(ImplicitOps | Stack | No64), N,
-       /* 0x10 - 0x17 */
-       D(ByteOp | DstMem | SrcReg | ModRM | Lock), D(DstMem | SrcReg | ModRM | Lock),
-       D(ByteOp | DstReg | SrcMem | ModRM), D(DstReg | SrcMem | ModRM),
-       D(ByteOp | DstAcc | SrcImm), D(DstAcc | SrcImm),
-       D(ImplicitOps | Stack | No64), D(ImplicitOps | Stack | No64),
-       /* 0x18 - 0x1F */
-       D(ByteOp | DstMem | SrcReg | ModRM | Lock), D(DstMem | SrcReg | ModRM | Lock),
-       D(ByteOp | DstReg | SrcMem | ModRM), D(DstReg | SrcMem | ModRM),
-       D(ByteOp | DstAcc | SrcImm), D(DstAcc | SrcImm),
-       D(ImplicitOps | Stack | No64), D(ImplicitOps | Stack | No64),
-       /* 0x20 - 0x27 */
-       D(ByteOp | DstMem | SrcReg | ModRM | Lock), D(DstMem | SrcReg | ModRM | Lock),
-       D(ByteOp | DstReg | SrcMem | ModRM), D(DstReg | SrcMem | ModRM),
-       D(ByteOp | DstAcc | SrcImmByte), D(DstAcc | SrcImm), N, N,
-       /* 0x28 - 0x2F */
-       D(ByteOp | DstMem | SrcReg | ModRM | Lock), D(DstMem | SrcReg | ModRM | Lock),
-       D(ByteOp | DstReg | SrcMem | ModRM), D(DstReg | SrcMem | ModRM),
-       D(ByteOp | DstAcc | SrcImmByte), D(DstAcc | SrcImm), N, N,
-       /* 0x30 - 0x37 */
-       D(ByteOp | DstMem | SrcReg | ModRM | Lock), D(DstMem | SrcReg | ModRM | Lock),
-       D(ByteOp | DstReg | SrcMem | ModRM), D(DstReg | SrcMem | ModRM),
-       D(ByteOp | DstAcc | SrcImmByte), D(DstAcc | SrcImm), N, N,
-       /* 0x38 - 0x3F */
-       D(ByteOp | DstMem | SrcReg | ModRM), D(DstMem | SrcReg | ModRM),
-       D(ByteOp | DstReg | SrcMem | ModRM), D(DstReg | SrcMem | ModRM),
-       D(ByteOp | DstAcc | SrcImm), D(DstAcc | SrcImm),
-       N, N,
-       /* 0x40 - 0x4F */
-       X16(D(DstReg)),
-       /* 0x50 - 0x57 */
-       X8(D(SrcReg | Stack)),
-       /* 0x58 - 0x5F */
-       X8(D(DstReg | Stack)),
-       /* 0x60 - 0x67 */
-       D(ImplicitOps | Stack | No64), D(ImplicitOps | Stack | No64),
-       N, D(DstReg | SrcMem32 | ModRM | Mov) /* movsxd (x86/64) */ ,
-       N, N, N, N,
-       /* 0x68 - 0x6F */
-       D(SrcImm | Mov | Stack), N, D(SrcImmByte | Mov | Stack), N,
-       D(DstDI | ByteOp | Mov | String), D(DstDI | Mov | String), /* insb, insw/insd */
-       D(SrcSI | ByteOp | ImplicitOps | String), D(SrcSI | ImplicitOps | String), /* outsb, outsw/outsd */
-       /* 0x70 - 0x7F */
-       X16(D(SrcImmByte)),
-       /* 0x80 - 0x87 */
-       G(ByteOp | DstMem | SrcImm | ModRM | Group, group1),
-       G(DstMem | SrcImm | ModRM | Group, group1),
-       G(ByteOp | DstMem | SrcImm | ModRM | No64 | Group, group1),
-       G(DstMem | SrcImmByte | ModRM | Group, group1),
-       D(ByteOp | DstMem | SrcReg | ModRM), D(DstMem | SrcReg | ModRM),
-       D(ByteOp | DstMem | SrcReg | ModRM | Lock), D(DstMem | SrcReg | ModRM | Lock),
-       /* 0x88 - 0x8F */
-       D(ByteOp | DstMem | SrcReg | ModRM | Mov), D(DstMem | SrcReg | ModRM | Mov),
-       D(ByteOp | DstReg | SrcMem | ModRM | Mov), D(DstReg | SrcMem | ModRM | Mov),
-       D(DstMem | SrcNone | ModRM | Mov), D(ModRM | DstReg),
-       D(ImplicitOps | SrcMem16 | ModRM), G(0, group1A),
-       /* 0x90 - 0x97 */
-       D(DstReg), D(DstReg), D(DstReg), D(DstReg),     D(DstReg), D(DstReg), D(DstReg), D(DstReg),
-       /* 0x98 - 0x9F */
-       N, N, D(SrcImmFAddr | No64), N,
-       D(ImplicitOps | Stack), D(ImplicitOps | Stack), N, N,
-       /* 0xA0 - 0xA7 */
-       D(ByteOp | DstAcc | SrcMem | Mov | MemAbs), D(DstAcc | SrcMem | Mov | MemAbs),
-       D(ByteOp | DstMem | SrcAcc | Mov | MemAbs), D(DstMem | SrcAcc | Mov | MemAbs),
-       D(ByteOp | SrcSI | DstDI | Mov | String), D(SrcSI | DstDI | Mov | String),
-       D(ByteOp | SrcSI | DstDI | String), D(SrcSI | DstDI | String),
-       /* 0xA8 - 0xAF */
-       D(DstAcc | SrcImmByte | ByteOp), D(DstAcc | SrcImm), D(ByteOp | DstDI | Mov | String), D(DstDI | Mov | String),
-       D(ByteOp | SrcSI | DstAcc | Mov | String), D(SrcSI | DstAcc | Mov | String),
-       D(ByteOp | DstDI | String), D(DstDI | String),
-       /* 0xB0 - 0xB7 */
-       X8(D(ByteOp | DstReg | SrcImm | Mov)),
-       /* 0xB8 - 0xBF */
-       X8(D(DstReg | SrcImm | Mov)),
-       /* 0xC0 - 0xC7 */
-       D(ByteOp | DstMem | SrcImm | ModRM), D(DstMem | SrcImmByte | ModRM),
-       N, D(ImplicitOps | Stack), N, N,
-       D(ByteOp | DstMem | SrcImm | ModRM | Mov), D(DstMem | SrcImm | ModRM | Mov),
-       /* 0xC8 - 0xCF */
-       N, N, N, D(ImplicitOps | Stack),
-       D(ImplicitOps), D(SrcImmByte), D(ImplicitOps | No64), D(ImplicitOps),
-       /* 0xD0 - 0xD7 */
-       D(ByteOp | DstMem | SrcImplicit | ModRM), D(DstMem | SrcImplicit | ModRM),
-       D(ByteOp | DstMem | SrcImplicit | ModRM), D(DstMem | SrcImplicit | ModRM),
-       N, N, N, N,
-       /* 0xD8 - 0xDF */
-       N, N, N, N, N, N, N, N,
-       /* 0xE0 - 0xE7 */
-       N, N, N, N,
-       D(ByteOp | SrcImmUByte | DstAcc), D(SrcImmUByte | DstAcc),
-       D(ByteOp | SrcImmUByte | DstAcc), D(SrcImmUByte | DstAcc),
-       /* 0xE8 - 0xEF */
-       D(SrcImm | Stack), D(SrcImm | ImplicitOps),
-       D(SrcImmFAddr | No64), D(SrcImmByte | ImplicitOps),
-       D(SrcNone | ByteOp | DstAcc), D(SrcNone | DstAcc),
-       D(SrcNone | ByteOp | DstAcc), D(SrcNone | DstAcc),
-       /* 0xF0 - 0xF7 */
-       N, N, N, N,
-       D(ImplicitOps | Priv), D(ImplicitOps), G(ByteOp, group3), G(0, group3),
-       /* 0xF8 - 0xFF */
-       D(ImplicitOps), N, D(ImplicitOps), D(ImplicitOps),
-       D(ImplicitOps), D(ImplicitOps), G(0, group4), G(0, group5),
-};
-
-static struct opcode twobyte_table[256] = {
-       /* 0x00 - 0x0F */
-       N, D(Group | GroupDual | Group7), N, N,
-       N, D(ImplicitOps), D(ImplicitOps | Priv), N,
-       D(ImplicitOps | Priv), D(ImplicitOps | Priv), N, N,
-       N, D(ImplicitOps | ModRM), N, N,
-       /* 0x10 - 0x1F */
-       N, N, N, N, N, N, N, N, D(ImplicitOps | ModRM), N, N, N, N, N, N, N,
-       /* 0x20 - 0x2F */
-       D(ModRM | ImplicitOps | Priv), D(ModRM | Priv),
-       D(ModRM | ImplicitOps | Priv), D(ModRM | Priv),
-       N, N, N, N,
-       N, N, N, N, N, N, N, N,
-       /* 0x30 - 0x3F */
-       D(ImplicitOps | Priv), N, D(ImplicitOps | Priv), N,
-       D(ImplicitOps), D(ImplicitOps | Priv), N, N,
-       N, N, N, N, N, N, N, N,
-       /* 0x40 - 0x4F */
-       X16(D(DstReg | SrcMem | ModRM | Mov)),
-       /* 0x50 - 0x5F */
-       N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, N,
-       /* 0x60 - 0x6F */
-       N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, N,
-       /* 0x70 - 0x7F */
-       N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, N,
-       /* 0x80 - 0x8F */
-       X16(D(SrcImm)),
-       /* 0x90 - 0x9F */
-       N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, N,
-       /* 0xA0 - 0xA7 */
-       D(ImplicitOps | Stack), D(ImplicitOps | Stack),
-       N, D(DstMem | SrcReg | ModRM | BitOp),
-       D(DstMem | SrcReg | Src2ImmByte | ModRM),
-       D(DstMem | SrcReg | Src2CL | ModRM), N, N,
-       /* 0xA8 - 0xAF */
-       D(ImplicitOps | Stack), D(ImplicitOps | Stack),
-       N, D(DstMem | SrcReg | ModRM | BitOp | Lock),
-       D(DstMem | SrcReg | Src2ImmByte | ModRM),
-       D(DstMem | SrcReg | Src2CL | ModRM),
-       D(ModRM), N,
-       /* 0xB0 - 0xB7 */
-       D(ByteOp | DstMem | SrcReg | ModRM | Lock), D(DstMem | SrcReg | ModRM | Lock),
-       N, D(DstMem | SrcReg | ModRM | BitOp | Lock),
-       N, N, D(ByteOp | DstReg | SrcMem | ModRM | Mov),
-           D(DstReg | SrcMem16 | ModRM | Mov),
-       /* 0xB8 - 0xBF */
-       N, N,
-       D(Group | Group8), D(DstMem | SrcReg | ModRM | BitOp | Lock),
-       N, N, D(ByteOp | DstReg | SrcMem | ModRM | Mov),
-           D(DstReg | SrcMem16 | ModRM | Mov),
-       /* 0xC0 - 0xCF */
-       N, N, N, D(DstMem | SrcReg | ModRM | Mov),
-       N, N, N, D(Group | GroupDual | Group9),
-       N, N, N, N, N, N, N, N,
-       /* 0xD0 - 0xDF */
-       N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, N,
-       /* 0xE0 - 0xEF */
-       N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, N,
-       /* 0xF0 - 0xFF */
-       N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, N
-};
-
-#undef D
-#undef N
-#undef G
-#undef GD
-
 /* EFLAGS bit definitions. */
 #define EFLG_ID (1<<21)
 #define EFLG_VIP (1<<20)
@@ -727,7 +491,7 @@ static void *decode_register(u8 modrm_reg, unsigned long *regs,
 
 static int read_descriptor(struct x86_emulate_ctxt *ctxt,
                           struct x86_emulate_ops *ops,
-                          void *ptr,
+                          ulong addr,
                           u16 *size, unsigned long *address, int op_bytes)
 {
        int rc;
@@ -735,12 +499,10 @@ static int read_descriptor(struct x86_emulate_ctxt *ctxt,
        if (op_bytes == 2)
                op_bytes = 3;
        *address = 0;
-       rc = ops->read_std((unsigned long)ptr, (unsigned long *)size, 2,
-                          ctxt->vcpu, NULL);
+       rc = ops->read_std(addr, (unsigned long *)size, 2, ctxt->vcpu, NULL);
        if (rc != X86EMUL_CONTINUE)
                return rc;
-       rc = ops->read_std((unsigned long)ptr + 2, address, op_bytes,
-                          ctxt->vcpu, NULL);
+       rc = ops->read_std(addr + 2, address, op_bytes, ctxt->vcpu, NULL);
        return rc;
 }
 
@@ -779,6 +541,24 @@ static int test_cc(unsigned int condition, unsigned int flags)
        return (!!rc ^ (condition & 1));
 }
 
+static void fetch_register_operand(struct operand *op)
+{
+       switch (op->bytes) {
+       case 1:
+               op->val = *(u8 *)op->addr.reg;
+               break;
+       case 2:
+               op->val = *(u16 *)op->addr.reg;
+               break;
+       case 4:
+               op->val = *(u32 *)op->addr.reg;
+               break;
+       case 8:
+               op->val = *(u64 *)op->addr.reg;
+               break;
+       }
+}
+
 static void decode_register_operand(struct operand *op,
                                    struct decode_cache *c,
                                    int inhibit_bytereg)
@@ -790,34 +570,25 @@ static void decode_register_operand(struct operand *op,
                reg = (c->b & 7) | ((c->rex_prefix & 1) << 3);
        op->type = OP_REG;
        if ((c->d & ByteOp) && !inhibit_bytereg) {
-               op->ptr = decode_register(reg, c->regs, highbyte_regs);
-               op->val = *(u8 *)op->ptr;
+               op->addr.reg = decode_register(reg, c->regs, highbyte_regs);
                op->bytes = 1;
        } else {
-               op->ptr = decode_register(reg, c->regs, 0);
+               op->addr.reg = decode_register(reg, c->regs, 0);
                op->bytes = c->op_bytes;
-               switch (op->bytes) {
-               case 2:
-                       op->val = *(u16 *)op->ptr;
-                       break;
-               case 4:
-                       op->val = *(u32 *)op->ptr;
-                       break;
-               case 8:
-                       op->val = *(u64 *) op->ptr;
-                       break;
-               }
        }
+       fetch_register_operand(op);
        op->orig_val = op->val;
 }
 
 static int decode_modrm(struct x86_emulate_ctxt *ctxt,
-                       struct x86_emulate_ops *ops)
+                       struct x86_emulate_ops *ops,
+                       struct operand *op)
 {
        struct decode_cache *c = &ctxt->decode;
        u8 sib;
        int index_reg = 0, base_reg = 0, scale;
        int rc = X86EMUL_CONTINUE;
+       ulong modrm_ea = 0;
 
        if (c->rex_prefix) {
                c->modrm_reg = (c->rex_prefix & 4) << 1;        /* REX.R */
@@ -829,16 +600,19 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
        c->modrm_mod |= (c->modrm & 0xc0) >> 6;
        c->modrm_reg |= (c->modrm & 0x38) >> 3;
        c->modrm_rm |= (c->modrm & 0x07);
-       c->modrm_ea = 0;
-       c->use_modrm_ea = 1;
+       c->modrm_seg = VCPU_SREG_DS;
 
        if (c->modrm_mod == 3) {
-               c->modrm_ptr = decode_register(c->modrm_rm,
+               op->type = OP_REG;
+               op->bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
+               op->addr.reg = decode_register(c->modrm_rm,
                                               c->regs, c->d & ByteOp);
-               c->modrm_val = *(unsigned long *)c->modrm_ptr;
+               fetch_register_operand(op);
                return rc;
        }
 
+       op->type = OP_MEM;
+
        if (c->ad_bytes == 2) {
                unsigned bx = c->regs[VCPU_REGS_RBX];
                unsigned bp = c->regs[VCPU_REGS_RBP];
@@ -849,47 +623,46 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
                switch (c->modrm_mod) {
                case 0:
                        if (c->modrm_rm == 6)
-                               c->modrm_ea += insn_fetch(u16, 2, c->eip);
+                               modrm_ea += insn_fetch(u16, 2, c->eip);
                        break;
                case 1:
-                       c->modrm_ea += insn_fetch(s8, 1, c->eip);
+                       modrm_ea += insn_fetch(s8, 1, c->eip);
                        break;
                case 2:
-                       c->modrm_ea += insn_fetch(u16, 2, c->eip);
+                       modrm_ea += insn_fetch(u16, 2, c->eip);
                        break;
                }
                switch (c->modrm_rm) {
                case 0:
-                       c->modrm_ea += bx + si;
+                       modrm_ea += bx + si;
                        break;
                case 1:
-                       c->modrm_ea += bx + di;
+                       modrm_ea += bx + di;
                        break;
                case 2:
-                       c->modrm_ea += bp + si;
+                       modrm_ea += bp + si;
                        break;
                case 3:
-                       c->modrm_ea += bp + di;
+                       modrm_ea += bp + di;
                        break;
                case 4:
-                       c->modrm_ea += si;
+                       modrm_ea += si;
                        break;
                case 5:
-                       c->modrm_ea += di;
+                       modrm_ea += di;
                        break;
                case 6:
                        if (c->modrm_mod != 0)
-                               c->modrm_ea += bp;
+                               modrm_ea += bp;
                        break;
                case 7:
-                       c->modrm_ea += bx;
+                       modrm_ea += bx;
                        break;
                }
                if (c->modrm_rm == 2 || c->modrm_rm == 3 ||
                    (c->modrm_rm == 6 && c->modrm_mod != 0))
-                       if (!c->has_seg_override)
-                               set_seg_override(c, VCPU_SREG_SS);
-               c->modrm_ea = (u16)c->modrm_ea;
+                       c->modrm_seg = VCPU_SREG_SS;
+               modrm_ea = (u16)modrm_ea;
        } else {
                /* 32/64-bit ModR/M decode. */
                if ((c->modrm_rm & 7) == 4) {
@@ -899,886 +672,589 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
                        scale = sib >> 6;
 
                        if ((base_reg & 7) == 5 && c->modrm_mod == 0)
-                               c->modrm_ea += insn_fetch(s32, 4, c->eip);
+                               modrm_ea += insn_fetch(s32, 4, c->eip);
                        else
-                               c->modrm_ea += c->regs[base_reg];
+                               modrm_ea += c->regs[base_reg];
                        if (index_reg != 4)
-                               c->modrm_ea += c->regs[index_reg] << scale;
+                               modrm_ea += c->regs[index_reg] << scale;
                } else if ((c->modrm_rm & 7) == 5 && c->modrm_mod == 0) {
                        if (ctxt->mode == X86EMUL_MODE_PROT64)
                                c->rip_relative = 1;
                } else
-                       c->modrm_ea += c->regs[c->modrm_rm];
+                       modrm_ea += c->regs[c->modrm_rm];
                switch (c->modrm_mod) {
                case 0:
                        if (c->modrm_rm == 5)
-                               c->modrm_ea += insn_fetch(s32, 4, c->eip);
+                               modrm_ea += insn_fetch(s32, 4, c->eip);
                        break;
                case 1:
-                       c->modrm_ea += insn_fetch(s8, 1, c->eip);
+                       modrm_ea += insn_fetch(s8, 1, c->eip);
                        break;
                case 2:
-                       c->modrm_ea += insn_fetch(s32, 4, c->eip);
+                       modrm_ea += insn_fetch(s32, 4, c->eip);
                        break;
                }
        }
+       op->addr.mem = modrm_ea;
 done:
        return rc;
 }
 
 static int decode_abs(struct x86_emulate_ctxt *ctxt,
-                     struct x86_emulate_ops *ops)
+                     struct x86_emulate_ops *ops,
+                     struct operand *op)
 {
        struct decode_cache *c = &ctxt->decode;
        int rc = X86EMUL_CONTINUE;
 
+       op->type = OP_MEM;
        switch (c->ad_bytes) {
        case 2:
-               c->modrm_ea = insn_fetch(u16, 2, c->eip);
+               op->addr.mem = insn_fetch(u16, 2, c->eip);
                break;
        case 4:
-               c->modrm_ea = insn_fetch(u32, 4, c->eip);
+               op->addr.mem = insn_fetch(u32, 4, c->eip);
                break;
        case 8:
-               c->modrm_ea = insn_fetch(u64, 8, c->eip);
+               op->addr.mem = insn_fetch(u64, 8, c->eip);
                break;
        }
 done:
        return rc;
 }
 
-int
-x86_decode_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
+static void fetch_bit_operand(struct decode_cache *c)
 {
-       struct decode_cache *c = &ctxt->decode;
-       int rc = X86EMUL_CONTINUE;
-       int mode = ctxt->mode;
-       int def_op_bytes, def_ad_bytes, group, dual, goffset;
-       struct opcode opcode, *g_mod012, *g_mod3;
+       long sv, mask;
 
-       /* we cannot decode insn before we complete previous rep insn */
-       WARN_ON(ctxt->restart);
+       if (c->dst.type == OP_MEM) {
+               mask = ~(c->dst.bytes * 8 - 1);
 
-       c->eip = ctxt->eip;
-       c->fetch.start = c->fetch.end = c->eip;
-       ctxt->cs_base = seg_base(ctxt, ops, VCPU_SREG_CS);
+               if (c->src.bytes == 2)
+                       sv = (s16)c->src.val & (s16)mask;
+               else if (c->src.bytes == 4)
+                       sv = (s32)c->src.val & (s32)mask;
 
-       switch (mode) {
-       case X86EMUL_MODE_REAL:
-       case X86EMUL_MODE_VM86:
-       case X86EMUL_MODE_PROT16:
-               def_op_bytes = def_ad_bytes = 2;
-               break;
-       case X86EMUL_MODE_PROT32:
-               def_op_bytes = def_ad_bytes = 4;
-               break;
-#ifdef CONFIG_X86_64
-       case X86EMUL_MODE_PROT64:
-               def_op_bytes = 4;
-               def_ad_bytes = 8;
-               break;
-#endif
-       default:
-               return -1;
+               c->dst.addr.mem += (sv >> 3);
        }
+}
 
-       c->op_bytes = def_op_bytes;
-       c->ad_bytes = def_ad_bytes;
+static int read_emulated(struct x86_emulate_ctxt *ctxt,
+                        struct x86_emulate_ops *ops,
+                        unsigned long addr, void *dest, unsigned size)
+{
+       int rc;
+       struct read_cache *mc = &ctxt->decode.mem_read;
+       u32 err;
 
-       /* Legacy prefixes. */
-       for (;;) {
-               switch (c->b = insn_fetch(u8, 1, c->eip)) {
-               case 0x66:      /* operand-size override */
-                       /* switch between 2/4 bytes */
-                       c->op_bytes = def_op_bytes ^ 6;
-                       break;
-               case 0x67:      /* address-size override */
-                       if (mode == X86EMUL_MODE_PROT64)
-                               /* switch between 4/8 bytes */
-                               c->ad_bytes = def_ad_bytes ^ 12;
-                       else
-                               /* switch between 2/4 bytes */
-                               c->ad_bytes = def_ad_bytes ^ 6;
-                       break;
-               case 0x26:      /* ES override */
-               case 0x2e:      /* CS override */
-               case 0x36:      /* SS override */
-               case 0x3e:      /* DS override */
-                       set_seg_override(c, (c->b >> 3) & 3);
-                       break;
-               case 0x64:      /* FS override */
-               case 0x65:      /* GS override */
-                       set_seg_override(c, c->b & 7);
-                       break;
-               case 0x40 ... 0x4f: /* REX */
-                       if (mode != X86EMUL_MODE_PROT64)
-                               goto done_prefixes;
-                       c->rex_prefix = c->b;
-                       continue;
-               case 0xf0:      /* LOCK */
-                       c->lock_prefix = 1;
-                       break;
-               case 0xf2:      /* REPNE/REPNZ */
-                       c->rep_prefix = REPNE_PREFIX;
-                       break;
-               case 0xf3:      /* REP/REPE/REPZ */
-                       c->rep_prefix = REPE_PREFIX;
-                       break;
-               default:
-                       goto done_prefixes;
-               }
+       while (size) {
+               int n = min(size, 8u);
+               size -= n;
+               if (mc->pos < mc->end)
+                       goto read_cached;
 
-               /* Any legacy prefix after a REX prefix nullifies its effect. */
+               rc = ops->read_emulated(addr, mc->data + mc->end, n, &err,
+                                       ctxt->vcpu);
+               if (rc == X86EMUL_PROPAGATE_FAULT)
+                       emulate_pf(ctxt, addr, err);
+               if (rc != X86EMUL_CONTINUE)
+                       return rc;
+               mc->end += n;
 
-               c->rex_prefix = 0;
+       read_cached:
+               memcpy(dest, mc->data + mc->pos, n);
+               mc->pos += n;
+               dest += n;
+               addr += n;
        }
+       return X86EMUL_CONTINUE;
+}
 
-done_prefixes:
-
-       /* REX prefix. */
-       if (c->rex_prefix)
-               if (c->rex_prefix & 8)
-                       c->op_bytes = 8;        /* REX.W */
+static int pio_in_emulated(struct x86_emulate_ctxt *ctxt,
+                          struct x86_emulate_ops *ops,
+                          unsigned int size, unsigned short port,
+                          void *dest)
+{
+       struct read_cache *rc = &ctxt->decode.io_read;
 
-       /* Opcode byte(s). */
-       opcode = opcode_table[c->b];
-       if (opcode.flags == 0) {
-               /* Two-byte opcode? */
-               if (c->b == 0x0f) {
-                       c->twobyte = 1;
-                       c->b = insn_fetch(u8, 1, c->eip);
-                       opcode = twobyte_table[c->b];
-               }
+       if (rc->pos == rc->end) { /* refill pio read ahead */
+               struct decode_cache *c = &ctxt->decode;
+               unsigned int in_page, n;
+               unsigned int count = c->rep_prefix ?
+                       address_mask(c, c->regs[VCPU_REGS_RCX]) : 1;
+               in_page = (ctxt->eflags & EFLG_DF) ?
+                       offset_in_page(c->regs[VCPU_REGS_RDI]) :
+                       PAGE_SIZE - offset_in_page(c->regs[VCPU_REGS_RDI]);
+               n = min(min(in_page, (unsigned int)sizeof(rc->data)) / size,
+                       count);
+               if (n == 0)
+                       n = 1;
+               rc->pos = rc->end = 0;
+               if (!ops->pio_in_emulated(size, port, rc->data, n, ctxt->vcpu))
+                       return 0;
+               rc->end = n * size;
        }
-       c->d = opcode.flags;
 
-       if (c->d & Group) {
-               group = c->d & GroupMask;
-               dual = c->d & GroupDual;
-               c->modrm = insn_fetch(u8, 1, c->eip);
-               --c->eip;
+       memcpy(dest, rc->data + rc->pos, size);
+       rc->pos += size;
+       return 1;
+}
 
-               if (group) {
-                       g_mod012 = g_mod3 = &group_table[group * 8];
-                       if (c->d & GroupDual)
-                               g_mod3 = &group2_table[group * 8];
-               } else {
-                       if (c->d & GroupDual) {
-                               g_mod012 = opcode.u.gdual->mod012;
-                               g_mod3 = opcode.u.gdual->mod3;
-                       } else
-                               g_mod012 = g_mod3 = opcode.u.group;
-               }
+static u32 desc_limit_scaled(struct desc_struct *desc)
+{
+       u32 limit = get_desc_limit(desc);
 
-               c->d &= ~(Group | GroupDual | GroupMask);
+       return desc->g ? (limit << 12) | 0xfff : limit;
+}
 
-               goffset = (c->modrm >> 3) & 7;
+static void get_descriptor_table_ptr(struct x86_emulate_ctxt *ctxt,
+                                    struct x86_emulate_ops *ops,
+                                    u16 selector, struct desc_ptr *dt)
+{
+       if (selector & 1 << 2) {
+               struct desc_struct desc;
+               memset (dt, 0, sizeof *dt);
+               if (!ops->get_cached_descriptor(&desc, VCPU_SREG_LDTR, ctxt->vcpu))
+                       return;
 
-               if ((c->modrm >> 6) == 3)
-                       opcode = g_mod3[goffset];
-               else
-                       opcode = g_mod012[goffset];
-               c->d |= opcode.flags;
+               dt->size = desc_limit_scaled(&desc); /* what if limit > 65535? */
+               dt->address = get_desc_base(&desc);
+       } else
+               ops->get_gdt(dt, ctxt->vcpu);
+}
+
+/* allowed just for 8 bytes segments */
+static int read_segment_descriptor(struct x86_emulate_ctxt *ctxt,
+                                  struct x86_emulate_ops *ops,
+                                  u16 selector, struct desc_struct *desc)
+{
+       struct desc_ptr dt;
+       u16 index = selector >> 3;
+       int ret;
+       u32 err;
+       ulong addr;
+
+       get_descriptor_table_ptr(ctxt, ops, selector, &dt);
+
+       if (dt.size < index * 8 + 7) {
+               emulate_gp(ctxt, selector & 0xfffc);
+               return X86EMUL_PROPAGATE_FAULT;
        }
+       addr = dt.address + index * 8;
+       ret = ops->read_std(addr, desc, sizeof *desc, ctxt->vcpu,  &err);
+       if (ret == X86EMUL_PROPAGATE_FAULT)
+               emulate_pf(ctxt, addr, err);
 
-       /* Unrecognised? */
-       if (c->d == 0 || (c->d & Undefined)) {
-               DPRINTF("Cannot emulate %02x\n", c->b);
-               return -1;
+       return ret;
+}
+
+/* allowed just for 8 bytes segments */
+static int write_segment_descriptor(struct x86_emulate_ctxt *ctxt,
+                                   struct x86_emulate_ops *ops,
+                                   u16 selector, struct desc_struct *desc)
+{
+       struct desc_ptr dt;
+       u16 index = selector >> 3;
+       u32 err;
+       ulong addr;
+       int ret;
+
+       get_descriptor_table_ptr(ctxt, ops, selector, &dt);
+
+       if (dt.size < index * 8 + 7) {
+               emulate_gp(ctxt, selector & 0xfffc);
+               return X86EMUL_PROPAGATE_FAULT;
        }
 
-       if (mode == X86EMUL_MODE_PROT64 && (c->d & Stack))
-               c->op_bytes = 8;
+       addr = dt.address + index * 8;
+       ret = ops->write_std(addr, desc, sizeof *desc, ctxt->vcpu, &err);
+       if (ret == X86EMUL_PROPAGATE_FAULT)
+               emulate_pf(ctxt, addr, err);
 
-       /* ModRM and SIB bytes. */
-       if (c->d & ModRM)
-               rc = decode_modrm(ctxt, ops);
-       else if (c->d & MemAbs)
-               rc = decode_abs(ctxt, ops);
-       if (rc != X86EMUL_CONTINUE)
-               goto done;
+       return ret;
+}
 
-       if (!c->has_seg_override)
-               set_seg_override(c, VCPU_SREG_DS);
+static int load_segment_descriptor(struct x86_emulate_ctxt *ctxt,
+                                  struct x86_emulate_ops *ops,
+                                  u16 selector, int seg)
+{
+       struct desc_struct seg_desc;
+       u8 dpl, rpl, cpl;
+       unsigned err_vec = GP_VECTOR;
+       u32 err_code = 0;
+       bool null_selector = !(selector & ~0x3); /* 0000-0003 are null */
+       int ret;
 
-       if (!(!c->twobyte && c->b == 0x8d))
-               c->modrm_ea += seg_override_base(ctxt, ops, c);
+       memset(&seg_desc, 0, sizeof seg_desc);
 
-       if (c->ad_bytes != 8)
-               c->modrm_ea = (u32)c->modrm_ea;
+       if ((seg <= VCPU_SREG_GS && ctxt->mode == X86EMUL_MODE_VM86)
+           || ctxt->mode == X86EMUL_MODE_REAL) {
+               /* set real mode segment descriptor */
+               set_desc_base(&seg_desc, selector << 4);
+               set_desc_limit(&seg_desc, 0xffff);
+               seg_desc.type = 3;
+               seg_desc.p = 1;
+               seg_desc.s = 1;
+               goto load;
+       }
 
-       if (c->rip_relative)
-               c->modrm_ea += c->eip;
+       /* NULL selector is not valid for TR, CS and SS */
+       if ((seg == VCPU_SREG_CS || seg == VCPU_SREG_SS || seg == VCPU_SREG_TR)
+           && null_selector)
+               goto exception;
 
-       /*
-        * Decode and fetch the source operand: register, memory
-        * or immediate.
-        */
-       switch (c->d & SrcMask) {
-       case SrcNone:
-               break;
-       case SrcReg:
-               decode_register_operand(&c->src, c, 0);
-               break;
-       case SrcMem16:
-               c->src.bytes = 2;
-               goto srcmem_common;
-       case SrcMem32:
-               c->src.bytes = 4;
-               goto srcmem_common;
-       case SrcMem:
-               c->src.bytes = (c->d & ByteOp) ? 1 :
-                                                          c->op_bytes;
-               /* Don't fetch the address for invlpg: it could be unmapped. */
-               if (c->twobyte && c->b == 0x01 && c->modrm_reg == 7)
-                       break;
-       srcmem_common:
-               /*
-                * For instructions with a ModR/M byte, switch to register
-                * access if Mod = 3.
-                */
-               if ((c->d & ModRM) && c->modrm_mod == 3) {
-                       c->src.type = OP_REG;
-                       c->src.val = c->modrm_val;
-                       c->src.ptr = c->modrm_ptr;
-                       break;
-               }
-               c->src.type = OP_MEM;
-               c->src.ptr = (unsigned long *)c->modrm_ea;
-               c->src.val = 0;
-               break;
-       case SrcImm:
-       case SrcImmU:
-               c->src.type = OP_IMM;
-               c->src.ptr = (unsigned long *)c->eip;
-               c->src.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
-               if (c->src.bytes == 8)
-                       c->src.bytes = 4;
-               /* NB. Immediates are sign-extended as necessary. */
-               switch (c->src.bytes) {
-               case 1:
-                       c->src.val = insn_fetch(s8, 1, c->eip);
-                       break;
-               case 2:
-                       c->src.val = insn_fetch(s16, 2, c->eip);
-                       break;
-               case 4:
-                       c->src.val = insn_fetch(s32, 4, c->eip);
-                       break;
-               }
-               if ((c->d & SrcMask) == SrcImmU) {
-                       switch (c->src.bytes) {
-                       case 1:
-                               c->src.val &= 0xff;
-                               break;
-                       case 2:
-                               c->src.val &= 0xffff;
-                               break;
-                       case 4:
-                               c->src.val &= 0xffffffff;
-                               break;
-                       }
-               }
-               break;
-       case SrcImmByte:
-       case SrcImmUByte:
-               c->src.type = OP_IMM;
-               c->src.ptr = (unsigned long *)c->eip;
-               c->src.bytes = 1;
-               if ((c->d & SrcMask) == SrcImmByte)
-                       c->src.val = insn_fetch(s8, 1, c->eip);
-               else
-                       c->src.val = insn_fetch(u8, 1, c->eip);
-               break;
-       case SrcAcc:
-               c->src.type = OP_REG;
-               c->src.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
-               c->src.ptr = &c->regs[VCPU_REGS_RAX];
-               switch (c->src.bytes) {
-                       case 1:
-                               c->src.val = *(u8 *)c->src.ptr;
-                               break;
-                       case 2:
-                               c->src.val = *(u16 *)c->src.ptr;
-                               break;
-                       case 4:
-                               c->src.val = *(u32 *)c->src.ptr;
-                               break;
-                       case 8:
-                               c->src.val = *(u64 *)c->src.ptr;
-                               break;
-               }
-               break;
-       case SrcOne:
-               c->src.bytes = 1;
-               c->src.val = 1;
-               break;
-       case SrcSI:
-               c->src.type = OP_MEM;
-               c->src.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
-               c->src.ptr = (unsigned long *)
-                       register_address(c,  seg_override_base(ctxt, ops, c),
-                                        c->regs[VCPU_REGS_RSI]);
-               c->src.val = 0;
-               break;
-       case SrcImmFAddr:
-               c->src.type = OP_IMM;
-               c->src.ptr = (unsigned long *)c->eip;
-               c->src.bytes = c->op_bytes + 2;
-               insn_fetch_arr(c->src.valptr, c->src.bytes, c->eip);
-               break;
-       case SrcMemFAddr:
-               c->src.type = OP_MEM;
-               c->src.ptr = (unsigned long *)c->modrm_ea;
-               c->src.bytes = c->op_bytes + 2;
-               break;
-       }
+       /* TR should be in GDT only */
+       if (seg == VCPU_SREG_TR && (selector & (1 << 2)))
+               goto exception;
 
-       /*
-        * Decode and fetch the second source operand: register, memory
-        * or immediate.
-        */
-       switch (c->d & Src2Mask) {
-       case Src2None:
-               break;
-       case Src2CL:
-               c->src2.bytes = 1;
-               c->src2.val = c->regs[VCPU_REGS_RCX] & 0x8;
-               break;
-       case Src2ImmByte:
-               c->src2.type = OP_IMM;
-               c->src2.ptr = (unsigned long *)c->eip;
-               c->src2.bytes = 1;
-               c->src2.val = insn_fetch(u8, 1, c->eip);
-               break;
-       case Src2One:
-               c->src2.bytes = 1;
-               c->src2.val = 1;
-               break;
+       if (null_selector) /* for NULL selector skip all following checks */
+               goto load;
+
+       ret = read_segment_descriptor(ctxt, ops, selector, &seg_desc);
+       if (ret != X86EMUL_CONTINUE)
+               return ret;
+
+       err_code = selector & 0xfffc;
+       err_vec = GP_VECTOR;
+
+       /* can't load system descriptor into segment selecor */
+       if (seg <= VCPU_SREG_GS && !seg_desc.s)
+               goto exception;
+
+       if (!seg_desc.p) {
+               err_vec = (seg == VCPU_SREG_SS) ? SS_VECTOR : NP_VECTOR;
+               goto exception;
        }
 
-       /* Decode and fetch the destination operand: register or memory. */
-       switch (c->d & DstMask) {
-       case ImplicitOps:
-               /* Special instructions do their own operand decoding. */
-               return 0;
-       case DstReg:
-               decode_register_operand(&c->dst, c,
-                        c->twobyte && (c->b == 0xb6 || c->b == 0xb7));
+       rpl = selector & 3;
+       dpl = seg_desc.dpl;
+       cpl = ops->cpl(ctxt->vcpu);
+
+       switch (seg) {
+       case VCPU_SREG_SS:
+               /*
+                * segment is not a writable data segment or segment
+                * selector's RPL != CPL or segment selector's RPL != CPL
+                */
+               if (rpl != cpl || (seg_desc.type & 0xa) != 0x2 || dpl != cpl)
+                       goto exception;
                break;
-       case DstMem:
-       case DstMem64:
-               if ((c->d & ModRM) && c->modrm_mod == 3) {
-                       c->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
-                       c->dst.type = OP_REG;
-                       c->dst.val = c->dst.orig_val = c->modrm_val;
-                       c->dst.ptr = c->modrm_ptr;
-                       break;
-               }
-               c->dst.type = OP_MEM;
-               c->dst.ptr = (unsigned long *)c->modrm_ea;
-               if ((c->d & DstMask) == DstMem64)
-                       c->dst.bytes = 8;
-               else
-                       c->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
-               c->dst.val = 0;
-               if (c->d & BitOp) {
-                       unsigned long mask = ~(c->dst.bytes * 8 - 1);
+       case VCPU_SREG_CS:
+               if (!(seg_desc.type & 8))
+                       goto exception;
 
-                       c->dst.ptr = (void *)c->dst.ptr +
-                                                  (c->src.val & mask) / 8;
+               if (seg_desc.type & 4) {
+                       /* conforming */
+                       if (dpl > cpl)
+                               goto exception;
+               } else {
+                       /* nonconforming */
+                       if (rpl > cpl || dpl != cpl)
+                               goto exception;
                }
+               /* CS(RPL) <- CPL */
+               selector = (selector & 0xfffc) | cpl;
                break;
-       case DstAcc:
-               c->dst.type = OP_REG;
-               c->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
-               c->dst.ptr = &c->regs[VCPU_REGS_RAX];
-               switch (c->dst.bytes) {
-                       case 1:
-                               c->dst.val = *(u8 *)c->dst.ptr;
-                               break;
-                       case 2:
-                               c->dst.val = *(u16 *)c->dst.ptr;
-                               break;
-                       case 4:
-                               c->dst.val = *(u32 *)c->dst.ptr;
-                               break;
-                       case 8:
-                               c->dst.val = *(u64 *)c->dst.ptr;
-                               break;
-               }
-               c->dst.orig_val = c->dst.val;
+       case VCPU_SREG_TR:
+               if (seg_desc.s || (seg_desc.type != 1 && seg_desc.type != 9))
+                       goto exception;
                break;
-       case DstDI:
-               c->dst.type = OP_MEM;
-               c->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
-               c->dst.ptr = (unsigned long *)
-                       register_address(c, es_base(ctxt, ops),
-                                        c->regs[VCPU_REGS_RDI]);
-               c->dst.val = 0;
+       case VCPU_SREG_LDTR:
+               if (seg_desc.s || seg_desc.type != 2)
+                       goto exception;
+               break;
+       default: /*  DS, ES, FS, or GS */
+               /*
+                * segment is not a data or readable code segment or
+                * ((segment is a data or nonconforming code segment)
+                * and (both RPL and CPL > DPL))
+                */
+               if ((seg_desc.type & 0xa) == 0x8 ||
+                   (((seg_desc.type & 0xc) != 0xc) &&
+                    (rpl > dpl && cpl > dpl)))
+                       goto exception;
                break;
        }
 
-done:
-       return (rc == X86EMUL_UNHANDLEABLE) ? -1 : 0;
+       if (seg_desc.s) {
+               /* mark segment as accessed */
+               seg_desc.type |= 1;
+               ret = write_segment_descriptor(ctxt, ops, selector, &seg_desc);
+               if (ret != X86EMUL_CONTINUE)
+                       return ret;
+       }
+load:
+       ops->set_segment_selector(selector, seg, ctxt->vcpu);
+       ops->set_cached_descriptor(&seg_desc, seg, ctxt->vcpu);
+       return X86EMUL_CONTINUE;
+exception:
+       emulate_exception(ctxt, err_vec, err_code, true);
+       return X86EMUL_PROPAGATE_FAULT;
 }
 
-static int read_emulated(struct x86_emulate_ctxt *ctxt,
-                        struct x86_emulate_ops *ops,
-                        unsigned long addr, void *dest, unsigned size)
+static inline int writeback(struct x86_emulate_ctxt *ctxt,
+                           struct x86_emulate_ops *ops)
 {
        int rc;
-       struct read_cache *mc = &ctxt->decode.mem_read;
+       struct decode_cache *c = &ctxt->decode;
        u32 err;
 
-       while (size) {
-               int n = min(size, 8u);
-               size -= n;
-               if (mc->pos < mc->end)
-                       goto read_cached;
-
-               rc = ops->read_emulated(addr, mc->data + mc->end, n, &err,
+       switch (c->dst.type) {
+       case OP_REG:
+               /* The 4-byte case *is* correct:
+                * in 64-bit mode we zero-extend.
+                */
+               switch (c->dst.bytes) {
+               case 1:
+                       *(u8 *)c->dst.addr.reg = (u8)c->dst.val;
+                       break;
+               case 2:
+                       *(u16 *)c->dst.addr.reg = (u16)c->dst.val;
+                       break;
+               case 4:
+                       *c->dst.addr.reg = (u32)c->dst.val;
+                       break;  /* 64b: zero-ext */
+               case 8:
+                       *c->dst.addr.reg = c->dst.val;
+                       break;
+               }
+               break;
+       case OP_MEM:
+               if (c->lock_prefix)
+                       rc = ops->cmpxchg_emulated(
+                                       c->dst.addr.mem,
+                                       &c->dst.orig_val,
+                                       &c->dst.val,
+                                       c->dst.bytes,
+                                       &err,
+                                       ctxt->vcpu);
+               else
+                       rc = ops->write_emulated(
+                                       c->dst.addr.mem,
+                                       &c->dst.val,
+                                       c->dst.bytes,
+                                       &err,
                                        ctxt->vcpu);
                if (rc == X86EMUL_PROPAGATE_FAULT)
-                       emulate_pf(ctxt, addr, err);
+                       emulate_pf(ctxt, c->dst.addr.mem, err);
                if (rc != X86EMUL_CONTINUE)
                        return rc;
-               mc->end += n;
-
-       read_cached:
-               memcpy(dest, mc->data + mc->pos, n);
-               mc->pos += n;
-               dest += n;
-               addr += n;
+               break;
+       case OP_NONE:
+               /* no writeback */
+               break;
+       default:
+               break;
        }
        return X86EMUL_CONTINUE;
 }
 
-static int pio_in_emulated(struct x86_emulate_ctxt *ctxt,
-                          struct x86_emulate_ops *ops,
-                          unsigned int size, unsigned short port,
-                          void *dest)
+static inline void emulate_push(struct x86_emulate_ctxt *ctxt,
+                               struct x86_emulate_ops *ops)
 {
-       struct read_cache *rc = &ctxt->decode.io_read;
-
-       if (rc->pos == rc->end) { /* refill pio read ahead */
-               struct decode_cache *c = &ctxt->decode;
-               unsigned int in_page, n;
-               unsigned int count = c->rep_prefix ?
-                       address_mask(c, c->regs[VCPU_REGS_RCX]) : 1;
-               in_page = (ctxt->eflags & EFLG_DF) ?
-                       offset_in_page(c->regs[VCPU_REGS_RDI]) :
-                       PAGE_SIZE - offset_in_page(c->regs[VCPU_REGS_RDI]);
-               n = min(min(in_page, (unsigned int)sizeof(rc->data)) / size,
-                       count);
-               if (n == 0)
-                       n = 1;
-               rc->pos = rc->end = 0;
-               if (!ops->pio_in_emulated(size, port, rc->data, n, ctxt->vcpu))
-                       return 0;
-               rc->end = n * size;
-       }
+       struct decode_cache *c = &ctxt->decode;
 
-       memcpy(dest, rc->data + rc->pos, size);
-       rc->pos += size;
-       return 1;
+       c->dst.type  = OP_MEM;
+       c->dst.bytes = c->op_bytes;
+       c->dst.val = c->src.val;
+       register_address_increment(c, &c->regs[VCPU_REGS_RSP], -c->op_bytes);
+       c->dst.addr.mem = register_address(c, ss_base(ctxt, ops),
+                                          c->regs[VCPU_REGS_RSP]);
 }
 
-static u32 desc_limit_scaled(struct desc_struct *desc)
+static int emulate_pop(struct x86_emulate_ctxt *ctxt,
+                      struct x86_emulate_ops *ops,
+                      void *dest, int len)
 {
-       u32 limit = get_desc_limit(desc);
+       struct decode_cache *c = &ctxt->decode;
+       int rc;
 
-       return desc->g ? (limit << 12) | 0xfff : limit;
+       rc = read_emulated(ctxt, ops, register_address(c, ss_base(ctxt, ops),
+                                                      c->regs[VCPU_REGS_RSP]),
+                          dest, len);
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
+
+       register_address_increment(c, &c->regs[VCPU_REGS_RSP], len);
+       return rc;
 }
 
-static void get_descriptor_table_ptr(struct x86_emulate_ctxt *ctxt,
-                                    struct x86_emulate_ops *ops,
-                                    u16 selector, struct desc_ptr *dt)
+static int emulate_popf(struct x86_emulate_ctxt *ctxt,
+                      struct x86_emulate_ops *ops,
+                      void *dest, int len)
 {
-       if (selector & 1 << 2) {
-               struct desc_struct desc;
-               memset (dt, 0, sizeof *dt);
-               if (!ops->get_cached_descriptor(&desc, VCPU_SREG_LDTR, ctxt->vcpu))
-                       return;
+       int rc;
+       unsigned long val, change_mask;
+       int iopl = (ctxt->eflags & X86_EFLAGS_IOPL) >> IOPL_SHIFT;
+       int cpl = ops->cpl(ctxt->vcpu);
 
-               dt->size = desc_limit_scaled(&desc); /* what if limit > 65535? */
-               dt->address = get_desc_base(&desc);
-       } else
-               ops->get_gdt(dt, ctxt->vcpu);
+       rc = emulate_pop(ctxt, ops, &val, len);
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
+
+       change_mask = EFLG_CF | EFLG_PF | EFLG_AF | EFLG_ZF | EFLG_SF | EFLG_OF
+               | EFLG_TF | EFLG_DF | EFLG_NT | EFLG_RF | EFLG_AC | EFLG_ID;
+
+       switch(ctxt->mode) {
+       case X86EMUL_MODE_PROT64:
+       case X86EMUL_MODE_PROT32:
+       case X86EMUL_MODE_PROT16:
+               if (cpl == 0)
+                       change_mask |= EFLG_IOPL;
+               if (cpl <= iopl)
+                       change_mask |= EFLG_IF;
+               break;
+       case X86EMUL_MODE_VM86:
+               if (iopl < 3) {
+                       emulate_gp(ctxt, 0);
+                       return X86EMUL_PROPAGATE_FAULT;
+               }
+               change_mask |= EFLG_IF;
+               break;
+       default: /* real mode */
+               change_mask |= (EFLG_IOPL | EFLG_IF);
+               break;
+       }
+
+       *(unsigned long *)dest =
+               (ctxt->eflags & ~change_mask) | (val & change_mask);
+
+       return rc;
 }
 
-/* allowed just for 8 bytes segments */
-static int read_segment_descriptor(struct x86_emulate_ctxt *ctxt,
-                                  struct x86_emulate_ops *ops,
-                                  u16 selector, struct desc_struct *desc)
+static void emulate_push_sreg(struct x86_emulate_ctxt *ctxt,
+                             struct x86_emulate_ops *ops, int seg)
 {
-       struct desc_ptr dt;
-       u16 index = selector >> 3;
-       int ret;
-       u32 err;
-       ulong addr;
+       struct decode_cache *c = &ctxt->decode;
 
-       get_descriptor_table_ptr(ctxt, ops, selector, &dt);
+       c->src.val = ops->get_segment_selector(seg, ctxt->vcpu);
 
-       if (dt.size < index * 8 + 7) {
-               emulate_gp(ctxt, selector & 0xfffc);
-               return X86EMUL_PROPAGATE_FAULT;
-       }
-       addr = dt.address + index * 8;
-       ret = ops->read_std(addr, desc, sizeof *desc, ctxt->vcpu,  &err);
-       if (ret == X86EMUL_PROPAGATE_FAULT)
-               emulate_pf(ctxt, addr, err);
+       emulate_push(ctxt, ops);
+}
 
-       return ret;
+static int emulate_pop_sreg(struct x86_emulate_ctxt *ctxt,
+                            struct x86_emulate_ops *ops, int seg)
+{
+       struct decode_cache *c = &ctxt->decode;
+       unsigned long selector;
+       int rc;
+
+       rc = emulate_pop(ctxt, ops, &selector, c->op_bytes);
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
+
+       rc = load_segment_descriptor(ctxt, ops, (u16)selector, seg);
+       return rc;
 }
 
-/* allowed just for 8 bytes segments */
-static int write_segment_descriptor(struct x86_emulate_ctxt *ctxt,
-                                   struct x86_emulate_ops *ops,
-                                   u16 selector, struct desc_struct *desc)
+static int emulate_pusha(struct x86_emulate_ctxt *ctxt,
+                         struct x86_emulate_ops *ops)
 {
-       struct desc_ptr dt;
-       u16 index = selector >> 3;
-       u32 err;
-       ulong addr;
-       int ret;
+       struct decode_cache *c = &ctxt->decode;
+       unsigned long old_esp = c->regs[VCPU_REGS_RSP];
+       int rc = X86EMUL_CONTINUE;
+       int reg = VCPU_REGS_RAX;
 
-       get_descriptor_table_ptr(ctxt, ops, selector, &dt);
+       while (reg <= VCPU_REGS_RDI) {
+               (reg == VCPU_REGS_RSP) ?
+               (c->src.val = old_esp) : (c->src.val = c->regs[reg]);
 
-       if (dt.size < index * 8 + 7) {
-               emulate_gp(ctxt, selector & 0xfffc);
-               return X86EMUL_PROPAGATE_FAULT;
+               emulate_push(ctxt, ops);
+
+               rc = writeback(ctxt, ops);
+               if (rc != X86EMUL_CONTINUE)
+                       return rc;
+
+               ++reg;
        }
 
-       addr = dt.address + index * 8;
-       ret = ops->write_std(addr, desc, sizeof *desc, ctxt->vcpu, &err);
-       if (ret == X86EMUL_PROPAGATE_FAULT)
-               emulate_pf(ctxt, addr, err);
+       /* Disable writeback. */
+       c->dst.type = OP_NONE;
 
-       return ret;
+       return rc;
 }
 
-static int load_segment_descriptor(struct x86_emulate_ctxt *ctxt,
-                                  struct x86_emulate_ops *ops,
-                                  u16 selector, int seg)
+static int emulate_popa(struct x86_emulate_ctxt *ctxt,
+                       struct x86_emulate_ops *ops)
 {
-       struct desc_struct seg_desc;
-       u8 dpl, rpl, cpl;
-       unsigned err_vec = GP_VECTOR;
-       u32 err_code = 0;
-       bool null_selector = !(selector & ~0x3); /* 0000-0003 are null */
-       int ret;
+       struct decode_cache *c = &ctxt->decode;
+       int rc = X86EMUL_CONTINUE;
+       int reg = VCPU_REGS_RDI;
 
-       memset(&seg_desc, 0, sizeof seg_desc);
+       while (reg >= VCPU_REGS_RAX) {
+               if (reg == VCPU_REGS_RSP) {
+                       register_address_increment(c, &c->regs[VCPU_REGS_RSP],
+                                                       c->op_bytes);
+                       --reg;
+               }
 
-       if ((seg <= VCPU_SREG_GS && ctxt->mode == X86EMUL_MODE_VM86)
-           || ctxt->mode == X86EMUL_MODE_REAL) {
-               /* set real mode segment descriptor */
-               set_desc_base(&seg_desc, selector << 4);
-               set_desc_limit(&seg_desc, 0xffff);
-               seg_desc.type = 3;
-               seg_desc.p = 1;
-               seg_desc.s = 1;
-               goto load;
+               rc = emulate_pop(ctxt, ops, &c->regs[reg], c->op_bytes);
+               if (rc != X86EMUL_CONTINUE)
+                       break;
+               --reg;
        }
+       return rc;
+}
 
-       /* NULL selector is not valid for TR, CS and SS */
-       if ((seg == VCPU_SREG_CS || seg == VCPU_SREG_SS || seg == VCPU_SREG_TR)
-           && null_selector)
-               goto exception;
+int emulate_int_real(struct x86_emulate_ctxt *ctxt,
+                              struct x86_emulate_ops *ops, int irq)
+{
+       struct decode_cache *c = &ctxt->decode;
+       int rc = X86EMUL_CONTINUE;
+       struct desc_ptr dt;
+       gva_t cs_addr;
+       gva_t eip_addr;
+       u16 cs, eip;
+       u32 err;
 
-       /* TR should be in GDT only */
-       if (seg == VCPU_SREG_TR && (selector & (1 << 2)))
-               goto exception;
+       /* TODO: Add limit checks */
+       c->src.val = ctxt->eflags;
+       emulate_push(ctxt, ops);
 
-       if (null_selector) /* for NULL selector skip all following checks */
-               goto load;
+       ctxt->eflags &= ~(EFLG_IF | EFLG_TF | EFLG_AC);
 
-       ret = read_segment_descriptor(ctxt, ops, selector, &seg_desc);
-       if (ret != X86EMUL_CONTINUE)
-               return ret;
+       c->src.val = ops->get_segment_selector(VCPU_SREG_CS, ctxt->vcpu);
+       emulate_push(ctxt, ops);
 
-       err_code = selector & 0xfffc;
-       err_vec = GP_VECTOR;
+       c->src.val = c->eip;
+       emulate_push(ctxt, ops);
 
-       /* can't load system descriptor into segment selecor */
-       if (seg <= VCPU_SREG_GS && !seg_desc.s)
-               goto exception;
+       ops->get_idt(&dt, ctxt->vcpu);
 
-       if (!seg_desc.p) {
-               err_vec = (seg == VCPU_SREG_SS) ? SS_VECTOR : NP_VECTOR;
-               goto exception;
-       }
+       eip_addr = dt.address + (irq << 2);
+       cs_addr = dt.address + (irq << 2) + 2;
 
-       rpl = selector & 3;
-       dpl = seg_desc.dpl;
-       cpl = ops->cpl(ctxt->vcpu);
+       rc = ops->read_std(cs_addr, &cs, 2, ctxt->vcpu, &err);
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
 
-       switch (seg) {
-       case VCPU_SREG_SS:
-               /*
-                * segment is not a writable data segment or segment
-                * selector's RPL != CPL or segment selector's RPL != CPL
-                */
-               if (rpl != cpl || (seg_desc.type & 0xa) != 0x2 || dpl != cpl)
-                       goto exception;
-               break;
-       case VCPU_SREG_CS:
-               if (!(seg_desc.type & 8))
-                       goto exception;
-
-               if (seg_desc.type & 4) {
-                       /* conforming */
-                       if (dpl > cpl)
-                               goto exception;
-               } else {
-                       /* nonconforming */
-                       if (rpl > cpl || dpl != cpl)
-                               goto exception;
-               }
-               /* CS(RPL) <- CPL */
-               selector = (selector & 0xfffc) | cpl;
-               break;
-       case VCPU_SREG_TR:
-               if (seg_desc.s || (seg_desc.type != 1 && seg_desc.type != 9))
-                       goto exception;
-               break;
-       case VCPU_SREG_LDTR:
-               if (seg_desc.s || seg_desc.type != 2)
-                       goto exception;
-               break;
-       default: /*  DS, ES, FS, or GS */
-               /*
-                * segment is not a data or readable code segment or
-                * ((segment is a data or nonconforming code segment)
-                * and (both RPL and CPL > DPL))
-                */
-               if ((seg_desc.type & 0xa) == 0x8 ||
-                   (((seg_desc.type & 0xc) != 0xc) &&
-                    (rpl > dpl && cpl > dpl)))
-                       goto exception;
-               break;
-       }
-
-       if (seg_desc.s) {
-               /* mark segment as accessed */
-               seg_desc.type |= 1;
-               ret = write_segment_descriptor(ctxt, ops, selector, &seg_desc);
-               if (ret != X86EMUL_CONTINUE)
-                       return ret;
-       }
-load:
-       ops->set_segment_selector(selector, seg, ctxt->vcpu);
-       ops->set_cached_descriptor(&seg_desc, seg, ctxt->vcpu);
-       return X86EMUL_CONTINUE;
-exception:
-       emulate_exception(ctxt, err_vec, err_code, true);
-       return X86EMUL_PROPAGATE_FAULT;
-}
-
-static inline int writeback(struct x86_emulate_ctxt *ctxt,
-                           struct x86_emulate_ops *ops)
-{
-       int rc;
-       struct decode_cache *c = &ctxt->decode;
-       u32 err;
-
-       switch (c->dst.type) {
-       case OP_REG:
-               /* The 4-byte case *is* correct:
-                * in 64-bit mode we zero-extend.
-                */
-               switch (c->dst.bytes) {
-               case 1:
-                       *(u8 *)c->dst.ptr = (u8)c->dst.val;
-                       break;
-               case 2:
-                       *(u16 *)c->dst.ptr = (u16)c->dst.val;
-                       break;
-               case 4:
-                       *c->dst.ptr = (u32)c->dst.val;
-                       break;  /* 64b: zero-ext */
-               case 8:
-                       *c->dst.ptr = c->dst.val;
-                       break;
-               }
-               break;
-       case OP_MEM:
-               if (c->lock_prefix)
-                       rc = ops->cmpxchg_emulated(
-                                       (unsigned long)c->dst.ptr,
-                                       &c->dst.orig_val,
-                                       &c->dst.val,
-                                       c->dst.bytes,
-                                       &err,
-                                       ctxt->vcpu);
-               else
-                       rc = ops->write_emulated(
-                                       (unsigned long)c->dst.ptr,
-                                       &c->dst.val,
-                                       c->dst.bytes,
-                                       &err,
-                                       ctxt->vcpu);
-               if (rc == X86EMUL_PROPAGATE_FAULT)
-                       emulate_pf(ctxt,
-                                             (unsigned long)c->dst.ptr, err);
-               if (rc != X86EMUL_CONTINUE)
-                       return rc;
-               break;
-       case OP_NONE:
-               /* no writeback */
-               break;
-       default:
-               break;
-       }
-       return X86EMUL_CONTINUE;
-}
-
-static inline void emulate_push(struct x86_emulate_ctxt *ctxt,
-                               struct x86_emulate_ops *ops)
-{
-       struct decode_cache *c = &ctxt->decode;
-
-       c->dst.type  = OP_MEM;
-       c->dst.bytes = c->op_bytes;
-       c->dst.val = c->src.val;
-       register_address_increment(c, &c->regs[VCPU_REGS_RSP], -c->op_bytes);
-       c->dst.ptr = (void *) register_address(c, ss_base(ctxt, ops),
-                                              c->regs[VCPU_REGS_RSP]);
-}
-
-static int emulate_pop(struct x86_emulate_ctxt *ctxt,
-                      struct x86_emulate_ops *ops,
-                      void *dest, int len)
-{
-       struct decode_cache *c = &ctxt->decode;
-       int rc;
-
-       rc = read_emulated(ctxt, ops, register_address(c, ss_base(ctxt, ops),
-                                                      c->regs[VCPU_REGS_RSP]),
-                          dest, len);
-       if (rc != X86EMUL_CONTINUE)
-               return rc;
-
-       register_address_increment(c, &c->regs[VCPU_REGS_RSP], len);
-       return rc;
-}
-
-static int emulate_popf(struct x86_emulate_ctxt *ctxt,
-                      struct x86_emulate_ops *ops,
-                      void *dest, int len)
-{
-       int rc;
-       unsigned long val, change_mask;
-       int iopl = (ctxt->eflags & X86_EFLAGS_IOPL) >> IOPL_SHIFT;
-       int cpl = ops->cpl(ctxt->vcpu);
-
-       rc = emulate_pop(ctxt, ops, &val, len);
+       rc = ops->read_std(eip_addr, &eip, 2, ctxt->vcpu, &err);
        if (rc != X86EMUL_CONTINUE)
                return rc;
 
-       change_mask = EFLG_CF | EFLG_PF | EFLG_AF | EFLG_ZF | EFLG_SF | EFLG_OF
-               | EFLG_TF | EFLG_DF | EFLG_NT | EFLG_RF | EFLG_AC | EFLG_ID;
-
-       switch(ctxt->mode) {
-       case X86EMUL_MODE_PROT64:
-       case X86EMUL_MODE_PROT32:
-       case X86EMUL_MODE_PROT16:
-               if (cpl == 0)
-                       change_mask |= EFLG_IOPL;
-               if (cpl <= iopl)
-                       change_mask |= EFLG_IF;
-               break;
-       case X86EMUL_MODE_VM86:
-               if (iopl < 3) {
-                       emulate_gp(ctxt, 0);
-                       return X86EMUL_PROPAGATE_FAULT;
-               }
-               change_mask |= EFLG_IF;
-               break;
-       default: /* real mode */
-               change_mask |= (EFLG_IOPL | EFLG_IF);
-               break;
-       }
-
-       *(unsigned long *)dest =
-               (ctxt->eflags & ~change_mask) | (val & change_mask);
-
-       return rc;
-}
-
-static void emulate_push_sreg(struct x86_emulate_ctxt *ctxt,
-                             struct x86_emulate_ops *ops, int seg)
-{
-       struct decode_cache *c = &ctxt->decode;
-
-       c->src.val = ops->get_segment_selector(seg, ctxt->vcpu);
-
-       emulate_push(ctxt, ops);
-}
-
-static int emulate_pop_sreg(struct x86_emulate_ctxt *ctxt,
-                            struct x86_emulate_ops *ops, int seg)
-{
-       struct decode_cache *c = &ctxt->decode;
-       unsigned long selector;
-       int rc;
-
-       rc = emulate_pop(ctxt, ops, &selector, c->op_bytes);
+       rc = load_segment_descriptor(ctxt, ops, cs, VCPU_SREG_CS);
        if (rc != X86EMUL_CONTINUE)
                return rc;
 
-       rc = load_segment_descriptor(ctxt, ops, (u16)selector, seg);
-       return rc;
-}
-
-static int emulate_pusha(struct x86_emulate_ctxt *ctxt,
-                         struct x86_emulate_ops *ops)
-{
-       struct decode_cache *c = &ctxt->decode;
-       unsigned long old_esp = c->regs[VCPU_REGS_RSP];
-       int rc = X86EMUL_CONTINUE;
-       int reg = VCPU_REGS_RAX;
-
-       while (reg <= VCPU_REGS_RDI) {
-               (reg == VCPU_REGS_RSP) ?
-               (c->src.val = old_esp) : (c->src.val = c->regs[reg]);
-
-               emulate_push(ctxt, ops);
-
-               rc = writeback(ctxt, ops);
-               if (rc != X86EMUL_CONTINUE)
-                       return rc;
-
-               ++reg;
-       }
-
-       /* Disable writeback. */
-       c->dst.type = OP_NONE;
+       c->eip = eip;
 
        return rc;
 }
 
-static int emulate_popa(struct x86_emulate_ctxt *ctxt,
-                       struct x86_emulate_ops *ops)
+static int emulate_int(struct x86_emulate_ctxt *ctxt,
+                      struct x86_emulate_ops *ops, int irq)
 {
-       struct decode_cache *c = &ctxt->decode;
-       int rc = X86EMUL_CONTINUE;
-       int reg = VCPU_REGS_RDI;
-
-       while (reg >= VCPU_REGS_RAX) {
-               if (reg == VCPU_REGS_RSP) {
-                       register_address_increment(c, &c->regs[VCPU_REGS_RSP],
-                                                       c->op_bytes);
-                       --reg;
-               }
-
-               rc = emulate_pop(ctxt, ops, &c->regs[reg], c->op_bytes);
-               if (rc != X86EMUL_CONTINUE)
-                       break;
-               --reg;
+       switch(ctxt->mode) {
+       case X86EMUL_MODE_REAL:
+               return emulate_int_real(ctxt, ops, irq);
+       case X86EMUL_MODE_VM86:
+       case X86EMUL_MODE_PROT16:
+       case X86EMUL_MODE_PROT32:
+       case X86EMUL_MODE_PROT64:
+       default:
+               /* Protected mode interrupts unimplemented yet */
+               return X86EMUL_UNHANDLEABLE;
        }
-       return rc;
 }
 
 static int emulate_iret_real(struct x86_emulate_ctxt *ctxt,
@@ -2235,9 +1711,15 @@ static bool emulator_io_permited(struct x86_emulate_ctxt *ctxt,
                                 struct x86_emulate_ops *ops,
                                 u16 port, u16 len)
 {
+       if (ctxt->perm_ok)
+               return true;
+
        if (emulator_bad_iopl(ctxt, ops))
                if (!emulator_io_port_access_allowed(ctxt, ops, port, len))
                        return false;
+
+       ctxt->perm_ok = true;
+
        return true;
 }
 
@@ -2555,88 +2037,662 @@ static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt,
                                         &curr_tss_desc);
        }
 
-       if (reason == TASK_SWITCH_IRET)
-               ctxt->eflags = ctxt->eflags & ~X86_EFLAGS_NT;
+       if (reason == TASK_SWITCH_IRET)
+               ctxt->eflags = ctxt->eflags & ~X86_EFLAGS_NT;
+
+       /* set back link to prev task only if NT bit is set in eflags
+          note that old_tss_sel is not used afetr this point */
+       if (reason != TASK_SWITCH_CALL && reason != TASK_SWITCH_GATE)
+               old_tss_sel = 0xffff;
+
+       if (next_tss_desc.type & 8)
+               ret = task_switch_32(ctxt, ops, tss_selector, old_tss_sel,
+                                    old_tss_base, &next_tss_desc);
+       else
+               ret = task_switch_16(ctxt, ops, tss_selector, old_tss_sel,
+                                    old_tss_base, &next_tss_desc);
+       if (ret != X86EMUL_CONTINUE)
+               return ret;
+
+       if (reason == TASK_SWITCH_CALL || reason == TASK_SWITCH_GATE)
+               ctxt->eflags = ctxt->eflags | X86_EFLAGS_NT;
+
+       if (reason != TASK_SWITCH_IRET) {
+               next_tss_desc.type |= (1 << 1); /* set busy flag */
+               write_segment_descriptor(ctxt, ops, tss_selector,
+                                        &next_tss_desc);
+       }
+
+       ops->set_cr(0,  ops->get_cr(0, ctxt->vcpu) | X86_CR0_TS, ctxt->vcpu);
+       ops->set_cached_descriptor(&next_tss_desc, VCPU_SREG_TR, ctxt->vcpu);
+       ops->set_segment_selector(tss_selector, VCPU_SREG_TR, ctxt->vcpu);
+
+       if (has_error_code) {
+               struct decode_cache *c = &ctxt->decode;
+
+               c->op_bytes = c->ad_bytes = (next_tss_desc.type & 8) ? 4 : 2;
+               c->lock_prefix = 0;
+               c->src.val = (unsigned long) error_code;
+               emulate_push(ctxt, ops);
+       }
+
+       return ret;
+}
+
+int emulator_task_switch(struct x86_emulate_ctxt *ctxt,
+                        u16 tss_selector, int reason,
+                        bool has_error_code, u32 error_code)
+{
+       struct x86_emulate_ops *ops = ctxt->ops;
+       struct decode_cache *c = &ctxt->decode;
+       int rc;
+
+       c->eip = ctxt->eip;
+       c->dst.type = OP_NONE;
+
+       rc = emulator_do_task_switch(ctxt, ops, tss_selector, reason,
+                                    has_error_code, error_code);
+
+       if (rc == X86EMUL_CONTINUE) {
+               rc = writeback(ctxt, ops);
+               if (rc == X86EMUL_CONTINUE)
+                       ctxt->eip = c->eip;
+       }
+
+       return (rc == X86EMUL_UNHANDLEABLE) ? -1 : 0;
+}
+
+static void string_addr_inc(struct x86_emulate_ctxt *ctxt, unsigned long base,
+                           int reg, struct operand *op)
+{
+       struct decode_cache *c = &ctxt->decode;
+       int df = (ctxt->eflags & EFLG_DF) ? -1 : 1;
+
+       register_address_increment(c, &c->regs[reg], df * op->bytes);
+       op->addr.mem = register_address(c,  base, c->regs[reg]);
+}
+
+static int em_push(struct x86_emulate_ctxt *ctxt)
+{
+       emulate_push(ctxt, ctxt->ops);
+       return X86EMUL_CONTINUE;
+}
+
+#define D(_y) { .flags = (_y) }
+#define N    D(0)
+#define G(_f, _g) { .flags = ((_f) | Group), .u.group = (_g) }
+#define GD(_f, _g) { .flags = ((_f) | Group | GroupDual), .u.gdual = (_g) }
+#define I(_f, _e) { .flags = (_f), .u.execute = (_e) }
+
+static struct opcode group1[] = {
+       X7(D(Lock)), N
+};
+
+static struct opcode group1A[] = {
+       D(DstMem | SrcNone | ModRM | Mov | Stack), N, N, N, N, N, N, N,
+};
+
+static struct opcode group3[] = {
+       D(DstMem | SrcImm | ModRM), D(DstMem | SrcImm | ModRM),
+       D(DstMem | SrcNone | ModRM | Lock), D(DstMem | SrcNone | ModRM | Lock),
+       X4(D(Undefined)),
+};
+
+static struct opcode group4[] = {
+       D(ByteOp | DstMem | SrcNone | ModRM | Lock), D(ByteOp | DstMem | SrcNone | ModRM | Lock),
+       N, N, N, N, N, N,
+};
+
+static struct opcode group5[] = {
+       D(DstMem | SrcNone | ModRM | Lock), D(DstMem | SrcNone | ModRM | Lock),
+       D(SrcMem | ModRM | Stack), N,
+       D(SrcMem | ModRM | Stack), D(SrcMemFAddr | ModRM | ImplicitOps),
+       D(SrcMem | ModRM | Stack), N,
+};
+
+static struct group_dual group7 = { {
+       N, N, D(ModRM | SrcMem | Priv), D(ModRM | SrcMem | Priv),
+       D(SrcNone | ModRM | DstMem | Mov), N,
+       D(SrcMem16 | ModRM | Mov | Priv),
+       D(SrcMem | ModRM | ByteOp | Priv | NoAccess),
+}, {
+       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 group8[] = {
+       N, N, N, N,
+       D(DstMem | SrcImmByte | ModRM), D(DstMem | SrcImmByte | ModRM | Lock),
+       D(DstMem | SrcImmByte | ModRM | Lock), D(DstMem | SrcImmByte | ModRM | Lock),
+};
+
+static struct group_dual group9 = { {
+       N, D(DstMem64 | ModRM | Lock), N, N, N, N, N, N,
+}, {
+       N, N, N, N, N, N, N, N,
+} };
+
+static struct opcode opcode_table[256] = {
+       /* 0x00 - 0x07 */
+       D(ByteOp | DstMem | SrcReg | ModRM | Lock), D(DstMem | SrcReg | ModRM | Lock),
+       D(ByteOp | DstReg | SrcMem | ModRM), D(DstReg | SrcMem | ModRM),
+       D(ByteOp | DstAcc | SrcImm), D(DstAcc | SrcImm),
+       D(ImplicitOps | Stack | No64), D(ImplicitOps | Stack | No64),
+       /* 0x08 - 0x0F */
+       D(ByteOp | DstMem | SrcReg | ModRM | Lock), D(DstMem | SrcReg | ModRM | Lock),
+       D(ByteOp | DstReg | SrcMem | ModRM), D(DstReg | SrcMem | ModRM),
+       D(ByteOp | DstAcc | SrcImm), D(DstAcc | SrcImm),
+       D(ImplicitOps | Stack | No64), N,
+       /* 0x10 - 0x17 */
+       D(ByteOp | DstMem | SrcReg | ModRM | Lock), D(DstMem | SrcReg | ModRM | Lock),
+       D(ByteOp | DstReg | SrcMem | ModRM), D(DstReg | SrcMem | ModRM),
+       D(ByteOp | DstAcc | SrcImm), D(DstAcc | SrcImm),
+       D(ImplicitOps | Stack | No64), D(ImplicitOps | Stack | No64),
+       /* 0x18 - 0x1F */
+       D(ByteOp | DstMem | SrcReg | ModRM | Lock), D(DstMem | SrcReg | ModRM | Lock),
+       D(ByteOp | DstReg | SrcMem | ModRM), D(DstReg | SrcMem | ModRM),
+       D(ByteOp | DstAcc | SrcImm), D(DstAcc | SrcImm),
+       D(ImplicitOps | Stack | No64), D(ImplicitOps | Stack | No64),
+       /* 0x20 - 0x27 */
+       D(ByteOp | DstMem | SrcReg | ModRM | Lock), D(DstMem | SrcReg | ModRM | Lock),
+       D(ByteOp | DstReg | SrcMem | ModRM), D(DstReg | SrcMem | ModRM),
+       D(ByteOp | DstAcc | SrcImmByte), D(DstAcc | SrcImm), N, N,
+       /* 0x28 - 0x2F */
+       D(ByteOp | DstMem | SrcReg | ModRM | Lock), D(DstMem | SrcReg | ModRM | Lock),
+       D(ByteOp | DstReg | SrcMem | ModRM), D(DstReg | SrcMem | ModRM),
+       D(ByteOp | DstAcc | SrcImmByte), D(DstAcc | SrcImm), N, N,
+       /* 0x30 - 0x37 */
+       D(ByteOp | DstMem | SrcReg | ModRM | Lock), D(DstMem | SrcReg | ModRM | Lock),
+       D(ByteOp | DstReg | SrcMem | ModRM), D(DstReg | SrcMem | ModRM),
+       D(ByteOp | DstAcc | SrcImmByte), D(DstAcc | SrcImm), N, N,
+       /* 0x38 - 0x3F */
+       D(ByteOp | DstMem | SrcReg | ModRM), D(DstMem | SrcReg | ModRM),
+       D(ByteOp | DstReg | SrcMem | ModRM), D(DstReg | SrcMem | ModRM),
+       D(ByteOp | DstAcc | SrcImm), D(DstAcc | SrcImm),
+       N, N,
+       /* 0x40 - 0x4F */
+       X16(D(DstReg)),
+       /* 0x50 - 0x57 */
+       X8(I(SrcReg | Stack, em_push)),
+       /* 0x58 - 0x5F */
+       X8(D(DstReg | Stack)),
+       /* 0x60 - 0x67 */
+       D(ImplicitOps | Stack | No64), D(ImplicitOps | Stack | No64),
+       N, D(DstReg | SrcMem32 | ModRM | Mov) /* movsxd (x86/64) */ ,
+       N, N, N, N,
+       /* 0x68 - 0x6F */
+       I(SrcImm | Mov | Stack, em_push), N,
+       I(SrcImmByte | Mov | Stack, em_push), N,
+       D(DstDI | ByteOp | Mov | String), D(DstDI | Mov | String), /* insb, insw/insd */
+       D(SrcSI | ByteOp | ImplicitOps | String), D(SrcSI | ImplicitOps | String), /* outsb, outsw/outsd */
+       /* 0x70 - 0x7F */
+       X16(D(SrcImmByte)),
+       /* 0x80 - 0x87 */
+       G(ByteOp | DstMem | SrcImm | ModRM | Group, group1),
+       G(DstMem | SrcImm | ModRM | Group, group1),
+       G(ByteOp | DstMem | SrcImm | ModRM | No64 | Group, group1),
+       G(DstMem | SrcImmByte | ModRM | Group, group1),
+       D(ByteOp | DstMem | SrcReg | ModRM), D(DstMem | SrcReg | ModRM),
+       D(ByteOp | DstMem | SrcReg | ModRM | Lock), D(DstMem | SrcReg | ModRM | Lock),
+       /* 0x88 - 0x8F */
+       D(ByteOp | DstMem | SrcReg | ModRM | Mov), D(DstMem | SrcReg | ModRM | Mov),
+       D(ByteOp | DstReg | SrcMem | ModRM | Mov), D(DstReg | SrcMem | ModRM | Mov),
+       D(DstMem | SrcNone | ModRM | Mov), D(ModRM | SrcMem | NoAccess | DstReg),
+       D(ImplicitOps | SrcMem16 | ModRM), G(0, group1A),
+       /* 0x90 - 0x97 */
+       X8(D(SrcAcc | DstReg)),
+       /* 0x98 - 0x9F */
+       N, N, D(SrcImmFAddr | No64), N,
+       D(ImplicitOps | Stack), D(ImplicitOps | Stack), N, N,
+       /* 0xA0 - 0xA7 */
+       D(ByteOp | DstAcc | SrcMem | Mov | MemAbs), D(DstAcc | SrcMem | Mov | MemAbs),
+       D(ByteOp | DstMem | SrcAcc | Mov | MemAbs), D(DstMem | SrcAcc | Mov | MemAbs),
+       D(ByteOp | SrcSI | DstDI | Mov | String), D(SrcSI | DstDI | Mov | String),
+       D(ByteOp | SrcSI | DstDI | String), D(SrcSI | DstDI | String),
+       /* 0xA8 - 0xAF */
+       D(DstAcc | SrcImmByte | ByteOp), D(DstAcc | SrcImm),
+       D(ByteOp | SrcAcc | DstDI | Mov | String), D(SrcAcc | DstDI | Mov | String),
+       D(ByteOp | SrcSI | DstAcc | Mov | String), D(SrcSI | DstAcc | Mov | String),
+       D(ByteOp | DstDI | String), D(DstDI | String),
+       /* 0xB0 - 0xB7 */
+       X8(D(ByteOp | DstReg | SrcImm | Mov)),
+       /* 0xB8 - 0xBF */
+       X8(D(DstReg | SrcImm | Mov)),
+       /* 0xC0 - 0xC7 */
+       D(ByteOp | DstMem | SrcImm | ModRM), D(DstMem | SrcImmByte | ModRM),
+       N, D(ImplicitOps | Stack), N, N,
+       D(ByteOp | DstMem | SrcImm | ModRM | Mov), D(DstMem | SrcImm | ModRM | Mov),
+       /* 0xC8 - 0xCF */
+       N, N, N, D(ImplicitOps | Stack),
+       D(ImplicitOps), D(SrcImmByte), D(ImplicitOps | No64), D(ImplicitOps),
+       /* 0xD0 - 0xD7 */
+       D(ByteOp | DstMem | SrcOne | ModRM), D(DstMem | SrcOne | ModRM),
+       D(ByteOp | DstMem | SrcImplicit | ModRM), D(DstMem | SrcImplicit | ModRM),
+       N, N, N, N,
+       /* 0xD8 - 0xDF */
+       N, N, N, N, N, N, N, N,
+       /* 0xE0 - 0xE7 */
+       N, N, N, N,
+       D(ByteOp | SrcImmUByte | DstAcc), D(SrcImmUByte | DstAcc),
+       D(ByteOp | SrcImmUByte | DstAcc), D(SrcImmUByte | DstAcc),
+       /* 0xE8 - 0xEF */
+       D(SrcImm | Stack), D(SrcImm | ImplicitOps),
+       D(SrcImmFAddr | No64), D(SrcImmByte | ImplicitOps),
+       D(SrcNone | ByteOp | DstAcc), D(SrcNone | DstAcc),
+       D(SrcNone | ByteOp | DstAcc), D(SrcNone | DstAcc),
+       /* 0xF0 - 0xF7 */
+       N, N, N, N,
+       D(ImplicitOps | Priv), D(ImplicitOps), G(ByteOp, group3), G(0, group3),
+       /* 0xF8 - 0xFF */
+       D(ImplicitOps), D(ImplicitOps), D(ImplicitOps), D(ImplicitOps),
+       D(ImplicitOps), D(ImplicitOps), G(0, group4), G(0, group5),
+};
+
+static struct opcode twobyte_table[256] = {
+       /* 0x00 - 0x0F */
+       N, GD(0, &group7), N, N,
+       N, D(ImplicitOps), D(ImplicitOps | Priv), N,
+       D(ImplicitOps | Priv), D(ImplicitOps | Priv), N, N,
+       N, D(ImplicitOps | ModRM), N, N,
+       /* 0x10 - 0x1F */
+       N, N, N, N, N, N, N, N, D(ImplicitOps | ModRM), N, N, N, N, N, N, N,
+       /* 0x20 - 0x2F */
+       D(ModRM | DstMem | Priv | Op3264), D(ModRM | DstMem | Priv | Op3264),
+       D(ModRM | SrcMem | Priv | Op3264), D(ModRM | SrcMem | Priv | Op3264),
+       N, N, N, N,
+       N, N, N, N, N, N, N, N,
+       /* 0x30 - 0x3F */
+       D(ImplicitOps | Priv), N, D(ImplicitOps | Priv), N,
+       D(ImplicitOps), D(ImplicitOps | Priv), N, N,
+       N, N, N, N, N, N, N, N,
+       /* 0x40 - 0x4F */
+       X16(D(DstReg | SrcMem | ModRM | Mov)),
+       /* 0x50 - 0x5F */
+       N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, N,
+       /* 0x60 - 0x6F */
+       N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, N,
+       /* 0x70 - 0x7F */
+       N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, N,
+       /* 0x80 - 0x8F */
+       X16(D(SrcImm)),
+       /* 0x90 - 0x9F */
+       N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, N,
+       /* 0xA0 - 0xA7 */
+       D(ImplicitOps | Stack), D(ImplicitOps | Stack),
+       N, D(DstMem | SrcReg | ModRM | BitOp),
+       D(DstMem | SrcReg | Src2ImmByte | ModRM),
+       D(DstMem | SrcReg | Src2CL | ModRM), N, N,
+       /* 0xA8 - 0xAF */
+       D(ImplicitOps | Stack), D(ImplicitOps | Stack),
+       N, D(DstMem | SrcReg | ModRM | BitOp | Lock),
+       D(DstMem | SrcReg | Src2ImmByte | ModRM),
+       D(DstMem | SrcReg | Src2CL | ModRM),
+       D(ModRM), N,
+       /* 0xB0 - 0xB7 */
+       D(ByteOp | DstMem | SrcReg | ModRM | Lock), D(DstMem | SrcReg | ModRM | Lock),
+       N, D(DstMem | SrcReg | ModRM | BitOp | Lock),
+       N, N, D(ByteOp | DstReg | SrcMem | ModRM | Mov),
+           D(DstReg | SrcMem16 | ModRM | Mov),
+       /* 0xB8 - 0xBF */
+       N, N,
+       G(0, group8), D(DstMem | SrcReg | ModRM | BitOp | Lock),
+       N, N, D(ByteOp | DstReg | SrcMem | ModRM | Mov),
+           D(DstReg | SrcMem16 | ModRM | Mov),
+       /* 0xC0 - 0xCF */
+       N, N, N, D(DstMem | SrcReg | ModRM | Mov),
+       N, N, N, GD(0, &group9),
+       N, N, N, N, N, N, N, N,
+       /* 0xD0 - 0xDF */
+       N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, N,
+       /* 0xE0 - 0xEF */
+       N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, N,
+       /* 0xF0 - 0xFF */
+       N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, N
+};
+
+#undef D
+#undef N
+#undef G
+#undef GD
+#undef I
+
+int
+x86_decode_insn(struct x86_emulate_ctxt *ctxt)
+{
+       struct x86_emulate_ops *ops = ctxt->ops;
+       struct decode_cache *c = &ctxt->decode;
+       int rc = X86EMUL_CONTINUE;
+       int mode = ctxt->mode;
+       int def_op_bytes, def_ad_bytes, dual, goffset;
+       struct opcode opcode, *g_mod012, *g_mod3;
+       struct operand memop = { .type = OP_NONE };
+
+       /* we cannot decode insn before we complete previous rep insn */
+       WARN_ON(ctxt->restart);
+
+       c->eip = ctxt->eip;
+       c->fetch.start = c->fetch.end = c->eip;
+       ctxt->cs_base = seg_base(ctxt, ops, VCPU_SREG_CS);
+
+       switch (mode) {
+       case X86EMUL_MODE_REAL:
+       case X86EMUL_MODE_VM86:
+       case X86EMUL_MODE_PROT16:
+               def_op_bytes = def_ad_bytes = 2;
+               break;
+       case X86EMUL_MODE_PROT32:
+               def_op_bytes = def_ad_bytes = 4;
+               break;
+#ifdef CONFIG_X86_64
+       case X86EMUL_MODE_PROT64:
+               def_op_bytes = 4;
+               def_ad_bytes = 8;
+               break;
+#endif
+       default:
+               return -1;
+       }
+
+       c->op_bytes = def_op_bytes;
+       c->ad_bytes = def_ad_bytes;
+
+       /* Legacy prefixes. */
+       for (;;) {
+               switch (c->b = insn_fetch(u8, 1, c->eip)) {
+               case 0x66:      /* operand-size override */
+                       /* switch between 2/4 bytes */
+                       c->op_bytes = def_op_bytes ^ 6;
+                       break;
+               case 0x67:      /* address-size override */
+                       if (mode == X86EMUL_MODE_PROT64)
+                               /* switch between 4/8 bytes */
+                               c->ad_bytes = def_ad_bytes ^ 12;
+                       else
+                               /* switch between 2/4 bytes */
+                               c->ad_bytes = def_ad_bytes ^ 6;
+                       break;
+               case 0x26:      /* ES override */
+               case 0x2e:      /* CS override */
+               case 0x36:      /* SS override */
+               case 0x3e:      /* DS override */
+                       set_seg_override(c, (c->b >> 3) & 3);
+                       break;
+               case 0x64:      /* FS override */
+               case 0x65:      /* GS override */
+                       set_seg_override(c, c->b & 7);
+                       break;
+               case 0x40 ... 0x4f: /* REX */
+                       if (mode != X86EMUL_MODE_PROT64)
+                               goto done_prefixes;
+                       c->rex_prefix = c->b;
+                       continue;
+               case 0xf0:      /* LOCK */
+                       c->lock_prefix = 1;
+                       break;
+               case 0xf2:      /* REPNE/REPNZ */
+                       c->rep_prefix = REPNE_PREFIX;
+                       break;
+               case 0xf3:      /* REP/REPE/REPZ */
+                       c->rep_prefix = REPE_PREFIX;
+                       break;
+               default:
+                       goto done_prefixes;
+               }
+
+               /* Any legacy prefix after a REX prefix nullifies its effect. */
+
+               c->rex_prefix = 0;
+       }
+
+done_prefixes:
+
+       /* REX prefix. */
+       if (c->rex_prefix & 8)
+               c->op_bytes = 8;        /* REX.W */
+
+       /* Opcode byte(s). */
+       opcode = opcode_table[c->b];
+       /* Two-byte opcode? */
+       if (c->b == 0x0f) {
+               c->twobyte = 1;
+               c->b = insn_fetch(u8, 1, c->eip);
+               opcode = twobyte_table[c->b];
+       }
+       c->d = opcode.flags;
+
+       if (c->d & Group) {
+               dual = c->d & GroupDual;
+               c->modrm = insn_fetch(u8, 1, c->eip);
+               --c->eip;
 
-       /* set back link to prev task only if NT bit is set in eflags
-          note that old_tss_sel is not used afetr this point */
-       if (reason != TASK_SWITCH_CALL && reason != TASK_SWITCH_GATE)
-               old_tss_sel = 0xffff;
+               if (c->d & GroupDual) {
+                       g_mod012 = opcode.u.gdual->mod012;
+                       g_mod3 = opcode.u.gdual->mod3;
+               } else
+                       g_mod012 = g_mod3 = opcode.u.group;
 
-       if (next_tss_desc.type & 8)
-               ret = task_switch_32(ctxt, ops, tss_selector, old_tss_sel,
-                                    old_tss_base, &next_tss_desc);
-       else
-               ret = task_switch_16(ctxt, ops, tss_selector, old_tss_sel,
-                                    old_tss_base, &next_tss_desc);
-       if (ret != X86EMUL_CONTINUE)
-               return ret;
+               c->d &= ~(Group | GroupDual);
 
-       if (reason == TASK_SWITCH_CALL || reason == TASK_SWITCH_GATE)
-               ctxt->eflags = ctxt->eflags | X86_EFLAGS_NT;
+               goffset = (c->modrm >> 3) & 7;
 
-       if (reason != TASK_SWITCH_IRET) {
-               next_tss_desc.type |= (1 << 1); /* set busy flag */
-               write_segment_descriptor(ctxt, ops, tss_selector,
-                                        &next_tss_desc);
+               if ((c->modrm >> 6) == 3)
+                       opcode = g_mod3[goffset];
+               else
+                       opcode = g_mod012[goffset];
+               c->d |= opcode.flags;
        }
 
-       ops->set_cr(0,  ops->get_cr(0, ctxt->vcpu) | X86_CR0_TS, ctxt->vcpu);
-       ops->set_cached_descriptor(&next_tss_desc, VCPU_SREG_TR, ctxt->vcpu);
-       ops->set_segment_selector(tss_selector, VCPU_SREG_TR, ctxt->vcpu);
+       c->execute = opcode.u.execute;
 
-       if (has_error_code) {
-               struct decode_cache *c = &ctxt->decode;
+       /* Unrecognised? */
+       if (c->d == 0 || (c->d & Undefined)) {
+               DPRINTF("Cannot emulate %02x\n", c->b);
+               return -1;
+       }
 
-               c->op_bytes = c->ad_bytes = (next_tss_desc.type & 8) ? 4 : 2;
-               c->lock_prefix = 0;
-               c->src.val = (unsigned long) error_code;
-               emulate_push(ctxt, ops);
+       if (mode == X86EMUL_MODE_PROT64 && (c->d & Stack))
+               c->op_bytes = 8;
+
+       if (c->d & Op3264) {
+               if (mode == X86EMUL_MODE_PROT64)
+                       c->op_bytes = 8;
+               else
+                       c->op_bytes = 4;
        }
 
-       return ret;
-}
+       /* ModRM and SIB bytes. */
+       if (c->d & ModRM) {
+               rc = decode_modrm(ctxt, ops, &memop);
+               if (!c->has_seg_override)
+                       set_seg_override(c, c->modrm_seg);
+       } else if (c->d & MemAbs)
+               rc = decode_abs(ctxt, ops, &memop);
+       if (rc != X86EMUL_CONTINUE)
+               goto done;
 
-int emulator_task_switch(struct x86_emulate_ctxt *ctxt,
-                        struct x86_emulate_ops *ops,
-                        u16 tss_selector, int reason,
-                        bool has_error_code, u32 error_code)
-{
-       struct decode_cache *c = &ctxt->decode;
-       int rc;
+       if (!c->has_seg_override)
+               set_seg_override(c, VCPU_SREG_DS);
 
-       c->eip = ctxt->eip;
-       c->dst.type = OP_NONE;
+       if (memop.type == OP_MEM && !(!c->twobyte && c->b == 0x8d))
+               memop.addr.mem += seg_override_base(ctxt, ops, c);
 
-       rc = emulator_do_task_switch(ctxt, ops, tss_selector, reason,
-                                    has_error_code, error_code);
+       if (memop.type == OP_MEM && c->ad_bytes != 8)
+               memop.addr.mem = (u32)memop.addr.mem;
 
-       if (rc == X86EMUL_CONTINUE) {
-               rc = writeback(ctxt, ops);
-               if (rc == X86EMUL_CONTINUE)
-                       ctxt->eip = c->eip;
+       if (memop.type == OP_MEM && c->rip_relative)
+               memop.addr.mem += c->eip;
+
+       /*
+        * Decode and fetch the source operand: register, memory
+        * or immediate.
+        */
+       switch (c->d & SrcMask) {
+       case SrcNone:
+               break;
+       case SrcReg:
+               decode_register_operand(&c->src, c, 0);
+               break;
+       case SrcMem16:
+               memop.bytes = 2;
+               goto srcmem_common;
+       case SrcMem32:
+               memop.bytes = 4;
+               goto srcmem_common;
+       case SrcMem:
+               memop.bytes = (c->d & ByteOp) ? 1 :
+                                                          c->op_bytes;
+       srcmem_common:
+               c->src = memop;
+               break;
+       case SrcImm:
+       case SrcImmU:
+               c->src.type = OP_IMM;
+               c->src.addr.mem = c->eip;
+               c->src.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
+               if (c->src.bytes == 8)
+                       c->src.bytes = 4;
+               /* NB. Immediates are sign-extended as necessary. */
+               switch (c->src.bytes) {
+               case 1:
+                       c->src.val = insn_fetch(s8, 1, c->eip);
+                       break;
+               case 2:
+                       c->src.val = insn_fetch(s16, 2, c->eip);
+                       break;
+               case 4:
+                       c->src.val = insn_fetch(s32, 4, c->eip);
+                       break;
+               }
+               if ((c->d & SrcMask) == SrcImmU) {
+                       switch (c->src.bytes) {
+                       case 1:
+                               c->src.val &= 0xff;
+                               break;
+                       case 2:
+                               c->src.val &= 0xffff;
+                               break;
+                       case 4:
+                               c->src.val &= 0xffffffff;
+                               break;
+                       }
+               }
+               break;
+       case SrcImmByte:
+       case SrcImmUByte:
+               c->src.type = OP_IMM;
+               c->src.addr.mem = c->eip;
+               c->src.bytes = 1;
+               if ((c->d & SrcMask) == SrcImmByte)
+                       c->src.val = insn_fetch(s8, 1, c->eip);
+               else
+                       c->src.val = insn_fetch(u8, 1, c->eip);
+               break;
+       case SrcAcc:
+               c->src.type = OP_REG;
+               c->src.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
+               c->src.addr.reg = &c->regs[VCPU_REGS_RAX];
+               fetch_register_operand(&c->src);
+               break;
+       case SrcOne:
+               c->src.bytes = 1;
+               c->src.val = 1;
+               break;
+       case SrcSI:
+               c->src.type = OP_MEM;
+               c->src.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
+               c->src.addr.mem =
+                       register_address(c,  seg_override_base(ctxt, ops, c),
+                                        c->regs[VCPU_REGS_RSI]);
+               c->src.val = 0;
+               break;
+       case SrcImmFAddr:
+               c->src.type = OP_IMM;
+               c->src.addr.mem = c->eip;
+               c->src.bytes = c->op_bytes + 2;
+               insn_fetch_arr(c->src.valptr, c->src.bytes, c->eip);
+               break;
+       case SrcMemFAddr:
+               memop.bytes = c->op_bytes + 2;
+               goto srcmem_common;
+               break;
        }
 
-       return (rc == X86EMUL_UNHANDLEABLE) ? -1 : 0;
-}
+       /*
+        * Decode and fetch the second source operand: register, memory
+        * or immediate.
+        */
+       switch (c->d & Src2Mask) {
+       case Src2None:
+               break;
+       case Src2CL:
+               c->src2.bytes = 1;
+               c->src2.val = c->regs[VCPU_REGS_RCX] & 0x8;
+               break;
+       case Src2ImmByte:
+               c->src2.type = OP_IMM;
+               c->src2.addr.mem = c->eip;
+               c->src2.bytes = 1;
+               c->src2.val = insn_fetch(u8, 1, c->eip);
+               break;
+       case Src2One:
+               c->src2.bytes = 1;
+               c->src2.val = 1;
+               break;
+       }
 
-static void string_addr_inc(struct x86_emulate_ctxt *ctxt, unsigned long base,
-                           int reg, struct operand *op)
-{
-       struct decode_cache *c = &ctxt->decode;
-       int df = (ctxt->eflags & EFLG_DF) ? -1 : 1;
+       /* Decode and fetch the destination operand: register or memory. */
+       switch (c->d & DstMask) {
+       case DstReg:
+               decode_register_operand(&c->dst, c,
+                        c->twobyte && (c->b == 0xb6 || c->b == 0xb7));
+               break;
+       case DstMem:
+       case DstMem64:
+               c->dst = memop;
+               if ((c->d & DstMask) == DstMem64)
+                       c->dst.bytes = 8;
+               else
+                       c->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
+               if (c->d & BitOp)
+                       fetch_bit_operand(c);
+               c->dst.orig_val = c->dst.val;
+               break;
+       case DstAcc:
+               c->dst.type = OP_REG;
+               c->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
+               c->dst.addr.reg = &c->regs[VCPU_REGS_RAX];
+               fetch_register_operand(&c->dst);
+               c->dst.orig_val = c->dst.val;
+               break;
+       case DstDI:
+               c->dst.type = OP_MEM;
+               c->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
+               c->dst.addr.mem =
+                       register_address(c, es_base(ctxt, ops),
+                                        c->regs[VCPU_REGS_RDI]);
+               c->dst.val = 0;
+               break;
+       case ImplicitOps:
+               /* Special instructions do their own operand decoding. */
+       default:
+               c->dst.type = OP_NONE; /* Disable writeback. */
+               return 0;
+       }
 
-       register_address_increment(c, &c->regs[reg], df * op->bytes);
-       op->ptr = (unsigned long *)register_address(c,  base, c->regs[reg]);
+done:
+       return (rc == X86EMUL_UNHANDLEABLE) ? -1 : 0;
 }
 
 int
-x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
+x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
 {
+       struct x86_emulate_ops *ops = ctxt->ops;
        u64 msr_data;
        struct decode_cache *c = &ctxt->decode;
        int rc = X86EMUL_CONTINUE;
        int saved_dst_type = c->dst.type;
+       int irq; /* Used for int 3, int, and into */
 
        ctxt->decode.mem_read.pos = 0;
 
@@ -2686,15 +2742,19 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
        }
 
        if (c->src.type == OP_MEM) {
-               rc = read_emulated(ctxt, ops, (unsigned long)c->src.ptr,
+               if (c->d & NoAccess)
+                       goto no_fetch;
+               rc = read_emulated(ctxt, ops, c->src.addr.mem,
                                        c->src.valptr, c->src.bytes);
                if (rc != X86EMUL_CONTINUE)
                        goto done;
                c->src.orig_val64 = c->src.val64;
+       no_fetch:
+               ;
        }
 
        if (c->src2.type == OP_MEM) {
-               rc = read_emulated(ctxt, ops, (unsigned long)c->src2.ptr,
+               rc = read_emulated(ctxt, ops, c->src2.addr.mem,
                                        &c->src2.val, c->src2.bytes);
                if (rc != X86EMUL_CONTINUE)
                        goto done;
@@ -2706,7 +2766,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
 
        if ((c->dst.type == OP_MEM) && !(c->d & Mov)) {
                /* optimisation - avoid slow emulated read if Mov */
-               rc = read_emulated(ctxt, ops, (unsigned long)c->dst.ptr,
+               rc = read_emulated(ctxt, ops, c->dst.addr.mem,
                                   &c->dst.val, c->dst.bytes);
                if (rc != X86EMUL_CONTINUE)
                        goto done;
@@ -2715,6 +2775,13 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
 
 special_insn:
 
+       if (c->execute) {
+               rc = c->execute(ctxt);
+               if (rc != X86EMUL_CONTINUE)
+                       goto done;
+               goto writeback;
+       }
+
        if (c->twobyte)
                goto twobyte_insn;
 
@@ -2784,9 +2851,6 @@ special_insn:
        case 0x48 ... 0x4f: /* dec r16/r32 */
                emulate_1op("dec", c->dst, ctxt->eflags);
                break;
-       case 0x50 ... 0x57:  /* push reg */
-               emulate_push(ctxt, ops);
-               break;
        case 0x58 ... 0x5f: /* pop reg */
        pop_instruction:
                rc = emulate_pop(ctxt, ops, &c->dst.val, c->op_bytes);
@@ -2808,10 +2872,6 @@ special_insn:
                        goto cannot_emulate;
                c->dst.val = (s32) c->src.val;
                break;
-       case 0x68: /* push imm */
-       case 0x6a: /* push imm8 */
-               emulate_push(ctxt, ops);
-               break;
        case 0x6c:              /* insb */
        case 0x6d:              /* insw/insd */
                c->dst.bytes = min(c->dst.bytes, 4u);
@@ -2870,16 +2930,16 @@ special_insn:
                /* Write back the register source. */
                switch (c->dst.bytes) {
                case 1:
-                       *(u8 *) c->src.ptr = (u8) c->dst.val;
+                       *(u8 *) c->src.addr.reg = (u8) c->dst.val;
                        break;
                case 2:
-                       *(u16 *) c->src.ptr = (u16) c->dst.val;
+                       *(u16 *) c->src.addr.reg = (u16) c->dst.val;
                        break;
                case 4:
-                       *c->src.ptr = (u32) c->dst.val;
+                       *c->src.addr.reg = (u32) c->dst.val;
                        break;  /* 64b reg: zero-extend */
                case 8:
-                       *c->src.ptr = c->dst.val;
+                       *c->src.addr.reg = c->dst.val;
                        break;
                }
                /*
@@ -2899,7 +2959,7 @@ special_insn:
                c->dst.val = ops->get_segment_selector(c->modrm_reg, ctxt->vcpu);
                break;
        case 0x8d: /* lea r16/r32, m */
-               c->dst.val = c->modrm_ea;
+               c->dst.val = c->src.addr.mem;
                break;
        case 0x8e: { /* mov seg, r/m16 */
                uint16_t sel;
@@ -2925,16 +2985,9 @@ special_insn:
                if (rc != X86EMUL_CONTINUE)
                        goto done;
                break;
-       case 0x90: /* nop / xchg r8,rax */
-               if (c->dst.ptr == (unsigned long *)&c->regs[VCPU_REGS_RAX]) {
-                       c->dst.type = OP_NONE;  /* nop */
+       case 0x90 ... 0x97: /* nop / xchg reg, rax */
+               if (c->dst.addr.reg == &c->regs[VCPU_REGS_RAX])
                        break;
-               }
-       case 0x91 ... 0x97: /* xchg reg,rax */
-               c->src.type = OP_REG;
-               c->src.bytes = c->op_bytes;
-               c->src.ptr = (unsigned long *) &c->regs[VCPU_REGS_RAX];
-               c->src.val = *(c->src.ptr);
                goto xchg;
        case 0x9c: /* pushf */
                c->src.val =  (unsigned long) ctxt->eflags;
@@ -2942,7 +2995,7 @@ special_insn:
                break;
        case 0x9d: /* popf */
                c->dst.type = OP_REG;
-               c->dst.ptr = (unsigned long *) &ctxt->eflags;
+               c->dst.addr.reg = &ctxt->eflags;
                c->dst.bytes = c->op_bytes;
                rc = emulate_popf(ctxt, ops, &c->dst.val, c->op_bytes);
                if (rc != X86EMUL_CONTINUE)
@@ -2953,13 +3006,11 @@ special_insn:
                goto mov;
        case 0xa6 ... 0xa7:     /* cmps */
                c->dst.type = OP_NONE; /* Disable writeback. */
-               DPRINTF("cmps: mem1=0x%p mem2=0x%p\n", c->src.ptr, c->dst.ptr);
+               DPRINTF("cmps: mem1=0x%p mem2=0x%p\n", c->src.addr.mem, c->dst.addr.mem);
                goto cmp;
        case 0xa8 ... 0xa9:     /* test ax, imm */
                goto test;
        case 0xaa ... 0xab:     /* stos */
-               c->dst.val = c->regs[VCPU_REGS_RAX];
-               break;
        case 0xac ... 0xad:     /* lods */
                goto mov;
        case 0xae ... 0xaf:     /* scas */
@@ -2972,7 +3023,7 @@ special_insn:
                break;
        case 0xc3: /* ret */
                c->dst.type = OP_REG;
-               c->dst.ptr = &c->eip;
+               c->dst.addr.reg = &c->eip;
                c->dst.bytes = c->op_bytes;
                goto pop_instruction;
        case 0xc6 ... 0xc7:     /* mov (sole member of Grp11) */
@@ -2984,6 +3035,22 @@ special_insn:
                if (rc != X86EMUL_CONTINUE)
                        goto done;
                break;
+       case 0xcc:              /* int3 */
+               irq = 3;
+               goto do_interrupt;
+       case 0xcd:              /* int n */
+               irq = c->src.val;
+       do_interrupt:
+               rc = emulate_int(ctxt, ops, irq);
+               if (rc != X86EMUL_CONTINUE)
+                       goto done;
+               break;
+       case 0xce:              /* into */
+               if (ctxt->eflags & EFLG_OF) {
+                       irq = 4;
+                       goto do_interrupt;
+               }
+               break;
        case 0xcf:              /* iret */
                rc = emulate_iret(ctxt, ops);
 
@@ -2991,7 +3058,6 @@ special_insn:
                        goto done;
                break;
        case 0xd0 ... 0xd1:     /* Grp2 */
-               c->src.val = 1;
                emulate_grp2(ctxt);
                break;
        case 0xd2 ... 0xd3:     /* Grp2 */
@@ -3062,7 +3128,6 @@ special_insn:
        case 0xf5:      /* cmc */
                /* complement carry flag from eflags reg */
                ctxt->eflags ^= EFLG_CF;
-               c->dst.type = OP_NONE;  /* Disable writeback. */
                break;
        case 0xf6 ... 0xf7:     /* Grp3 */
                if (!emulate_grp3(ctxt, ops))
@@ -3070,16 +3135,16 @@ special_insn:
                break;
        case 0xf8: /* clc */
                ctxt->eflags &= ~EFLG_CF;
-               c->dst.type = OP_NONE;  /* Disable writeback. */
+               break;
+       case 0xf9: /* stc */
+               ctxt->eflags |= EFLG_CF;
                break;
        case 0xfa: /* cli */
                if (emulator_bad_iopl(ctxt, ops)) {
                        emulate_gp(ctxt, 0);
                        goto done;
-               } else {
+               } else
                        ctxt->eflags &= ~X86_EFLAGS_IF;
-                       c->dst.type = OP_NONE;  /* Disable writeback. */
-               }
                break;
        case 0xfb: /* sti */
                if (emulator_bad_iopl(ctxt, ops)) {
@@ -3088,16 +3153,13 @@ special_insn:
                } else {
                        ctxt->interruptibility = KVM_X86_SHADOW_INT_STI;
                        ctxt->eflags |= X86_EFLAGS_IF;
-                       c->dst.type = OP_NONE;  /* Disable writeback. */
                }
                break;
        case 0xfc: /* cld */
                ctxt->eflags &= ~EFLG_DF;
-               c->dst.type = OP_NONE;  /* Disable writeback. */
                break;
        case 0xfd: /* std */
                ctxt->eflags |= EFLG_DF;
-               c->dst.type = OP_NONE;  /* Disable writeback. */
                break;
        case 0xfe: /* Grp4 */
        grp45:
@@ -3174,7 +3236,7 @@ twobyte_insn:
                        c->dst.type = OP_NONE;
                        break;
                case 2: /* lgdt */
-                       rc = read_descriptor(ctxt, ops, c->src.ptr,
+                       rc = read_descriptor(ctxt, ops, c->src.addr.mem,
                                             &size, &address, c->op_bytes);
                        if (rc != X86EMUL_CONTINUE)
                                goto done;
@@ -3194,7 +3256,7 @@ twobyte_insn:
                                        goto cannot_emulate;
                                }
                        } else {
-                               rc = read_descriptor(ctxt, ops, c->src.ptr,
+                               rc = read_descriptor(ctxt, ops, c->src.addr.mem,
                                                     &size, &address,
                                                     c->op_bytes);
                                if (rc != X86EMUL_CONTINUE)
@@ -3209,7 +3271,7 @@ twobyte_insn:
                        c->dst.val = ops->get_cr(0, ctxt->vcpu);
                        break;
                case 6: /* lmsw */
-                       ops->set_cr(0, (ops->get_cr(0, ctxt->vcpu) & ~0x0ful) |
+                       ops->set_cr(0, (ops->get_cr(0, ctxt->vcpu) & ~0x0eul) |
                                    (c->src.val & 0x0f), ctxt->vcpu);
                        c->dst.type = OP_NONE;
                        break;
@@ -3217,7 +3279,7 @@ twobyte_insn:
                        emulate_ud(ctxt);
                        goto done;
                case 7: /* invlpg*/
-                       emulate_invlpg(ctxt->vcpu, c->modrm_ea);
+                       emulate_invlpg(ctxt->vcpu, c->src.addr.mem);
                        /* Disable writeback. */
                        c->dst.type = OP_NONE;
                        break;
@@ -3234,16 +3296,13 @@ twobyte_insn:
                break;
        case 0x06:
                emulate_clts(ctxt->vcpu);
-               c->dst.type = OP_NONE;
                break;
        case 0x09:              /* wbinvd */
                kvm_emulate_wbinvd(ctxt->vcpu);
-               c->dst.type = OP_NONE;
                break;
        case 0x08:              /* invd */
        case 0x0d:              /* GrpP (prefetch) */
        case 0x18:              /* Grp16 (prefetch/nop) */
-               c->dst.type = OP_NONE;
                break;
        case 0x20: /* mov cr, reg */
                switch (c->modrm_reg) {
@@ -3253,8 +3312,7 @@ twobyte_insn:
                        emulate_ud(ctxt);
                        goto done;
                }
-               c->regs[c->modrm_rm] = ops->get_cr(c->modrm_reg, ctxt->vcpu);
-               c->dst.type = OP_NONE;  /* no writeback */
+               c->dst.val = ops->get_cr(c->modrm_reg, ctxt->vcpu);
                break;
        case 0x21: /* mov from dr to reg */
                if ((ops->get_cr(4, ctxt->vcpu) & X86_CR4_DE) &&
@@ -3262,11 +3320,10 @@ twobyte_insn:
                        emulate_ud(ctxt);
                        goto done;
                }
-               ops->get_dr(c->modrm_reg, &c->regs[c->modrm_rm], ctxt->vcpu);
-               c->dst.type = OP_NONE;  /* no writeback */
+               ops->get_dr(c->modrm_reg, &c->dst.val, ctxt->vcpu);
                break;
        case 0x22: /* mov reg, cr */
-               if (ops->set_cr(c->modrm_reg, c->modrm_val, ctxt->vcpu)) {
+               if (ops->set_cr(c->modrm_reg, c->src.val, ctxt->vcpu)) {
                        emulate_gp(ctxt, 0);
                        goto done;
                }
@@ -3279,7 +3336,7 @@ twobyte_insn:
                        goto done;
                }
 
-               if (ops->set_dr(c->modrm_reg, c->regs[c->modrm_rm] &
+               if (ops->set_dr(c->modrm_reg, c->src.val &
                                ((ctxt->mode == X86EMUL_MODE_PROT64) ?
                                 ~0ULL : ~0U), ctxt->vcpu) < 0) {
                        /* #UD condition is already handled by the code above */
@@ -3298,7 +3355,6 @@ twobyte_insn:
                        goto done;
                }
                rc = X86EMUL_CONTINUE;
-               c->dst.type = OP_NONE;
                break;
        case 0x32:
                /* rdmsr */
@@ -3310,7 +3366,6 @@ twobyte_insn:
                        c->regs[VCPU_REGS_RDX] = msr_data >> 32;
                }
                rc = X86EMUL_CONTINUE;
-               c->dst.type = OP_NONE;
                break;
        case 0x34:              /* sysenter */
                rc = emulate_sysenter(ctxt, ops);
@@ -3334,7 +3389,6 @@ twobyte_insn:
        case 0x80 ... 0x8f: /* jnz rel, etc*/
                if (test_cc(c->b, ctxt->eflags))
                        jmp_rel(c, c->src.val);
-               c->dst.type = OP_NONE;
                break;
        case 0xa0:        /* push fs */
                emulate_push_sreg(ctxt, ops, VCPU_SREG_FS);
@@ -3389,7 +3443,7 @@ twobyte_insn:
                } else {
                        /* Failure: write the value we saw to EAX. */
                        c->dst.type = OP_REG;
-                       c->dst.ptr = (unsigned long *)&c->regs[VCPU_REGS_RAX];
+                       c->dst.addr.reg = (unsigned long *)&c->regs[VCPU_REGS_RAX];
                }
                break;
        case 0xb3: