KVM: x86 emulator: push segment override out of decode_modrm()
[cascardo/linux.git] / arch / x86 / kvm / emulate.c
index 65d8960..471f12a 100644 (file)
@@ -51,7 +51,7 @@
 #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 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)
@@ -82,8 +82,8 @@
 #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   0xff        /* Group number stored in bits 0:7 */
 /* Misc flags */
+#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 No64       (1<<28)
 #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 {
-       Group1_80, Group1_81, Group1_82, Group1_83,
-       Group1A, Group3_Byte, Group3, Group4, Group5, 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;
 };
 
-static u32 opcode_table[256] = {
-       /* 0x00 - 0x07 */
-       ByteOp | DstMem | SrcReg | ModRM | Lock, DstMem | SrcReg | ModRM | Lock,
-       ByteOp | DstReg | SrcMem | ModRM, DstReg | SrcMem | ModRM,
-       ByteOp | DstAcc | SrcImm, DstAcc | SrcImm,
-       ImplicitOps | Stack | No64, ImplicitOps | Stack | No64,
-       /* 0x08 - 0x0F */
-       ByteOp | DstMem | SrcReg | ModRM | Lock, DstMem | SrcReg | ModRM | Lock,
-       ByteOp | DstReg | SrcMem | ModRM, DstReg | SrcMem | ModRM,
-       ByteOp | DstAcc | SrcImm, DstAcc | SrcImm,
-       ImplicitOps | Stack | No64, 0,
-       /* 0x10 - 0x17 */
-       ByteOp | DstMem | SrcReg | ModRM | Lock, DstMem | SrcReg | ModRM | Lock,
-       ByteOp | DstReg | SrcMem | ModRM, DstReg | SrcMem | ModRM,
-       ByteOp | DstAcc | SrcImm, DstAcc | SrcImm,
-       ImplicitOps | Stack | No64, ImplicitOps | Stack | No64,
-       /* 0x18 - 0x1F */
-       ByteOp | DstMem | SrcReg | ModRM | Lock, DstMem | SrcReg | ModRM | Lock,
-       ByteOp | DstReg | SrcMem | ModRM, DstReg | SrcMem | ModRM,
-       ByteOp | DstAcc | SrcImm, DstAcc | SrcImm,
-       ImplicitOps | Stack | No64, ImplicitOps | Stack | No64,
-       /* 0x20 - 0x27 */
-       ByteOp | DstMem | SrcReg | ModRM | Lock, DstMem | SrcReg | ModRM | Lock,
-       ByteOp | DstReg | SrcMem | ModRM, DstReg | SrcMem | ModRM,
-       ByteOp | DstAcc | SrcImmByte, DstAcc | SrcImm, 0, 0,
-       /* 0x28 - 0x2F */
-       ByteOp | DstMem | SrcReg | ModRM | Lock, DstMem | SrcReg | ModRM | Lock,
-       ByteOp | DstReg | SrcMem | ModRM, DstReg | SrcMem | ModRM,
-       ByteOp | DstAcc | SrcImmByte, DstAcc | SrcImm, 0, 0,
-       /* 0x30 - 0x37 */
-       ByteOp | DstMem | SrcReg | ModRM | Lock, DstMem | SrcReg | ModRM | Lock,
-       ByteOp | DstReg | SrcMem | ModRM, DstReg | SrcMem | ModRM,
-       ByteOp | DstAcc | SrcImmByte, DstAcc | SrcImm, 0, 0,
-       /* 0x38 - 0x3F */
-       ByteOp | DstMem | SrcReg | ModRM, DstMem | SrcReg | ModRM,
-       ByteOp | DstReg | SrcMem | ModRM, DstReg | SrcMem | ModRM,
-       ByteOp | DstAcc | SrcImm, DstAcc | SrcImm,
-       0, 0,
-       /* 0x40 - 0x4F */
-       X16(DstReg),
-       /* 0x50 - 0x57 */
-       SrcReg | Stack, SrcReg | Stack, SrcReg | Stack, SrcReg | Stack,
-       SrcReg | Stack, SrcReg | Stack, SrcReg | Stack, SrcReg | Stack,
-       /* 0x58 - 0x5F */
-       DstReg | Stack, DstReg | Stack, DstReg | Stack, DstReg | Stack,
-       DstReg | Stack, DstReg | Stack, DstReg | Stack, DstReg | Stack,
-       /* 0x60 - 0x67 */
-       ImplicitOps | Stack | No64, ImplicitOps | Stack | No64,
-       0, DstReg | SrcMem32 | ModRM | Mov /* movsxd (x86/64) */ ,
-       0, 0, 0, 0,
-       /* 0x68 - 0x6F */
-       SrcImm | Mov | Stack, 0, SrcImmByte | Mov | Stack, 0,
-       DstDI | ByteOp | Mov | String, DstDI | Mov | String, /* insb, insw/insd */
-       SrcSI | ByteOp | ImplicitOps | String, SrcSI | ImplicitOps | String, /* outsb, outsw/outsd */
-       /* 0x70 - 0x77 */
-       SrcImmByte, SrcImmByte, SrcImmByte, SrcImmByte,
-       SrcImmByte, SrcImmByte, SrcImmByte, SrcImmByte,
-       /* 0x78 - 0x7F */
-       SrcImmByte, SrcImmByte, SrcImmByte, SrcImmByte,
-       SrcImmByte, SrcImmByte, SrcImmByte, SrcImmByte,
-       /* 0x80 - 0x87 */
-       Group | Group1_80, Group | Group1_81,
-       Group | Group1_82, Group | Group1_83,
-       ByteOp | DstMem | SrcReg | ModRM, DstMem | SrcReg | ModRM,
-       ByteOp | DstMem | SrcReg | ModRM | Lock, DstMem | SrcReg | ModRM | Lock,
-       /* 0x88 - 0x8F */
-       ByteOp | DstMem | SrcReg | ModRM | Mov, DstMem | SrcReg | ModRM | Mov,
-       ByteOp | DstReg | SrcMem | ModRM | Mov, DstReg | SrcMem | ModRM | Mov,
-       DstMem | SrcNone | ModRM | Mov, ModRM | DstReg,
-       ImplicitOps | SrcMem16 | ModRM, Group | Group1A,
-       /* 0x90 - 0x97 */
-       DstReg, DstReg, DstReg, DstReg, DstReg, DstReg, DstReg, DstReg,
-       /* 0x98 - 0x9F */
-       0, 0, SrcImmFAddr | No64, 0,
-       ImplicitOps | Stack, ImplicitOps | Stack, 0, 0,
-       /* 0xA0 - 0xA7 */
-       ByteOp | DstAcc | SrcMem | Mov | MemAbs, DstAcc | SrcMem | Mov | MemAbs,
-       ByteOp | DstMem | SrcAcc | Mov | MemAbs, DstMem | SrcAcc | Mov | MemAbs,
-       ByteOp | SrcSI | DstDI | Mov | String, SrcSI | DstDI | Mov | String,
-       ByteOp | SrcSI | DstDI | String, SrcSI | DstDI | String,
-       /* 0xA8 - 0xAF */
-       DstAcc | SrcImmByte | ByteOp, DstAcc | SrcImm, ByteOp | DstDI | Mov | String, DstDI | Mov | String,
-       ByteOp | SrcSI | DstAcc | Mov | String, SrcSI | DstAcc | Mov | String,
-       ByteOp | DstDI | String, DstDI | String,
-       /* 0xB0 - 0xB7 */
-       ByteOp | DstReg | SrcImm | Mov, ByteOp | DstReg | SrcImm | Mov,
-       ByteOp | DstReg | SrcImm | Mov, ByteOp | DstReg | SrcImm | Mov,
-       ByteOp | DstReg | SrcImm | Mov, ByteOp | DstReg | SrcImm | Mov,
-       ByteOp | DstReg | SrcImm | Mov, ByteOp | DstReg | SrcImm | Mov,
-       /* 0xB8 - 0xBF */
-       DstReg | SrcImm | Mov, DstReg | SrcImm | Mov,
-       DstReg | SrcImm | Mov, DstReg | SrcImm | Mov,
-       DstReg | SrcImm | Mov, DstReg | SrcImm | Mov,
-       DstReg | SrcImm | Mov, DstReg | SrcImm | Mov,
-       /* 0xC0 - 0xC7 */
-       ByteOp | DstMem | SrcImm | ModRM, DstMem | SrcImmByte | ModRM,
-       0, ImplicitOps | Stack, 0, 0,
-       ByteOp | DstMem | SrcImm | ModRM | Mov, DstMem | SrcImm | ModRM | Mov,
-       /* 0xC8 - 0xCF */
-       0, 0, 0, ImplicitOps | Stack,
-       ImplicitOps, SrcImmByte, ImplicitOps | No64, ImplicitOps,
-       /* 0xD0 - 0xD7 */
-       ByteOp | DstMem | SrcImplicit | ModRM, DstMem | SrcImplicit | ModRM,
-       ByteOp | DstMem | SrcImplicit | ModRM, DstMem | SrcImplicit | ModRM,
-       0, 0, 0, 0,
-       /* 0xD8 - 0xDF */
-       0, 0, 0, 0, 0, 0, 0, 0,
-       /* 0xE0 - 0xE7 */
-       0, 0, 0, 0,
-       ByteOp | SrcImmUByte | DstAcc, SrcImmUByte | DstAcc,
-       ByteOp | SrcImmUByte | DstAcc, SrcImmUByte | DstAcc,
-       /* 0xE8 - 0xEF */
-       SrcImm | Stack, SrcImm | ImplicitOps,
-       SrcImmFAddr | No64, SrcImmByte | ImplicitOps,
-       SrcNone | ByteOp | DstAcc, SrcNone | DstAcc,
-       SrcNone | ByteOp | DstAcc, SrcNone | DstAcc,
-       /* 0xF0 - 0xF7 */
-       0, 0, 0, 0,
-       ImplicitOps | Priv, ImplicitOps, Group | Group3_Byte, Group | Group3,
-       /* 0xF8 - 0xFF */
-       ImplicitOps, 0, ImplicitOps, ImplicitOps,
-       ImplicitOps, ImplicitOps, Group | Group4, Group | Group5,
-};
-
-static u32 twobyte_table[256] = {
-       /* 0x00 - 0x0F */
-       0, Group | GroupDual | Group7, 0, 0,
-       0, ImplicitOps, ImplicitOps | Priv, 0,
-       ImplicitOps | Priv, ImplicitOps | Priv, 0, 0,
-       0, ImplicitOps | ModRM, 0, 0,
-       /* 0x10 - 0x1F */
-       0, 0, 0, 0, 0, 0, 0, 0, ImplicitOps | ModRM, 0, 0, 0, 0, 0, 0, 0,
-       /* 0x20 - 0x2F */
-       ModRM | ImplicitOps | Priv, ModRM | Priv,
-       ModRM | ImplicitOps | Priv, ModRM | Priv,
-       0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       /* 0x30 - 0x3F */
-       ImplicitOps | Priv, 0, ImplicitOps | Priv, 0,
-       ImplicitOps, ImplicitOps | Priv, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       /* 0x40 - 0x47 */
-       DstReg | SrcMem | ModRM | Mov, DstReg | SrcMem | ModRM | Mov,
-       DstReg | SrcMem | ModRM | Mov, DstReg | SrcMem | ModRM | Mov,
-       DstReg | SrcMem | ModRM | Mov, DstReg | SrcMem | ModRM | Mov,
-       DstReg | SrcMem | ModRM | Mov, DstReg | SrcMem | ModRM | Mov,
-       /* 0x48 - 0x4F */
-       DstReg | SrcMem | ModRM | Mov, DstReg | SrcMem | ModRM | Mov,
-       DstReg | SrcMem | ModRM | Mov, DstReg | SrcMem | ModRM | Mov,
-       DstReg | SrcMem | ModRM | Mov, DstReg | SrcMem | ModRM | Mov,
-       DstReg | SrcMem | ModRM | Mov, DstReg | SrcMem | ModRM | Mov,
-       /* 0x50 - 0x5F */
-       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-       /* 0x60 - 0x6F */
-       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-       /* 0x70 - 0x7F */
-       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-       /* 0x80 - 0x8F */
-       SrcImm, SrcImm, SrcImm, SrcImm, SrcImm, SrcImm, SrcImm, SrcImm,
-       SrcImm, SrcImm, SrcImm, SrcImm, SrcImm, SrcImm, SrcImm, SrcImm,
-       /* 0x90 - 0x9F */
-       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-       /* 0xA0 - 0xA7 */
-       ImplicitOps | Stack, ImplicitOps | Stack,
-       0, DstMem | SrcReg | ModRM | BitOp,
-       DstMem | SrcReg | Src2ImmByte | ModRM,
-       DstMem | SrcReg | Src2CL | ModRM, 0, 0,
-       /* 0xA8 - 0xAF */
-       ImplicitOps | Stack, ImplicitOps | Stack,
-       0, DstMem | SrcReg | ModRM | BitOp | Lock,
-       DstMem | SrcReg | Src2ImmByte | ModRM,
-       DstMem | SrcReg | Src2CL | ModRM,
-       ModRM, 0,
-       /* 0xB0 - 0xB7 */
-       ByteOp | DstMem | SrcReg | ModRM | Lock, DstMem | SrcReg | ModRM | Lock,
-       0, DstMem | SrcReg | ModRM | BitOp | Lock,
-       0, 0, ByteOp | DstReg | SrcMem | ModRM | Mov,
-           DstReg | SrcMem16 | ModRM | Mov,
-       /* 0xB8 - 0xBF */
-       0, 0,
-       Group | Group8, DstMem | SrcReg | ModRM | BitOp | Lock,
-       0, 0, ByteOp | DstReg | SrcMem | ModRM | Mov,
-           DstReg | SrcMem16 | ModRM | Mov,
-       /* 0xC0 - 0xCF */
-       0, 0, 0, DstMem | SrcReg | ModRM | Mov,
-       0, 0, 0, Group | GroupDual | Group9,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       /* 0xD0 - 0xDF */
-       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-       /* 0xE0 - 0xEF */
-       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-       /* 0xF0 - 0xFF */
-       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-static u32 group_table[] = {
-       [Group1_80*8] =
-       ByteOp | DstMem | SrcImm | ModRM | Lock,
-       ByteOp | DstMem | SrcImm | ModRM | Lock,
-       ByteOp | DstMem | SrcImm | ModRM | Lock,
-       ByteOp | DstMem | SrcImm | ModRM | Lock,
-       ByteOp | DstMem | SrcImm | ModRM | Lock,
-       ByteOp | DstMem | SrcImm | ModRM | Lock,
-       ByteOp | DstMem | SrcImm | ModRM | Lock,
-       ByteOp | DstMem | SrcImm | ModRM,
-       [Group1_81*8] =
-       DstMem | SrcImm | ModRM | Lock,
-       DstMem | SrcImm | ModRM | Lock,
-       DstMem | SrcImm | ModRM | Lock,
-       DstMem | SrcImm | ModRM | Lock,
-       DstMem | SrcImm | ModRM | Lock,
-       DstMem | SrcImm | ModRM | Lock,
-       DstMem | SrcImm | ModRM | Lock,
-       DstMem | SrcImm | ModRM,
-       [Group1_82*8] =
-       ByteOp | DstMem | SrcImm | ModRM | No64 | Lock,
-       ByteOp | DstMem | SrcImm | ModRM | No64 | Lock,
-       ByteOp | DstMem | SrcImm | ModRM | No64 | Lock,
-       ByteOp | DstMem | SrcImm | ModRM | No64 | Lock,
-       ByteOp | DstMem | SrcImm | ModRM | No64 | Lock,
-       ByteOp | DstMem | SrcImm | ModRM | No64 | Lock,
-       ByteOp | DstMem | SrcImm | ModRM | No64 | Lock,
-       ByteOp | DstMem | SrcImm | ModRM | No64,
-       [Group1_83*8] =
-       DstMem | SrcImmByte | ModRM | Lock,
-       DstMem | SrcImmByte | ModRM | Lock,
-       DstMem | SrcImmByte | ModRM | Lock,
-       DstMem | SrcImmByte | ModRM | Lock,
-       DstMem | SrcImmByte | ModRM | Lock,
-       DstMem | SrcImmByte | ModRM | Lock,
-       DstMem | SrcImmByte | ModRM | Lock,
-       DstMem | SrcImmByte | ModRM,
-       [Group1A*8] =
-       DstMem | SrcNone | ModRM | Mov | Stack, 0, 0, 0, 0, 0, 0, 0,
-       [Group3_Byte*8] =
-       ByteOp | SrcImm | DstMem | ModRM, ByteOp | SrcImm | DstMem | ModRM,
-       ByteOp | DstMem | SrcNone | ModRM, ByteOp | DstMem | SrcNone | ModRM,
-       0, 0, 0, 0,
-       [Group3*8] =
-       DstMem | SrcImm | ModRM, DstMem | SrcImm | ModRM,
-       DstMem | SrcNone | ModRM, DstMem | SrcNone | ModRM,
-       0, 0, 0, 0,
-       [Group4*8] =
-       ByteOp | DstMem | SrcNone | ModRM | Lock, ByteOp | DstMem | SrcNone | ModRM | Lock,
-       0, 0, 0, 0, 0, 0,
-       [Group5*8] =
-       DstMem | SrcNone | ModRM | Lock, DstMem | SrcNone | ModRM | Lock,
-       SrcMem | ModRM | Stack, 0,
-       SrcMem | ModRM | Stack, SrcMemFAddr | ModRM | ImplicitOps,
-       SrcMem | ModRM | Stack, 0,
-       [Group7*8] =
-       0, 0, ModRM | SrcMem | Priv, ModRM | SrcMem | Priv,
-       SrcNone | ModRM | DstMem | Mov, 0,
-       SrcMem16 | ModRM | Mov | Priv, SrcMem | ModRM | ByteOp | Priv,
-       [Group8*8] =
-       0, 0, 0, 0,
-       DstMem | SrcImmByte | ModRM, DstMem | SrcImmByte | ModRM | Lock,
-       DstMem | SrcImmByte | ModRM | Lock, DstMem | SrcImmByte | ModRM | Lock,
-       [Group9*8] =
-       0, DstMem64 | ModRM | Lock, 0, 0, 0, 0, 0, 0,
-};
-
-static u32 group2_table[] = {
-       [Group7*8] =
-       SrcNone | ModRM | Priv, 0, 0, SrcNone | ModRM | Priv,
-       SrcNone | ModRM | DstMem | Mov, 0,
-       SrcMem16 | ModRM | Mov | Priv, 0,
-       [Group9*8] =
-       0, 0, 0, 0, 0, 0, 0, 0,
+struct group_dual {
+       struct opcode mod012[8];
+       struct opcode mod3[8];
 };
 
 /* EFLAGS bit definitions. */
@@ -399,6 +136,9 @@ static u32 group2_table[] = {
 #define EFLG_PF (1<<2)
 #define EFLG_CF (1<<0)
 
+#define EFLG_RESERVED_ZEROS_MASK 0xffc0802a
+#define EFLG_RESERVED_ONE_MASK 2
+
 /*
  * Instruction emulation:
  * Most instructions are emulated directly via a fragment of inline assembly
@@ -853,6 +593,7 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
        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,
@@ -909,8 +650,7 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
                }
                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_seg = VCPU_SREG_SS;
                c->modrm_ea = (u16)c->modrm_ea;
        } else {
                /* 32/64-bit ModR/M decode. */
@@ -969,1602 +709,1940 @@ done:
        return rc;
 }
 
-int
-x86_decode_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
+static int read_emulated(struct x86_emulate_ctxt *ctxt,
+                        struct x86_emulate_ops *ops,
+                        unsigned long addr, void *dest, unsigned size)
 {
-       struct decode_cache *c = &ctxt->decode;
-       int rc = X86EMUL_CONTINUE;
-       int mode = ctxt->mode;
-       int def_op_bytes, def_ad_bytes, group;
-
+       int rc;
+       struct read_cache *mc = &ctxt->decode.mem_read;
+       u32 err;
 
-       /* we cannot decode insn before we complete previous rep insn */
-       WARN_ON(ctxt->restart);
+       while (size) {
+               int n = min(size, 8u);
+               size -= n;
+               if (mc->pos < mc->end)
+                       goto read_cached;
 
-       c->eip = ctxt->eip;
-       c->fetch.start = c->fetch.end = c->eip;
-       ctxt->cs_base = seg_base(ctxt, ops, VCPU_SREG_CS);
+               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;
 
-       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;
+       read_cached:
+               memcpy(dest, mc->data + mc->pos, n);
+               mc->pos += n;
+               dest += n;
+               addr += n;
        }
+       return X86EMUL_CONTINUE;
+}
 
-       c->op_bytes = def_op_bytes;
-       c->ad_bytes = def_ad_bytes;
+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;
 
-       /* 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;
-               }
+       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;
+       }
 
-               /* Any legacy prefix after a REX prefix nullifies its effect. */
+       memcpy(dest, rc->data + rc->pos, size);
+       rc->pos += size;
+       return 1;
+}
 
-               c->rex_prefix = 0;
-       }
+static u32 desc_limit_scaled(struct desc_struct *desc)
+{
+       u32 limit = get_desc_limit(desc);
 
-done_prefixes:
+       return desc->g ? (limit << 12) | 0xfff : limit;
+}
 
-       /* REX prefix. */
-       if (c->rex_prefix)
-               if (c->rex_prefix & 8)
-                       c->op_bytes = 8;        /* REX.W */
+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;
 
-       /* Opcode byte(s). */
-       c->d = opcode_table[c->b];
-       if (c->d == 0) {
-               /* Two-byte opcode? */
-               if (c->b == 0x0f) {
-                       c->twobyte = 1;
-                       c->b = insn_fetch(u8, 1, c->eip);
-                       c->d = twobyte_table[c->b];
-               }
-       }
+               dt->size = desc_limit_scaled(&desc); /* what if limit > 65535? */
+               dt->address = get_desc_base(&desc);
+       } else
+               ops->get_gdt(dt, ctxt->vcpu);
+}
 
-       if (c->d & Group) {
-               group = c->d & GroupMask;
-               c->modrm = insn_fetch(u8, 1, c->eip);
-               --c->eip;
+/* 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;
 
-               group = (group << 3) + ((c->modrm >> 3) & 7);
-               if ((c->d & GroupDual) && (c->modrm >> 6) == 3)
-                       c->d = group2_table[group];
-               else
-                       c->d = group_table[group];
-       }
+       get_descriptor_table_ptr(ctxt, ops, selector, &dt);
 
-       /* Unrecognised? */
-       if (c->d == 0) {
-               DPRINTF("Cannot emulate %02x\n", c->b);
-               return -1;
+       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);
 
-       if (mode == X86EMUL_MODE_PROT64 && (c->d & Stack))
-               c->op_bytes = 8;
+       return ret;
+}
 
-       /* 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;
+/* 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;
 
-       if (!c->has_seg_override)
-               set_seg_override(c, VCPU_SREG_DS);
+       get_descriptor_table_ptr(ctxt, ops, selector, &dt);
 
-       if (!(!c->twobyte && c->b == 0x8d))
-               c->modrm_ea += seg_override_base(ctxt, ops, c);
+       if (dt.size < index * 8 + 7) {
+               emulate_gp(ctxt, selector & 0xfffc);
+               return X86EMUL_PROPAGATE_FAULT;
+       }
 
-       if (c->ad_bytes != 8)
-               c->modrm_ea = (u32)c->modrm_ea;
+       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);
 
-       if (c->rip_relative)
-               c->modrm_ea += c->eip;
+       return ret;
+}
 
-       /*
-        * Decode and fetch the source operand: register, memory
-        * or immediate.
-        */
-       switch (c->d & SrcMask) {
-       case SrcNone:
+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;
+
+       memset(&seg_desc, 0, sizeof seg_desc);
+
+       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;
+       }
+
+       /* 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;
+
+       /* TR should be in GDT only */
+       if (seg == VCPU_SREG_TR && (selector & (1 << 2)))
+               goto exception;
+
+       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;
+       }
+
+       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 SrcReg:
-               decode_register_operand(&c->src, c, 0);
+       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 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:
+       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 */
                /*
-                * For instructions with a ModR/M byte, switch to register
-                * access if Mod = 3.
+                * 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 ((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;
+               if ((seg_desc.type & 0xa) == 0x8 ||
+                   (((seg_desc.type & 0xc) != 0xc) &&
+                    (rpl > dpl && cpl > dpl)))
+                       goto exception;
                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) {
+       }
+
+       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:
-                       c->src.val = insn_fetch(s8, 1, c->eip);
+                       *(u8 *)c->dst.ptr = (u8)c->dst.val;
                        break;
                case 2:
-                       c->src.val = insn_fetch(s16, 2, c->eip);
+                       *(u16 *)c->dst.ptr = (u16)c->dst.val;
                        break;
                case 4:
-                       c->src.val = insn_fetch(s32, 4, c->eip);
+                       *c->dst.ptr = (u32)c->dst.val;
+                       break;  /* 64b: zero-ext */
+               case 8:
+                       *c->dst.ptr = c->dst.val;
                        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);
+       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
-                       c->src.val = insn_fetch(u8, 1, c->eip);
+                       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 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;
-               }
+       case OP_NONE:
+               /* no writeback */
                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;
+       default:
                break;
        }
+       return X86EMUL_CONTINUE;
+}
 
-       /*
-        * 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;
+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);
+       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 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);
+       case X86EMUL_MODE_VM86:
+               if (iopl < 3) {
+                       emulate_gp(ctxt, 0);
+                       return X86EMUL_PROPAGATE_FAULT;
+               }
+               change_mask |= EFLG_IF;
                break;
-       case Src2One:
-               c->src2.bytes = 1;
-               c->src2.val = 1;
+       default: /* real mode */
+               change_mask |= (EFLG_IOPL | EFLG_IF);
                break;
        }
 
-       /* 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));
-               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);
+       *(unsigned long *)dest =
+               (ctxt->eflags & ~change_mask) | (val & change_mask);
 
-                       c->dst.ptr = (void *)c->dst.ptr +
-                                                  (c->src.val & mask) / 8;
-               }
-               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;
+       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);
+       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;
+
+       return rc;
+}
+
+static int emulate_popa(struct x86_emulate_ctxt *ctxt,
+                       struct x86_emulate_ops *ops)
+{
+       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;
                }
-               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.ptr = (unsigned long *)
-                       register_address(c, es_base(ctxt, ops),
-                                        c->regs[VCPU_REGS_RDI]);
-               c->dst.val = 0;
-               break;
+
+               rc = emulate_pop(ctxt, ops, &c->regs[reg], c->op_bytes);
+               if (rc != X86EMUL_CONTINUE)
+                       break;
+               --reg;
+       }
+       return rc;
+}
+
+static int emulate_iret_real(struct x86_emulate_ctxt *ctxt,
+                            struct x86_emulate_ops *ops)
+{
+       struct decode_cache *c = &ctxt->decode;
+       int rc = X86EMUL_CONTINUE;
+       unsigned long temp_eip = 0;
+       unsigned long temp_eflags = 0;
+       unsigned long cs = 0;
+       unsigned long mask = EFLG_CF | EFLG_PF | EFLG_AF | EFLG_ZF | EFLG_SF | EFLG_TF |
+                            EFLG_IF | EFLG_DF | EFLG_OF | EFLG_IOPL | EFLG_NT | EFLG_RF |
+                            EFLG_AC | EFLG_ID | (1 << 1); /* Last one is the reserved bit */
+       unsigned long vm86_mask = EFLG_VM | EFLG_VIF | EFLG_VIP;
+
+       /* TODO: Add stack limit check */
+
+       rc = emulate_pop(ctxt, ops, &temp_eip, c->op_bytes);
+
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
+
+       if (temp_eip & ~0xffff) {
+               emulate_gp(ctxt, 0);
+               return X86EMUL_PROPAGATE_FAULT;
        }
 
-done:
-       return (rc == X86EMUL_UNHANDLEABLE) ? -1 : 0;
-}
+       rc = emulate_pop(ctxt, ops, &cs, c->op_bytes);
+
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
+
+       rc = emulate_pop(ctxt, ops, &temp_eflags, c->op_bytes);
+
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
 
-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;
+       rc = load_segment_descriptor(ctxt, ops, (u16)cs, VCPU_SREG_CS);
 
-       while (size) {
-               int n = min(size, 8u);
-               size -= n;
-               if (mc->pos < mc->end)
-                       goto read_cached;
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
 
-               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->eip = temp_eip;
 
-       read_cached:
-               memcpy(dest, mc->data + mc->pos, n);
-               mc->pos += n;
-               dest += n;
-               addr += n;
+
+       if (c->op_bytes == 4)
+               ctxt->eflags = ((temp_eflags & mask) | (ctxt->eflags & vm86_mask));
+       else if (c->op_bytes == 2) {
+               ctxt->eflags &= ~0xffff;
+               ctxt->eflags |= temp_eflags;
        }
-       return X86EMUL_CONTINUE;
+
+       ctxt->eflags &= ~EFLG_RESERVED_ZEROS_MASK; /* Clear reserved zeros */
+       ctxt->eflags |= EFLG_RESERVED_ONE_MASK;
+
+       return rc;
 }
 
-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 int emulate_iret(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;
+       switch(ctxt->mode) {
+       case X86EMUL_MODE_REAL:
+               return emulate_iret_real(ctxt, ops);
+       case X86EMUL_MODE_VM86:
+       case X86EMUL_MODE_PROT16:
+       case X86EMUL_MODE_PROT32:
+       case X86EMUL_MODE_PROT64:
+       default:
+               /* iret from protected mode unimplemented yet */
+               return X86EMUL_UNHANDLEABLE;
        }
+}
 
-       memcpy(dest, rc->data + rc->pos, size);
-       rc->pos += size;
-       return 1;
+static inline int emulate_grp1a(struct x86_emulate_ctxt *ctxt,
+                               struct x86_emulate_ops *ops)
+{
+       struct decode_cache *c = &ctxt->decode;
+
+       return emulate_pop(ctxt, ops, &c->dst.val, c->dst.bytes);
 }
 
-static u32 desc_limit_scaled(struct desc_struct *desc)
+static inline void emulate_grp2(struct x86_emulate_ctxt *ctxt)
 {
-       u32 limit = get_desc_limit(desc);
+       struct decode_cache *c = &ctxt->decode;
+       switch (c->modrm_reg) {
+       case 0: /* rol */
+               emulate_2op_SrcB("rol", c->src, c->dst, ctxt->eflags);
+               break;
+       case 1: /* ror */
+               emulate_2op_SrcB("ror", c->src, c->dst, ctxt->eflags);
+               break;
+       case 2: /* rcl */
+               emulate_2op_SrcB("rcl", c->src, c->dst, ctxt->eflags);
+               break;
+       case 3: /* rcr */
+               emulate_2op_SrcB("rcr", c->src, c->dst, ctxt->eflags);
+               break;
+       case 4: /* sal/shl */
+       case 6: /* sal/shl */
+               emulate_2op_SrcB("sal", c->src, c->dst, ctxt->eflags);
+               break;
+       case 5: /* shr */
+               emulate_2op_SrcB("shr", c->src, c->dst, ctxt->eflags);
+               break;
+       case 7: /* sar */
+               emulate_2op_SrcB("sar", c->src, c->dst, ctxt->eflags);
+               break;
+       }
+}
 
-       return desc->g ? (limit << 12) | 0xfff : limit;
+static inline int emulate_grp3(struct x86_emulate_ctxt *ctxt,
+                              struct x86_emulate_ops *ops)
+{
+       struct decode_cache *c = &ctxt->decode;
+
+       switch (c->modrm_reg) {
+       case 0 ... 1:   /* test */
+               emulate_2op_SrcV("test", c->src, c->dst, ctxt->eflags);
+               break;
+       case 2: /* not */
+               c->dst.val = ~c->dst.val;
+               break;
+       case 3: /* neg */
+               emulate_1op("neg", c->dst, ctxt->eflags);
+               break;
+       default:
+               return 0;
+       }
+       return 1;
 }
 
-static void get_descriptor_table_ptr(struct x86_emulate_ctxt *ctxt,
-                                    struct x86_emulate_ops *ops,
-                                    u16 selector, struct desc_ptr *dt)
+static inline int emulate_grp45(struct x86_emulate_ctxt *ctxt,
+                              struct x86_emulate_ops *ops)
 {
-       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;
+       struct decode_cache *c = &ctxt->decode;
 
-               dt->size = desc_limit_scaled(&desc); /* what if limit > 65535? */
-               dt->address = get_desc_base(&desc);
-       } else
-               ops->get_gdt(dt, ctxt->vcpu);
+       switch (c->modrm_reg) {
+       case 0: /* inc */
+               emulate_1op("inc", c->dst, ctxt->eflags);
+               break;
+       case 1: /* dec */
+               emulate_1op("dec", c->dst, ctxt->eflags);
+               break;
+       case 2: /* call near abs */ {
+               long int old_eip;
+               old_eip = c->eip;
+               c->eip = c->src.val;
+               c->src.val = old_eip;
+               emulate_push(ctxt, ops);
+               break;
+       }
+       case 4: /* jmp abs */
+               c->eip = c->src.val;
+               break;
+       case 6: /* push */
+               emulate_push(ctxt, ops);
+               break;
+       }
+       return X86EMUL_CONTINUE;
 }
 
-/* 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 inline int emulate_grp9(struct x86_emulate_ctxt *ctxt,
+                              struct x86_emulate_ops *ops)
 {
-       struct desc_ptr dt;
-       u16 index = selector >> 3;
-       int ret;
-       u32 err;
-       ulong addr;
+       struct decode_cache *c = &ctxt->decode;
+       u64 old = c->dst.orig_val64;
 
-       get_descriptor_table_ptr(ctxt, ops, selector, &dt);
+       if (((u32) (old >> 0) != (u32) c->regs[VCPU_REGS_RAX]) ||
+           ((u32) (old >> 32) != (u32) c->regs[VCPU_REGS_RDX])) {
+               c->regs[VCPU_REGS_RAX] = (u32) (old >> 0);
+               c->regs[VCPU_REGS_RDX] = (u32) (old >> 32);
+               ctxt->eflags &= ~EFLG_ZF;
+       } else {
+               c->dst.val64 = ((u64)c->regs[VCPU_REGS_RCX] << 32) |
+                       (u32) c->regs[VCPU_REGS_RBX];
 
-       if (dt.size < index * 8 + 7) {
-               emulate_gp(ctxt, selector & 0xfffc);
-               return X86EMUL_PROPAGATE_FAULT;
+               ctxt->eflags |= EFLG_ZF;
        }
-       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);
-
-       return ret;
+       return X86EMUL_CONTINUE;
 }
 
-/* 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_ret_far(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;
+       int rc;
+       unsigned long cs;
 
-       get_descriptor_table_ptr(ctxt, ops, selector, &dt);
+       rc = emulate_pop(ctxt, ops, &c->eip, c->op_bytes);
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
+       if (c->op_bytes == 4)
+               c->eip = (u32)c->eip;
+       rc = emulate_pop(ctxt, ops, &cs, c->op_bytes);
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
+       rc = load_segment_descriptor(ctxt, ops, (u16)cs, VCPU_SREG_CS);
+       return rc;
+}
 
-       if (dt.size < index * 8 + 7) {
-               emulate_gp(ctxt, selector & 0xfffc);
-               return X86EMUL_PROPAGATE_FAULT;
-       }
+static inline void
+setup_syscalls_segments(struct x86_emulate_ctxt *ctxt,
+                       struct x86_emulate_ops *ops, struct desc_struct *cs,
+                       struct desc_struct *ss)
+{
+       memset(cs, 0, sizeof(struct desc_struct));
+       ops->get_cached_descriptor(cs, VCPU_SREG_CS, ctxt->vcpu);
+       memset(ss, 0, sizeof(struct desc_struct));
 
-       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);
+       cs->l = 0;              /* will be adjusted later */
+       set_desc_base(cs, 0);   /* flat segment */
+       cs->g = 1;              /* 4kb granularity */
+       set_desc_limit(cs, 0xfffff);    /* 4GB limit */
+       cs->type = 0x0b;        /* Read, Execute, Accessed */
+       cs->s = 1;
+       cs->dpl = 0;            /* will be adjusted later */
+       cs->p = 1;
+       cs->d = 1;
 
-       return ret;
+       set_desc_base(ss, 0);   /* flat segment */
+       set_desc_limit(ss, 0xfffff);    /* 4GB limit */
+       ss->g = 1;              /* 4kb granularity */
+       ss->s = 1;
+       ss->type = 0x03;        /* Read/Write, Accessed */
+       ss->d = 1;              /* 32bit stack segment */
+       ss->dpl = 0;
+       ss->p = 1;
 }
 
-static int load_segment_descriptor(struct x86_emulate_ctxt *ctxt,
-                                  struct x86_emulate_ops *ops,
-                                  u16 selector, int seg)
+static int
+emulate_syscall(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;
-
-       memset(&seg_desc, 0, sizeof seg_desc);
+       struct decode_cache *c = &ctxt->decode;
+       struct desc_struct cs, ss;
+       u64 msr_data;
+       u16 cs_sel, ss_sel;
 
-       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;
+       /* syscall is not available in real mode */
+       if (ctxt->mode == X86EMUL_MODE_REAL ||
+           ctxt->mode == X86EMUL_MODE_VM86) {
+               emulate_ud(ctxt);
+               return X86EMUL_PROPAGATE_FAULT;
        }
 
-       /* 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;
+       setup_syscalls_segments(ctxt, ops, &cs, &ss);
 
-       /* TR should be in GDT only */
-       if (seg == VCPU_SREG_TR && (selector & (1 << 2)))
-               goto exception;
+       ops->get_msr(ctxt->vcpu, MSR_STAR, &msr_data);
+       msr_data >>= 32;
+       cs_sel = (u16)(msr_data & 0xfffc);
+       ss_sel = (u16)(msr_data + 8);
 
-       if (null_selector) /* for NULL selector skip all following checks */
-               goto load;
+       if (is_long_mode(ctxt->vcpu)) {
+               cs.d = 0;
+               cs.l = 1;
+       }
+       ops->set_cached_descriptor(&cs, VCPU_SREG_CS, ctxt->vcpu);
+       ops->set_segment_selector(cs_sel, VCPU_SREG_CS, ctxt->vcpu);
+       ops->set_cached_descriptor(&ss, VCPU_SREG_SS, ctxt->vcpu);
+       ops->set_segment_selector(ss_sel, VCPU_SREG_SS, ctxt->vcpu);
 
-       ret = read_segment_descriptor(ctxt, ops, selector, &seg_desc);
-       if (ret != X86EMUL_CONTINUE)
-               return ret;
+       c->regs[VCPU_REGS_RCX] = c->eip;
+       if (is_long_mode(ctxt->vcpu)) {
+#ifdef CONFIG_X86_64
+               c->regs[VCPU_REGS_R11] = ctxt->eflags & ~EFLG_RF;
 
-       err_code = selector & 0xfffc;
-       err_vec = GP_VECTOR;
+               ops->get_msr(ctxt->vcpu,
+                            ctxt->mode == X86EMUL_MODE_PROT64 ?
+                            MSR_LSTAR : MSR_CSTAR, &msr_data);
+               c->eip = msr_data;
 
-       /* can't load system descriptor into segment selecor */
-       if (seg <= VCPU_SREG_GS && !seg_desc.s)
-               goto exception;
+               ops->get_msr(ctxt->vcpu, MSR_SYSCALL_MASK, &msr_data);
+               ctxt->eflags &= ~(msr_data | EFLG_RF);
+#endif
+       } else {
+               /* legacy mode */
+               ops->get_msr(ctxt->vcpu, MSR_STAR, &msr_data);
+               c->eip = (u32)msr_data;
 
-       if (!seg_desc.p) {
-               err_vec = (seg == VCPU_SREG_SS) ? SS_VECTOR : NP_VECTOR;
-               goto exception;
+               ctxt->eflags &= ~(EFLG_VM | EFLG_IF | EFLG_RF);
        }
 
-       rpl = selector & 3;
-       dpl = seg_desc.dpl;
-       cpl = ops->cpl(ctxt->vcpu);
+       return X86EMUL_CONTINUE;
+}
 
-       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;
+static int
+emulate_sysenter(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
+{
+       struct decode_cache *c = &ctxt->decode;
+       struct desc_struct cs, ss;
+       u64 msr_data;
+       u16 cs_sel, ss_sel;
 
-               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;
+       /* inject #GP if in real mode */
+       if (ctxt->mode == X86EMUL_MODE_REAL) {
+               emulate_gp(ctxt, 0);
+               return X86EMUL_PROPAGATE_FAULT;
        }
 
-       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;
+       /* XXX sysenter/sysexit have not been tested in 64bit mode.
+       * Therefore, we inject an #UD.
+       */
+       if (ctxt->mode == X86EMUL_MODE_PROT64) {
+               emulate_ud(ctxt);
+               return X86EMUL_PROPAGATE_FAULT;
        }
-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;
+       setup_syscalls_segments(ctxt, ops, &cs, &ss);
 
-       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;
+       ops->get_msr(ctxt->vcpu, MSR_IA32_SYSENTER_CS, &msr_data);
+       switch (ctxt->mode) {
+       case X86EMUL_MODE_PROT32:
+               if ((msr_data & 0xfffc) == 0x0) {
+                       emulate_gp(ctxt, 0);
+                       return X86EMUL_PROPAGATE_FAULT;
                }
                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:
+       case X86EMUL_MODE_PROT64:
+               if (msr_data == 0x0) {
+                       emulate_gp(ctxt, 0);
+                       return X86EMUL_PROPAGATE_FAULT;
+               }
                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]);
-}
+       ctxt->eflags &= ~(EFLG_VM | EFLG_IF | EFLG_RF);
+       cs_sel = (u16)msr_data;
+       cs_sel &= ~SELECTOR_RPL_MASK;
+       ss_sel = cs_sel + 8;
+       ss_sel &= ~SELECTOR_RPL_MASK;
+       if (ctxt->mode == X86EMUL_MODE_PROT64
+               || is_long_mode(ctxt->vcpu)) {
+               cs.d = 0;
+               cs.l = 1;
+       }
 
-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;
+       ops->set_cached_descriptor(&cs, VCPU_SREG_CS, ctxt->vcpu);
+       ops->set_segment_selector(cs_sel, VCPU_SREG_CS, ctxt->vcpu);
+       ops->set_cached_descriptor(&ss, VCPU_SREG_SS, ctxt->vcpu);
+       ops->set_segment_selector(ss_sel, VCPU_SREG_SS, ctxt->vcpu);
 
-       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;
+       ops->get_msr(ctxt->vcpu, MSR_IA32_SYSENTER_EIP, &msr_data);
+       c->eip = msr_data;
 
-       register_address_increment(c, &c->regs[VCPU_REGS_RSP], len);
-       return rc;
+       ops->get_msr(ctxt->vcpu, MSR_IA32_SYSENTER_ESP, &msr_data);
+       c->regs[VCPU_REGS_RSP] = msr_data;
+
+       return X86EMUL_CONTINUE;
 }
 
-static int emulate_popf(struct x86_emulate_ctxt *ctxt,
-                      struct x86_emulate_ops *ops,
-                      void *dest, int len)
+static int
+emulate_sysexit(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
 {
-       int rc;
-       unsigned long val, change_mask;
-       int iopl = (ctxt->eflags & X86_EFLAGS_IOPL) >> IOPL_SHIFT;
-       int cpl = ops->cpl(ctxt->vcpu);
+       struct decode_cache *c = &ctxt->decode;
+       struct desc_struct cs, ss;
+       u64 msr_data;
+       int usermode;
+       u16 cs_sel, ss_sel;
 
-       rc = emulate_pop(ctxt, ops, &val, len);
-       if (rc != X86EMUL_CONTINUE)
-               return rc;
+       /* inject #GP if in real mode or Virtual 8086 mode */
+       if (ctxt->mode == X86EMUL_MODE_REAL ||
+           ctxt->mode == X86EMUL_MODE_VM86) {
+               emulate_gp(ctxt, 0);
+               return X86EMUL_PROPAGATE_FAULT;
+       }
 
-       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;
+       setup_syscalls_segments(ctxt, ops, &cs, &ss);
 
-       switch(ctxt->mode) {
-       case X86EMUL_MODE_PROT64:
+       if ((c->rex_prefix & 0x8) != 0x0)
+               usermode = X86EMUL_MODE_PROT64;
+       else
+               usermode = X86EMUL_MODE_PROT32;
+
+       cs.dpl = 3;
+       ss.dpl = 3;
+       ops->get_msr(ctxt->vcpu, MSR_IA32_SYSENTER_CS, &msr_data);
+       switch (usermode) {
        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) {
+               cs_sel = (u16)(msr_data + 16);
+               if ((msr_data & 0xfffc) == 0x0) {
                        emulate_gp(ctxt, 0);
                        return X86EMUL_PROPAGATE_FAULT;
                }
-               change_mask |= EFLG_IF;
+               ss_sel = (u16)(msr_data + 24);
                break;
-       default: /* real mode */
-               change_mask |= (EFLG_IOPL | EFLG_IF);
+       case X86EMUL_MODE_PROT64:
+               cs_sel = (u16)(msr_data + 32);
+               if (msr_data == 0x0) {
+                       emulate_gp(ctxt, 0);
+                       return X86EMUL_PROPAGATE_FAULT;
+               }
+               ss_sel = cs_sel + 8;
+               cs.d = 0;
+               cs.l = 1;
                break;
        }
+       cs_sel |= SELECTOR_RPL_MASK;
+       ss_sel |= SELECTOR_RPL_MASK;
 
-       *(unsigned long *)dest =
-               (ctxt->eflags & ~change_mask) | (val & change_mask);
+       ops->set_cached_descriptor(&cs, VCPU_SREG_CS, ctxt->vcpu);
+       ops->set_segment_selector(cs_sel, VCPU_SREG_CS, ctxt->vcpu);
+       ops->set_cached_descriptor(&ss, VCPU_SREG_SS, ctxt->vcpu);
+       ops->set_segment_selector(ss_sel, VCPU_SREG_SS, ctxt->vcpu);
 
-       return rc;
+       c->eip = c->regs[VCPU_REGS_RDX];
+       c->regs[VCPU_REGS_RSP] = c->regs[VCPU_REGS_RCX];
+
+       return X86EMUL_CONTINUE;
 }
 
-static void emulate_push_sreg(struct x86_emulate_ctxt *ctxt,
-                             struct x86_emulate_ops *ops, int seg)
+static bool emulator_bad_iopl(struct x86_emulate_ctxt *ctxt,
+                             struct x86_emulate_ops *ops)
 {
-       struct decode_cache *c = &ctxt->decode;
-
-       c->src.val = ops->get_segment_selector(seg, ctxt->vcpu);
-
-       emulate_push(ctxt, ops);
+       int iopl;
+       if (ctxt->mode == X86EMUL_MODE_REAL)
+               return false;
+       if (ctxt->mode == X86EMUL_MODE_VM86)
+               return true;
+       iopl = (ctxt->eflags & X86_EFLAGS_IOPL) >> IOPL_SHIFT;
+       return ops->cpl(ctxt->vcpu) > iopl;
 }
 
-static int emulate_pop_sreg(struct x86_emulate_ctxt *ctxt,
-                            struct x86_emulate_ops *ops, int seg)
+static bool emulator_io_port_access_allowed(struct x86_emulate_ctxt *ctxt,
+                                           struct x86_emulate_ops *ops,
+                                           u16 port, u16 len)
 {
-       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;
+       struct desc_struct tr_seg;
+       int r;
+       u16 io_bitmap_ptr;
+       u8 perm, bit_idx = port & 0x7;
+       unsigned mask = (1 << len) - 1;
 
-       rc = load_segment_descriptor(ctxt, ops, (u16)selector, seg);
-       return rc;
+       ops->get_cached_descriptor(&tr_seg, VCPU_SREG_TR, ctxt->vcpu);
+       if (!tr_seg.p)
+               return false;
+       if (desc_limit_scaled(&tr_seg) < 103)
+               return false;
+       r = ops->read_std(get_desc_base(&tr_seg) + 102, &io_bitmap_ptr, 2,
+                         ctxt->vcpu, NULL);
+       if (r != X86EMUL_CONTINUE)
+               return false;
+       if (io_bitmap_ptr + port/8 > desc_limit_scaled(&tr_seg))
+               return false;
+       r = ops->read_std(get_desc_base(&tr_seg) + io_bitmap_ptr + port/8,
+                         &perm, 1, ctxt->vcpu, NULL);
+       if (r != X86EMUL_CONTINUE)
+               return false;
+       if ((perm >> bit_idx) & mask)
+               return false;
+       return true;
 }
 
-static int emulate_pusha(struct x86_emulate_ctxt *ctxt,
-                         struct x86_emulate_ops *ops)
+static bool emulator_io_permited(struct x86_emulate_ctxt *ctxt,
+                                struct x86_emulate_ops *ops,
+                                u16 port, u16 len)
 {
-       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;
+       if (ctxt->perm_ok)
+               return true;
 
-               ++reg;
-       }
+       if (emulator_bad_iopl(ctxt, ops))
+               if (!emulator_io_port_access_allowed(ctxt, ops, port, len))
+                       return false;
 
-       /* Disable writeback. */
-       c->dst.type = OP_NONE;
+       ctxt->perm_ok = true;
 
-       return rc;
+       return true;
 }
 
-static int emulate_popa(struct x86_emulate_ctxt *ctxt,
-                       struct x86_emulate_ops *ops)
+static void save_state_to_tss16(struct x86_emulate_ctxt *ctxt,
+                               struct x86_emulate_ops *ops,
+                               struct tss_segment_16 *tss)
 {
        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;
-               }
+       tss->ip = c->eip;
+       tss->flag = ctxt->eflags;
+       tss->ax = c->regs[VCPU_REGS_RAX];
+       tss->cx = c->regs[VCPU_REGS_RCX];
+       tss->dx = c->regs[VCPU_REGS_RDX];
+       tss->bx = c->regs[VCPU_REGS_RBX];
+       tss->sp = c->regs[VCPU_REGS_RSP];
+       tss->bp = c->regs[VCPU_REGS_RBP];
+       tss->si = c->regs[VCPU_REGS_RSI];
+       tss->di = c->regs[VCPU_REGS_RDI];
 
-               rc = emulate_pop(ctxt, ops, &c->regs[reg], c->op_bytes);
-               if (rc != X86EMUL_CONTINUE)
-                       break;
-               --reg;
-       }
-       return rc;
+       tss->es = ops->get_segment_selector(VCPU_SREG_ES, ctxt->vcpu);
+       tss->cs = ops->get_segment_selector(VCPU_SREG_CS, ctxt->vcpu);
+       tss->ss = ops->get_segment_selector(VCPU_SREG_SS, ctxt->vcpu);
+       tss->ds = ops->get_segment_selector(VCPU_SREG_DS, ctxt->vcpu);
+       tss->ldt = ops->get_segment_selector(VCPU_SREG_LDTR, ctxt->vcpu);
 }
 
-static inline int emulate_grp1a(struct x86_emulate_ctxt *ctxt,
-                               struct x86_emulate_ops *ops)
+static int load_state_from_tss16(struct x86_emulate_ctxt *ctxt,
+                                struct x86_emulate_ops *ops,
+                                struct tss_segment_16 *tss)
 {
        struct decode_cache *c = &ctxt->decode;
+       int ret;
 
-       return emulate_pop(ctxt, ops, &c->dst.val, c->dst.bytes);
-}
+       c->eip = tss->ip;
+       ctxt->eflags = tss->flag | 2;
+       c->regs[VCPU_REGS_RAX] = tss->ax;
+       c->regs[VCPU_REGS_RCX] = tss->cx;
+       c->regs[VCPU_REGS_RDX] = tss->dx;
+       c->regs[VCPU_REGS_RBX] = tss->bx;
+       c->regs[VCPU_REGS_RSP] = tss->sp;
+       c->regs[VCPU_REGS_RBP] = tss->bp;
+       c->regs[VCPU_REGS_RSI] = tss->si;
+       c->regs[VCPU_REGS_RDI] = tss->di;
 
-static inline void emulate_grp2(struct x86_emulate_ctxt *ctxt)
-{
-       struct decode_cache *c = &ctxt->decode;
-       switch (c->modrm_reg) {
-       case 0: /* rol */
-               emulate_2op_SrcB("rol", c->src, c->dst, ctxt->eflags);
-               break;
-       case 1: /* ror */
-               emulate_2op_SrcB("ror", c->src, c->dst, ctxt->eflags);
-               break;
-       case 2: /* rcl */
-               emulate_2op_SrcB("rcl", c->src, c->dst, ctxt->eflags);
-               break;
-       case 3: /* rcr */
-               emulate_2op_SrcB("rcr", c->src, c->dst, ctxt->eflags);
-               break;
-       case 4: /* sal/shl */
-       case 6: /* sal/shl */
-               emulate_2op_SrcB("sal", c->src, c->dst, ctxt->eflags);
-               break;
-       case 5: /* shr */
-               emulate_2op_SrcB("shr", c->src, c->dst, ctxt->eflags);
-               break;
-       case 7: /* sar */
-               emulate_2op_SrcB("sar", c->src, c->dst, ctxt->eflags);
-               break;
-       }
-}
+       /*
+        * SDM says that segment selectors are loaded before segment
+        * descriptors
+        */
+       ops->set_segment_selector(tss->ldt, VCPU_SREG_LDTR, ctxt->vcpu);
+       ops->set_segment_selector(tss->es, VCPU_SREG_ES, ctxt->vcpu);
+       ops->set_segment_selector(tss->cs, VCPU_SREG_CS, ctxt->vcpu);
+       ops->set_segment_selector(tss->ss, VCPU_SREG_SS, ctxt->vcpu);
+       ops->set_segment_selector(tss->ds, VCPU_SREG_DS, ctxt->vcpu);
 
-static inline int emulate_grp3(struct x86_emulate_ctxt *ctxt,
-                              struct x86_emulate_ops *ops)
-{
-       struct decode_cache *c = &ctxt->decode;
+       /*
+        * Now load segment descriptors. If fault happenes at this stage
+        * it is handled in a context of new task
+        */
+       ret = load_segment_descriptor(ctxt, ops, tss->ldt, VCPU_SREG_LDTR);
+       if (ret != X86EMUL_CONTINUE)
+               return ret;
+       ret = load_segment_descriptor(ctxt, ops, tss->es, VCPU_SREG_ES);
+       if (ret != X86EMUL_CONTINUE)
+               return ret;
+       ret = load_segment_descriptor(ctxt, ops, tss->cs, VCPU_SREG_CS);
+       if (ret != X86EMUL_CONTINUE)
+               return ret;
+       ret = load_segment_descriptor(ctxt, ops, tss->ss, VCPU_SREG_SS);
+       if (ret != X86EMUL_CONTINUE)
+               return ret;
+       ret = load_segment_descriptor(ctxt, ops, tss->ds, VCPU_SREG_DS);
+       if (ret != X86EMUL_CONTINUE)
+               return ret;
 
-       switch (c->modrm_reg) {
-       case 0 ... 1:   /* test */
-               emulate_2op_SrcV("test", c->src, c->dst, ctxt->eflags);
-               break;
-       case 2: /* not */
-               c->dst.val = ~c->dst.val;
-               break;
-       case 3: /* neg */
-               emulate_1op("neg", c->dst, ctxt->eflags);
-               break;
-       default:
-               return 0;
-       }
-       return 1;
+       return X86EMUL_CONTINUE;
 }
 
-static inline int emulate_grp45(struct x86_emulate_ctxt *ctxt,
-                              struct x86_emulate_ops *ops)
+static int task_switch_16(struct x86_emulate_ctxt *ctxt,
+                         struct x86_emulate_ops *ops,
+                         u16 tss_selector, u16 old_tss_sel,
+                         ulong old_tss_base, struct desc_struct *new_desc)
 {
-       struct decode_cache *c = &ctxt->decode;
+       struct tss_segment_16 tss_seg;
+       int ret;
+       u32 err, new_tss_base = get_desc_base(new_desc);
 
-       switch (c->modrm_reg) {
-       case 0: /* inc */
-               emulate_1op("inc", c->dst, ctxt->eflags);
-               break;
-       case 1: /* dec */
-               emulate_1op("dec", c->dst, ctxt->eflags);
-               break;
-       case 2: /* call near abs */ {
-               long int old_eip;
-               old_eip = c->eip;
-               c->eip = c->src.val;
-               c->src.val = old_eip;
-               emulate_push(ctxt, ops);
-               break;
-       }
-       case 4: /* jmp abs */
-               c->eip = c->src.val;
-               break;
-       case 6: /* push */
-               emulate_push(ctxt, ops);
-               break;
+       ret = ops->read_std(old_tss_base, &tss_seg, sizeof tss_seg, ctxt->vcpu,
+                           &err);
+       if (ret == X86EMUL_PROPAGATE_FAULT) {
+               /* FIXME: need to provide precise fault address */
+               emulate_pf(ctxt, old_tss_base, err);
+               return ret;
        }
-       return X86EMUL_CONTINUE;
-}
 
-static inline int emulate_grp9(struct x86_emulate_ctxt *ctxt,
-                              struct x86_emulate_ops *ops)
-{
-       struct decode_cache *c = &ctxt->decode;
-       u64 old = c->dst.orig_val64;
+       save_state_to_tss16(ctxt, ops, &tss_seg);
 
-       if (((u32) (old >> 0) != (u32) c->regs[VCPU_REGS_RAX]) ||
-           ((u32) (old >> 32) != (u32) c->regs[VCPU_REGS_RDX])) {
-               c->regs[VCPU_REGS_RAX] = (u32) (old >> 0);
-               c->regs[VCPU_REGS_RDX] = (u32) (old >> 32);
-               ctxt->eflags &= ~EFLG_ZF;
-       } else {
-               c->dst.val64 = ((u64)c->regs[VCPU_REGS_RCX] << 32) |
-                       (u32) c->regs[VCPU_REGS_RBX];
+       ret = ops->write_std(old_tss_base, &tss_seg, sizeof tss_seg, ctxt->vcpu,
+                            &err);
+       if (ret == X86EMUL_PROPAGATE_FAULT) {
+               /* FIXME: need to provide precise fault address */
+               emulate_pf(ctxt, old_tss_base, err);
+               return ret;
+       }
 
-               ctxt->eflags |= EFLG_ZF;
+       ret = ops->read_std(new_tss_base, &tss_seg, sizeof tss_seg, ctxt->vcpu,
+                           &err);
+       if (ret == X86EMUL_PROPAGATE_FAULT) {
+               /* FIXME: need to provide precise fault address */
+               emulate_pf(ctxt, new_tss_base, err);
+               return ret;
        }
-       return X86EMUL_CONTINUE;
-}
 
-static int emulate_ret_far(struct x86_emulate_ctxt *ctxt,
-                          struct x86_emulate_ops *ops)
-{
-       struct decode_cache *c = &ctxt->decode;
-       int rc;
-       unsigned long cs;
+       if (old_tss_sel != 0xffff) {
+               tss_seg.prev_task_link = old_tss_sel;
 
-       rc = emulate_pop(ctxt, ops, &c->eip, c->op_bytes);
-       if (rc != X86EMUL_CONTINUE)
-               return rc;
-       if (c->op_bytes == 4)
-               c->eip = (u32)c->eip;
-       rc = emulate_pop(ctxt, ops, &cs, c->op_bytes);
-       if (rc != X86EMUL_CONTINUE)
-               return rc;
-       rc = load_segment_descriptor(ctxt, ops, (u16)cs, VCPU_SREG_CS);
-       return rc;
+               ret = ops->write_std(new_tss_base,
+                                    &tss_seg.prev_task_link,
+                                    sizeof tss_seg.prev_task_link,
+                                    ctxt->vcpu, &err);
+               if (ret == X86EMUL_PROPAGATE_FAULT) {
+                       /* FIXME: need to provide precise fault address */
+                       emulate_pf(ctxt, new_tss_base, err);
+                       return ret;
+               }
+       }
+
+       return load_state_from_tss16(ctxt, ops, &tss_seg);
 }
 
-static inline void
-setup_syscalls_segments(struct x86_emulate_ctxt *ctxt,
-                       struct x86_emulate_ops *ops, struct desc_struct *cs,
-                       struct desc_struct *ss)
+static void save_state_to_tss32(struct x86_emulate_ctxt *ctxt,
+                               struct x86_emulate_ops *ops,
+                               struct tss_segment_32 *tss)
 {
-       memset(cs, 0, sizeof(struct desc_struct));
-       ops->get_cached_descriptor(cs, VCPU_SREG_CS, ctxt->vcpu);
-       memset(ss, 0, sizeof(struct desc_struct));
+       struct decode_cache *c = &ctxt->decode;
 
-       cs->l = 0;              /* will be adjusted later */
-       set_desc_base(cs, 0);   /* flat segment */
-       cs->g = 1;              /* 4kb granularity */
-       set_desc_limit(cs, 0xfffff);    /* 4GB limit */
-       cs->type = 0x0b;        /* Read, Execute, Accessed */
-       cs->s = 1;
-       cs->dpl = 0;            /* will be adjusted later */
-       cs->p = 1;
-       cs->d = 1;
+       tss->cr3 = ops->get_cr(3, ctxt->vcpu);
+       tss->eip = c->eip;
+       tss->eflags = ctxt->eflags;
+       tss->eax = c->regs[VCPU_REGS_RAX];
+       tss->ecx = c->regs[VCPU_REGS_RCX];
+       tss->edx = c->regs[VCPU_REGS_RDX];
+       tss->ebx = c->regs[VCPU_REGS_RBX];
+       tss->esp = c->regs[VCPU_REGS_RSP];
+       tss->ebp = c->regs[VCPU_REGS_RBP];
+       tss->esi = c->regs[VCPU_REGS_RSI];
+       tss->edi = c->regs[VCPU_REGS_RDI];
 
-       set_desc_base(ss, 0);   /* flat segment */
-       set_desc_limit(ss, 0xfffff);    /* 4GB limit */
-       ss->g = 1;              /* 4kb granularity */
-       ss->s = 1;
-       ss->type = 0x03;        /* Read/Write, Accessed */
-       ss->d = 1;              /* 32bit stack segment */
-       ss->dpl = 0;
-       ss->p = 1;
+       tss->es = ops->get_segment_selector(VCPU_SREG_ES, ctxt->vcpu);
+       tss->cs = ops->get_segment_selector(VCPU_SREG_CS, ctxt->vcpu);
+       tss->ss = ops->get_segment_selector(VCPU_SREG_SS, ctxt->vcpu);
+       tss->ds = ops->get_segment_selector(VCPU_SREG_DS, ctxt->vcpu);
+       tss->fs = ops->get_segment_selector(VCPU_SREG_FS, ctxt->vcpu);
+       tss->gs = ops->get_segment_selector(VCPU_SREG_GS, ctxt->vcpu);
+       tss->ldt_selector = ops->get_segment_selector(VCPU_SREG_LDTR, ctxt->vcpu);
 }
 
-static int
-emulate_syscall(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
+static int load_state_from_tss32(struct x86_emulate_ctxt *ctxt,
+                                struct x86_emulate_ops *ops,
+                                struct tss_segment_32 *tss)
 {
        struct decode_cache *c = &ctxt->decode;
-       struct desc_struct cs, ss;
-       u64 msr_data;
-       u16 cs_sel, ss_sel;
+       int ret;
 
-       /* syscall is not available in real mode */
-       if (ctxt->mode == X86EMUL_MODE_REAL ||
-           ctxt->mode == X86EMUL_MODE_VM86) {
-               emulate_ud(ctxt);
+       if (ops->set_cr(3, tss->cr3, ctxt->vcpu)) {
+               emulate_gp(ctxt, 0);
                return X86EMUL_PROPAGATE_FAULT;
        }
+       c->eip = tss->eip;
+       ctxt->eflags = tss->eflags | 2;
+       c->regs[VCPU_REGS_RAX] = tss->eax;
+       c->regs[VCPU_REGS_RCX] = tss->ecx;
+       c->regs[VCPU_REGS_RDX] = tss->edx;
+       c->regs[VCPU_REGS_RBX] = tss->ebx;
+       c->regs[VCPU_REGS_RSP] = tss->esp;
+       c->regs[VCPU_REGS_RBP] = tss->ebp;
+       c->regs[VCPU_REGS_RSI] = tss->esi;
+       c->regs[VCPU_REGS_RDI] = tss->edi;
+
+       /*
+        * SDM says that segment selectors are loaded before segment
+        * descriptors
+        */
+       ops->set_segment_selector(tss->ldt_selector, VCPU_SREG_LDTR, ctxt->vcpu);
+       ops->set_segment_selector(tss->es, VCPU_SREG_ES, ctxt->vcpu);
+       ops->set_segment_selector(tss->cs, VCPU_SREG_CS, ctxt->vcpu);
+       ops->set_segment_selector(tss->ss, VCPU_SREG_SS, ctxt->vcpu);
+       ops->set_segment_selector(tss->ds, VCPU_SREG_DS, ctxt->vcpu);
+       ops->set_segment_selector(tss->fs, VCPU_SREG_FS, ctxt->vcpu);
+       ops->set_segment_selector(tss->gs, VCPU_SREG_GS, ctxt->vcpu);
+
+       /*
+        * Now load segment descriptors. If fault happenes at this stage
+        * it is handled in a context of new task
+        */
+       ret = load_segment_descriptor(ctxt, ops, tss->ldt_selector, VCPU_SREG_LDTR);
+       if (ret != X86EMUL_CONTINUE)
+               return ret;
+       ret = load_segment_descriptor(ctxt, ops, tss->es, VCPU_SREG_ES);
+       if (ret != X86EMUL_CONTINUE)
+               return ret;
+       ret = load_segment_descriptor(ctxt, ops, tss->cs, VCPU_SREG_CS);
+       if (ret != X86EMUL_CONTINUE)
+               return ret;
+       ret = load_segment_descriptor(ctxt, ops, tss->ss, VCPU_SREG_SS);
+       if (ret != X86EMUL_CONTINUE)
+               return ret;
+       ret = load_segment_descriptor(ctxt, ops, tss->ds, VCPU_SREG_DS);
+       if (ret != X86EMUL_CONTINUE)
+               return ret;
+       ret = load_segment_descriptor(ctxt, ops, tss->fs, VCPU_SREG_FS);
+       if (ret != X86EMUL_CONTINUE)
+               return ret;
+       ret = load_segment_descriptor(ctxt, ops, tss->gs, VCPU_SREG_GS);
+       if (ret != X86EMUL_CONTINUE)
+               return ret;
+
+       return X86EMUL_CONTINUE;
+}
+
+static int task_switch_32(struct x86_emulate_ctxt *ctxt,
+                         struct x86_emulate_ops *ops,
+                         u16 tss_selector, u16 old_tss_sel,
+                         ulong old_tss_base, struct desc_struct *new_desc)
+{
+       struct tss_segment_32 tss_seg;
+       int ret;
+       u32 err, new_tss_base = get_desc_base(new_desc);
 
-       setup_syscalls_segments(ctxt, ops, &cs, &ss);
+       ret = ops->read_std(old_tss_base, &tss_seg, sizeof tss_seg, ctxt->vcpu,
+                           &err);
+       if (ret == X86EMUL_PROPAGATE_FAULT) {
+               /* FIXME: need to provide precise fault address */
+               emulate_pf(ctxt, old_tss_base, err);
+               return ret;
+       }
 
-       ops->get_msr(ctxt->vcpu, MSR_STAR, &msr_data);
-       msr_data >>= 32;
-       cs_sel = (u16)(msr_data & 0xfffc);
-       ss_sel = (u16)(msr_data + 8);
+       save_state_to_tss32(ctxt, ops, &tss_seg);
 
-       if (is_long_mode(ctxt->vcpu)) {
-               cs.d = 0;
-               cs.l = 1;
+       ret = ops->write_std(old_tss_base, &tss_seg, sizeof tss_seg, ctxt->vcpu,
+                            &err);
+       if (ret == X86EMUL_PROPAGATE_FAULT) {
+               /* FIXME: need to provide precise fault address */
+               emulate_pf(ctxt, old_tss_base, err);
+               return ret;
        }
-       ops->set_cached_descriptor(&cs, VCPU_SREG_CS, ctxt->vcpu);
-       ops->set_segment_selector(cs_sel, VCPU_SREG_CS, ctxt->vcpu);
-       ops->set_cached_descriptor(&ss, VCPU_SREG_SS, ctxt->vcpu);
-       ops->set_segment_selector(ss_sel, VCPU_SREG_SS, ctxt->vcpu);
-
-       c->regs[VCPU_REGS_RCX] = c->eip;
-       if (is_long_mode(ctxt->vcpu)) {
-#ifdef CONFIG_X86_64
-               c->regs[VCPU_REGS_R11] = ctxt->eflags & ~EFLG_RF;
 
-               ops->get_msr(ctxt->vcpu,
-                            ctxt->mode == X86EMUL_MODE_PROT64 ?
-                            MSR_LSTAR : MSR_CSTAR, &msr_data);
-               c->eip = msr_data;
+       ret = ops->read_std(new_tss_base, &tss_seg, sizeof tss_seg, ctxt->vcpu,
+                           &err);
+       if (ret == X86EMUL_PROPAGATE_FAULT) {
+               /* FIXME: need to provide precise fault address */
+               emulate_pf(ctxt, new_tss_base, err);
+               return ret;
+       }
 
-               ops->get_msr(ctxt->vcpu, MSR_SYSCALL_MASK, &msr_data);
-               ctxt->eflags &= ~(msr_data | EFLG_RF);
-#endif
-       } else {
-               /* legacy mode */
-               ops->get_msr(ctxt->vcpu, MSR_STAR, &msr_data);
-               c->eip = (u32)msr_data;
+       if (old_tss_sel != 0xffff) {
+               tss_seg.prev_task_link = old_tss_sel;
 
-               ctxt->eflags &= ~(EFLG_VM | EFLG_IF | EFLG_RF);
+               ret = ops->write_std(new_tss_base,
+                                    &tss_seg.prev_task_link,
+                                    sizeof tss_seg.prev_task_link,
+                                    ctxt->vcpu, &err);
+               if (ret == X86EMUL_PROPAGATE_FAULT) {
+                       /* FIXME: need to provide precise fault address */
+                       emulate_pf(ctxt, new_tss_base, err);
+                       return ret;
+               }
        }
 
-       return X86EMUL_CONTINUE;
+       return load_state_from_tss32(ctxt, ops, &tss_seg);
 }
 
-static int
-emulate_sysenter(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
+static int emulator_do_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;
-       struct desc_struct cs, ss;
-       u64 msr_data;
-       u16 cs_sel, ss_sel;
+       struct desc_struct curr_tss_desc, next_tss_desc;
+       int ret;
+       u16 old_tss_sel = ops->get_segment_selector(VCPU_SREG_TR, ctxt->vcpu);
+       ulong old_tss_base =
+               ops->get_cached_segment_base(VCPU_SREG_TR, ctxt->vcpu);
+       u32 desc_limit;
 
-       /* inject #GP if in real mode */
-       if (ctxt->mode == X86EMUL_MODE_REAL) {
-               emulate_gp(ctxt, 0);
-               return X86EMUL_PROPAGATE_FAULT;
-       }
+       /* FIXME: old_tss_base == ~0 ? */
 
-       /* XXX sysenter/sysexit have not been tested in 64bit mode.
-       * Therefore, we inject an #UD.
-       */
-       if (ctxt->mode == X86EMUL_MODE_PROT64) {
-               emulate_ud(ctxt);
-               return X86EMUL_PROPAGATE_FAULT;
-       }
+       ret = read_segment_descriptor(ctxt, ops, tss_selector, &next_tss_desc);
+       if (ret != X86EMUL_CONTINUE)
+               return ret;
+       ret = read_segment_descriptor(ctxt, ops, old_tss_sel, &curr_tss_desc);
+       if (ret != X86EMUL_CONTINUE)
+               return ret;
 
-       setup_syscalls_segments(ctxt, ops, &cs, &ss);
+       /* FIXME: check that next_tss_desc is tss */
 
-       ops->get_msr(ctxt->vcpu, MSR_IA32_SYSENTER_CS, &msr_data);
-       switch (ctxt->mode) {
-       case X86EMUL_MODE_PROT32:
-               if ((msr_data & 0xfffc) == 0x0) {
-                       emulate_gp(ctxt, 0);
-                       return X86EMUL_PROPAGATE_FAULT;
-               }
-               break;
-       case X86EMUL_MODE_PROT64:
-               if (msr_data == 0x0) {
+       if (reason != TASK_SWITCH_IRET) {
+               if ((tss_selector & 3) > next_tss_desc.dpl ||
+                   ops->cpl(ctxt->vcpu) > next_tss_desc.dpl) {
                        emulate_gp(ctxt, 0);
                        return X86EMUL_PROPAGATE_FAULT;
                }
-               break;
        }
 
-       ctxt->eflags &= ~(EFLG_VM | EFLG_IF | EFLG_RF);
-       cs_sel = (u16)msr_data;
-       cs_sel &= ~SELECTOR_RPL_MASK;
-       ss_sel = cs_sel + 8;
-       ss_sel &= ~SELECTOR_RPL_MASK;
-       if (ctxt->mode == X86EMUL_MODE_PROT64
-               || is_long_mode(ctxt->vcpu)) {
-               cs.d = 0;
-               cs.l = 1;
+       desc_limit = desc_limit_scaled(&next_tss_desc);
+       if (!next_tss_desc.p ||
+           ((desc_limit < 0x67 && (next_tss_desc.type & 8)) ||
+            desc_limit < 0x2b)) {
+               emulate_ts(ctxt, tss_selector & 0xfffc);
+               return X86EMUL_PROPAGATE_FAULT;
        }
 
-       ops->set_cached_descriptor(&cs, VCPU_SREG_CS, ctxt->vcpu);
-       ops->set_segment_selector(cs_sel, VCPU_SREG_CS, ctxt->vcpu);
-       ops->set_cached_descriptor(&ss, VCPU_SREG_SS, ctxt->vcpu);
-       ops->set_segment_selector(ss_sel, VCPU_SREG_SS, ctxt->vcpu);
+       if (reason == TASK_SWITCH_IRET || reason == TASK_SWITCH_JMP) {
+               curr_tss_desc.type &= ~(1 << 1); /* clear busy flag */
+               write_segment_descriptor(ctxt, ops, old_tss_sel,
+                                        &curr_tss_desc);
+       }
 
-       ops->get_msr(ctxt->vcpu, MSR_IA32_SYSENTER_EIP, &msr_data);
-       c->eip = msr_data;
+       if (reason == TASK_SWITCH_IRET)
+               ctxt->eflags = ctxt->eflags & ~X86_EFLAGS_NT;
 
-       ops->get_msr(ctxt->vcpu, MSR_IA32_SYSENTER_ESP, &msr_data);
-       c->regs[VCPU_REGS_RSP] = msr_data;
+       /* 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;
 
-       return X86EMUL_CONTINUE;
-}
+       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;
 
-static int
-emulate_sysexit(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
-{
-       struct decode_cache *c = &ctxt->decode;
-       struct desc_struct cs, ss;
-       u64 msr_data;
-       int usermode;
-       u16 cs_sel, ss_sel;
+       if (reason == TASK_SWITCH_CALL || reason == TASK_SWITCH_GATE)
+               ctxt->eflags = ctxt->eflags | X86_EFLAGS_NT;
 
-       /* inject #GP if in real mode or Virtual 8086 mode */
-       if (ctxt->mode == X86EMUL_MODE_REAL ||
-           ctxt->mode == X86EMUL_MODE_VM86) {
-               emulate_gp(ctxt, 0);
-               return X86EMUL_PROPAGATE_FAULT;
+       if (reason != TASK_SWITCH_IRET) {
+               next_tss_desc.type |= (1 << 1); /* set busy flag */
+               write_segment_descriptor(ctxt, ops, tss_selector,
+                                        &next_tss_desc);
        }
 
-       setup_syscalls_segments(ctxt, ops, &cs, &ss);
+       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 ((c->rex_prefix & 0x8) != 0x0)
-               usermode = X86EMUL_MODE_PROT64;
-       else
-               usermode = X86EMUL_MODE_PROT32;
+       if (has_error_code) {
+               struct decode_cache *c = &ctxt->decode;
 
-       cs.dpl = 3;
-       ss.dpl = 3;
-       ops->get_msr(ctxt->vcpu, MSR_IA32_SYSENTER_CS, &msr_data);
-       switch (usermode) {
-       case X86EMUL_MODE_PROT32:
-               cs_sel = (u16)(msr_data + 16);
-               if ((msr_data & 0xfffc) == 0x0) {
-                       emulate_gp(ctxt, 0);
-                       return X86EMUL_PROPAGATE_FAULT;
-               }
-               ss_sel = (u16)(msr_data + 24);
-               break;
-       case X86EMUL_MODE_PROT64:
-               cs_sel = (u16)(msr_data + 32);
-               if (msr_data == 0x0) {
-                       emulate_gp(ctxt, 0);
-                       return X86EMUL_PROPAGATE_FAULT;
-               }
-               ss_sel = cs_sel + 8;
-               cs.d = 0;
-               cs.l = 1;
-               break;
+               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);
        }
-       cs_sel |= SELECTOR_RPL_MASK;
-       ss_sel |= SELECTOR_RPL_MASK;
-
-       ops->set_cached_descriptor(&cs, VCPU_SREG_CS, ctxt->vcpu);
-       ops->set_segment_selector(cs_sel, VCPU_SREG_CS, ctxt->vcpu);
-       ops->set_cached_descriptor(&ss, VCPU_SREG_SS, ctxt->vcpu);
-       ops->set_segment_selector(ss_sel, VCPU_SREG_SS, ctxt->vcpu);
 
-       c->eip = c->regs[VCPU_REGS_RDX];
-       c->regs[VCPU_REGS_RSP] = c->regs[VCPU_REGS_RCX];
-
-       return X86EMUL_CONTINUE;
+       return ret;
 }
 
-static bool emulator_bad_iopl(struct x86_emulate_ctxt *ctxt,
-                             struct x86_emulate_ops *ops)
+int emulator_task_switch(struct x86_emulate_ctxt *ctxt,
+                        u16 tss_selector, int reason,
+                        bool has_error_code, u32 error_code)
 {
-       int iopl;
-       if (ctxt->mode == X86EMUL_MODE_REAL)
-               return false;
-       if (ctxt->mode == X86EMUL_MODE_VM86)
-               return true;
-       iopl = (ctxt->eflags & X86_EFLAGS_IOPL) >> IOPL_SHIFT;
-       return ops->cpl(ctxt->vcpu) > iopl;
+       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 bool emulator_io_port_access_allowed(struct x86_emulate_ctxt *ctxt,
-                                           struct x86_emulate_ops *ops,
-                                           u16 port, u16 len)
+static void string_addr_inc(struct x86_emulate_ctxt *ctxt, unsigned long base,
+                           int reg, struct operand *op)
 {
-       struct desc_struct tr_seg;
-       int r;
-       u16 io_bitmap_ptr;
-       u8 perm, bit_idx = port & 0x7;
-       unsigned mask = (1 << len) - 1;
+       struct decode_cache *c = &ctxt->decode;
+       int df = (ctxt->eflags & EFLG_DF) ? -1 : 1;
 
-       ops->get_cached_descriptor(&tr_seg, VCPU_SREG_TR, ctxt->vcpu);
-       if (!tr_seg.p)
-               return false;
-       if (desc_limit_scaled(&tr_seg) < 103)
-               return false;
-       r = ops->read_std(get_desc_base(&tr_seg) + 102, &io_bitmap_ptr, 2,
-                         ctxt->vcpu, NULL);
-       if (r != X86EMUL_CONTINUE)
-               return false;
-       if (io_bitmap_ptr + port/8 > desc_limit_scaled(&tr_seg))
-               return false;
-       r = ops->read_std(get_desc_base(&tr_seg) + io_bitmap_ptr + port/8,
-                         &perm, 1, ctxt->vcpu, NULL);
-       if (r != X86EMUL_CONTINUE)
-               return false;
-       if ((perm >> bit_idx) & mask)
-               return false;
-       return true;
+       register_address_increment(c, &c->regs[reg], df * op->bytes);
+       op->ptr = (unsigned long *)register_address(c,  base, c->regs[reg]);
 }
 
-static bool emulator_io_permited(struct x86_emulate_ctxt *ctxt,
-                                struct x86_emulate_ops *ops,
-                                u16 port, u16 len)
+static int em_push(struct x86_emulate_ctxt *ctxt)
 {
-       if (emulator_bad_iopl(ctxt, ops))
-               if (!emulator_io_port_access_allowed(ctxt, ops, port, len))
-                       return false;
-       return true;
+       emulate_push(ctxt, ctxt->ops);
+       return X86EMUL_CONTINUE;
 }
 
-static void save_state_to_tss16(struct x86_emulate_ctxt *ctxt,
-                               struct x86_emulate_ops *ops,
-                               struct tss_segment_16 *tss)
-{
-       struct decode_cache *c = &ctxt->decode;
+#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) }
 
-       tss->ip = c->eip;
-       tss->flag = ctxt->eflags;
-       tss->ax = c->regs[VCPU_REGS_RAX];
-       tss->cx = c->regs[VCPU_REGS_RCX];
-       tss->dx = c->regs[VCPU_REGS_RDX];
-       tss->bx = c->regs[VCPU_REGS_RBX];
-       tss->sp = c->regs[VCPU_REGS_RSP];
-       tss->bp = c->regs[VCPU_REGS_RBP];
-       tss->si = c->regs[VCPU_REGS_RSI];
-       tss->di = c->regs[VCPU_REGS_RDI];
+static struct opcode group1[] = {
+       X7(D(Lock)), N
+};
 
-       tss->es = ops->get_segment_selector(VCPU_SREG_ES, ctxt->vcpu);
-       tss->cs = ops->get_segment_selector(VCPU_SREG_CS, ctxt->vcpu);
-       tss->ss = ops->get_segment_selector(VCPU_SREG_SS, ctxt->vcpu);
-       tss->ds = ops->get_segment_selector(VCPU_SREG_DS, ctxt->vcpu);
-       tss->ldt = ops->get_segment_selector(VCPU_SREG_LDTR, ctxt->vcpu);
-}
+static struct opcode group1A[] = {
+       D(DstMem | SrcNone | ModRM | Mov | Stack), N, N, N, N, N, N, N,
+};
 
-static int load_state_from_tss16(struct x86_emulate_ctxt *ctxt,
-                                struct x86_emulate_ops *ops,
-                                struct tss_segment_16 *tss)
-{
-       struct decode_cache *c = &ctxt->decode;
-       int ret;
+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)),
+};
 
-       c->eip = tss->ip;
-       ctxt->eflags = tss->flag | 2;
-       c->regs[VCPU_REGS_RAX] = tss->ax;
-       c->regs[VCPU_REGS_RCX] = tss->cx;
-       c->regs[VCPU_REGS_RDX] = tss->dx;
-       c->regs[VCPU_REGS_RBX] = tss->bx;
-       c->regs[VCPU_REGS_RSP] = tss->sp;
-       c->regs[VCPU_REGS_RBP] = tss->bp;
-       c->regs[VCPU_REGS_RSI] = tss->si;
-       c->regs[VCPU_REGS_RDI] = tss->di;
+static struct opcode group4[] = {
+       D(ByteOp | DstMem | SrcNone | ModRM | Lock), D(ByteOp | DstMem | SrcNone | ModRM | Lock),
+       N, N, N, N, N, N,
+};
 
-       /*
-        * SDM says that segment selectors are loaded before segment
-        * descriptors
-        */
-       ops->set_segment_selector(tss->ldt, VCPU_SREG_LDTR, ctxt->vcpu);
-       ops->set_segment_selector(tss->es, VCPU_SREG_ES, ctxt->vcpu);
-       ops->set_segment_selector(tss->cs, VCPU_SREG_CS, ctxt->vcpu);
-       ops->set_segment_selector(tss->ss, VCPU_SREG_SS, ctxt->vcpu);
-       ops->set_segment_selector(tss->ds, VCPU_SREG_DS, ctxt->vcpu);
+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,
+};
 
-       /*
-        * Now load segment descriptors. If fault happenes at this stage
-        * it is handled in a context of new task
-        */
-       ret = load_segment_descriptor(ctxt, ops, tss->ldt, VCPU_SREG_LDTR);
-       if (ret != X86EMUL_CONTINUE)
-               return ret;
-       ret = load_segment_descriptor(ctxt, ops, tss->es, VCPU_SREG_ES);
-       if (ret != X86EMUL_CONTINUE)
-               return ret;
-       ret = load_segment_descriptor(ctxt, ops, tss->cs, VCPU_SREG_CS);
-       if (ret != X86EMUL_CONTINUE)
-               return ret;
-       ret = load_segment_descriptor(ctxt, ops, tss->ss, VCPU_SREG_SS);
-       if (ret != X86EMUL_CONTINUE)
-               return ret;
-       ret = load_segment_descriptor(ctxt, ops, tss->ds, VCPU_SREG_DS);
-       if (ret != X86EMUL_CONTINUE)
-               return ret;
+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),
+}, {
+       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),
+};
 
-       return X86EMUL_CONTINUE;
-}
+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 int task_switch_16(struct x86_emulate_ctxt *ctxt,
-                         struct x86_emulate_ops *ops,
-                         u16 tss_selector, u16 old_tss_sel,
-                         ulong old_tss_base, struct desc_struct *new_desc)
+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 | 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, 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 | 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,
+       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 tss_segment_16 tss_seg;
-       int ret;
-       u32 err, new_tss_base = get_desc_base(new_desc);
+       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;
 
-       ret = ops->read_std(old_tss_base, &tss_seg, sizeof tss_seg, ctxt->vcpu,
-                           &err);
-       if (ret == X86EMUL_PROPAGATE_FAULT) {
-               /* FIXME: need to provide precise fault address */
-               emulate_pf(ctxt, old_tss_base, err);
-               return ret;
+       /* 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;
        }
 
-       save_state_to_tss16(ctxt, ops, &tss_seg);
+       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. */
 
-       ret = ops->write_std(old_tss_base, &tss_seg, sizeof tss_seg, ctxt->vcpu,
-                            &err);
-       if (ret == X86EMUL_PROPAGATE_FAULT) {
-               /* FIXME: need to provide precise fault address */
-               emulate_pf(ctxt, old_tss_base, err);
-               return ret;
+               c->rex_prefix = 0;
        }
 
-       ret = ops->read_std(new_tss_base, &tss_seg, sizeof tss_seg, ctxt->vcpu,
-                           &err);
-       if (ret == X86EMUL_PROPAGATE_FAULT) {
-               /* FIXME: need to provide precise fault address */
-               emulate_pf(ctxt, new_tss_base, err);
-               return ret;
-       }
+done_prefixes:
 
-       if (old_tss_sel != 0xffff) {
-               tss_seg.prev_task_link = old_tss_sel;
+       /* REX prefix. */
+       if (c->rex_prefix)
+               if (c->rex_prefix & 8)
+                       c->op_bytes = 8;        /* REX.W */
 
-               ret = ops->write_std(new_tss_base,
-                                    &tss_seg.prev_task_link,
-                                    sizeof tss_seg.prev_task_link,
-                                    ctxt->vcpu, &err);
-               if (ret == X86EMUL_PROPAGATE_FAULT) {
-                       /* FIXME: need to provide precise fault address */
-                       emulate_pf(ctxt, new_tss_base, err);
-                       return ret;
+       /* 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];
                }
        }
+       c->d = opcode.flags;
 
-       return load_state_from_tss16(ctxt, ops, &tss_seg);
-}
+       if (c->d & Group) {
+               dual = c->d & GroupDual;
+               c->modrm = insn_fetch(u8, 1, c->eip);
+               --c->eip;
 
-static void save_state_to_tss32(struct x86_emulate_ctxt *ctxt,
-                               struct x86_emulate_ops *ops,
-                               struct tss_segment_32 *tss)
-{
-       struct decode_cache *c = &ctxt->decode;
+               if (c->d & GroupDual) {
+                       g_mod012 = opcode.u.gdual->mod012;
+                       g_mod3 = opcode.u.gdual->mod3;
+               } else
+                       g_mod012 = g_mod3 = opcode.u.group;
 
-       tss->cr3 = ops->get_cr(3, ctxt->vcpu);
-       tss->eip = c->eip;
-       tss->eflags = ctxt->eflags;
-       tss->eax = c->regs[VCPU_REGS_RAX];
-       tss->ecx = c->regs[VCPU_REGS_RCX];
-       tss->edx = c->regs[VCPU_REGS_RDX];
-       tss->ebx = c->regs[VCPU_REGS_RBX];
-       tss->esp = c->regs[VCPU_REGS_RSP];
-       tss->ebp = c->regs[VCPU_REGS_RBP];
-       tss->esi = c->regs[VCPU_REGS_RSI];
-       tss->edi = c->regs[VCPU_REGS_RDI];
+               c->d &= ~(Group | GroupDual);
 
-       tss->es = ops->get_segment_selector(VCPU_SREG_ES, ctxt->vcpu);
-       tss->cs = ops->get_segment_selector(VCPU_SREG_CS, ctxt->vcpu);
-       tss->ss = ops->get_segment_selector(VCPU_SREG_SS, ctxt->vcpu);
-       tss->ds = ops->get_segment_selector(VCPU_SREG_DS, ctxt->vcpu);
-       tss->fs = ops->get_segment_selector(VCPU_SREG_FS, ctxt->vcpu);
-       tss->gs = ops->get_segment_selector(VCPU_SREG_GS, ctxt->vcpu);
-       tss->ldt_selector = ops->get_segment_selector(VCPU_SREG_LDTR, ctxt->vcpu);
-}
+               goffset = (c->modrm >> 3) & 7;
 
-static int load_state_from_tss32(struct x86_emulate_ctxt *ctxt,
-                                struct x86_emulate_ops *ops,
-                                struct tss_segment_32 *tss)
-{
-       struct decode_cache *c = &ctxt->decode;
-       int ret;
+               if ((c->modrm >> 6) == 3)
+                       opcode = g_mod3[goffset];
+               else
+                       opcode = g_mod012[goffset];
+               c->d |= opcode.flags;
+       }
 
-       if (ops->set_cr(3, tss->cr3, ctxt->vcpu)) {
-               emulate_gp(ctxt, 0);
-               return X86EMUL_PROPAGATE_FAULT;
+       c->execute = opcode.u.execute;
+
+       /* Unrecognised? */
+       if (c->d == 0 || (c->d & Undefined)) {
+               DPRINTF("Cannot emulate %02x\n", c->b);
+               return -1;
        }
-       c->eip = tss->eip;
-       ctxt->eflags = tss->eflags | 2;
-       c->regs[VCPU_REGS_RAX] = tss->eax;
-       c->regs[VCPU_REGS_RCX] = tss->ecx;
-       c->regs[VCPU_REGS_RDX] = tss->edx;
-       c->regs[VCPU_REGS_RBX] = tss->ebx;
-       c->regs[VCPU_REGS_RSP] = tss->esp;
-       c->regs[VCPU_REGS_RBP] = tss->ebp;
-       c->regs[VCPU_REGS_RSI] = tss->esi;
-       c->regs[VCPU_REGS_RDI] = tss->edi;
 
-       /*
-        * SDM says that segment selectors are loaded before segment
-        * descriptors
-        */
-       ops->set_segment_selector(tss->ldt_selector, VCPU_SREG_LDTR, ctxt->vcpu);
-       ops->set_segment_selector(tss->es, VCPU_SREG_ES, ctxt->vcpu);
-       ops->set_segment_selector(tss->cs, VCPU_SREG_CS, ctxt->vcpu);
-       ops->set_segment_selector(tss->ss, VCPU_SREG_SS, ctxt->vcpu);
-       ops->set_segment_selector(tss->ds, VCPU_SREG_DS, ctxt->vcpu);
-       ops->set_segment_selector(tss->fs, VCPU_SREG_FS, ctxt->vcpu);
-       ops->set_segment_selector(tss->gs, VCPU_SREG_GS, ctxt->vcpu);
+       if (mode == X86EMUL_MODE_PROT64 && (c->d & Stack))
+               c->op_bytes = 8;
 
-       /*
-        * Now load segment descriptors. If fault happenes at this stage
-        * it is handled in a context of new task
-        */
-       ret = load_segment_descriptor(ctxt, ops, tss->ldt_selector, VCPU_SREG_LDTR);
-       if (ret != X86EMUL_CONTINUE)
-               return ret;
-       ret = load_segment_descriptor(ctxt, ops, tss->es, VCPU_SREG_ES);
-       if (ret != X86EMUL_CONTINUE)
-               return ret;
-       ret = load_segment_descriptor(ctxt, ops, tss->cs, VCPU_SREG_CS);
-       if (ret != X86EMUL_CONTINUE)
-               return ret;
-       ret = load_segment_descriptor(ctxt, ops, tss->ss, VCPU_SREG_SS);
-       if (ret != X86EMUL_CONTINUE)
-               return ret;
-       ret = load_segment_descriptor(ctxt, ops, tss->ds, VCPU_SREG_DS);
-       if (ret != X86EMUL_CONTINUE)
-               return ret;
-       ret = load_segment_descriptor(ctxt, ops, tss->fs, VCPU_SREG_FS);
-       if (ret != X86EMUL_CONTINUE)
-               return ret;
-       ret = load_segment_descriptor(ctxt, ops, tss->gs, VCPU_SREG_GS);
-       if (ret != X86EMUL_CONTINUE)
-               return ret;
+       /* ModRM and SIB bytes. */
+       if (c->d & ModRM) {
+               rc = decode_modrm(ctxt, ops);
+               if (!c->has_seg_override)
+                       set_seg_override(c, c->modrm_seg);
+       } else if (c->d & MemAbs)
+               rc = decode_abs(ctxt, ops);
+       if (rc != X86EMUL_CONTINUE)
+               goto done;
 
-       return X86EMUL_CONTINUE;
-}
+       if (!c->has_seg_override)
+               set_seg_override(c, VCPU_SREG_DS);
 
-static int task_switch_32(struct x86_emulate_ctxt *ctxt,
-                         struct x86_emulate_ops *ops,
-                         u16 tss_selector, u16 old_tss_sel,
-                         ulong old_tss_base, struct desc_struct *new_desc)
-{
-       struct tss_segment_32 tss_seg;
-       int ret;
-       u32 err, new_tss_base = get_desc_base(new_desc);
+       if (!(!c->twobyte && c->b == 0x8d))
+               c->modrm_ea += seg_override_base(ctxt, ops, c);
 
-       ret = ops->read_std(old_tss_base, &tss_seg, sizeof tss_seg, ctxt->vcpu,
-                           &err);
-       if (ret == X86EMUL_PROPAGATE_FAULT) {
-               /* FIXME: need to provide precise fault address */
-               emulate_pf(ctxt, old_tss_base, err);
-               return ret;
-       }
+       if (c->ad_bytes != 8)
+               c->modrm_ea = (u32)c->modrm_ea;
 
-       save_state_to_tss32(ctxt, ops, &tss_seg);
+       if (c->rip_relative)
+               c->modrm_ea += c->eip;
 
-       ret = ops->write_std(old_tss_base, &tss_seg, sizeof tss_seg, ctxt->vcpu,
-                            &err);
-       if (ret == X86EMUL_PROPAGATE_FAULT) {
-               /* FIXME: need to provide precise fault address */
-               emulate_pf(ctxt, old_tss_base, err);
-               return ret;
+       /*
+        * 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;
        }
 
-       ret = ops->read_std(new_tss_base, &tss_seg, sizeof tss_seg, ctxt->vcpu,
-                           &err);
-       if (ret == X86EMUL_PROPAGATE_FAULT) {
-               /* FIXME: need to provide precise fault address */
-               emulate_pf(ctxt, new_tss_base, err);
-               return ret;
+       /*
+        * 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 (old_tss_sel != 0xffff) {
-               tss_seg.prev_task_link = old_tss_sel;
-
-               ret = ops->write_std(new_tss_base,
-                                    &tss_seg.prev_task_link,
-                                    sizeof tss_seg.prev_task_link,
-                                    ctxt->vcpu, &err);
-               if (ret == X86EMUL_PROPAGATE_FAULT) {
-                       /* FIXME: need to provide precise fault address */
-                       emulate_pf(ctxt, new_tss_base, err);
-                       return ret;
+       /* 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));
+               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;
                }
-       }
-
-       return load_state_from_tss32(ctxt, ops, &tss_seg);
-}
-
-static int emulator_do_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 desc_struct curr_tss_desc, next_tss_desc;
-       int ret;
-       u16 old_tss_sel = ops->get_segment_selector(VCPU_SREG_TR, ctxt->vcpu);
-       ulong old_tss_base =
-               ops->get_cached_segment_base(VCPU_SREG_TR, ctxt->vcpu);
-       u32 desc_limit;
-
-       /* FIXME: old_tss_base == ~0 ? */
-
-       ret = read_segment_descriptor(ctxt, ops, tss_selector, &next_tss_desc);
-       if (ret != X86EMUL_CONTINUE)
-               return ret;
-       ret = read_segment_descriptor(ctxt, ops, old_tss_sel, &curr_tss_desc);
-       if (ret != X86EMUL_CONTINUE)
-               return ret;
-
-       /* FIXME: check that next_tss_desc is tss */
+               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);
 
-       if (reason != TASK_SWITCH_IRET) {
-               if ((tss_selector & 3) > next_tss_desc.dpl ||
-                   ops->cpl(ctxt->vcpu) > next_tss_desc.dpl) {
-                       emulate_gp(ctxt, 0);
-                       return X86EMUL_PROPAGATE_FAULT;
+                       c->dst.ptr = (void *)c->dst.ptr +
+                                                  (c->src.val & mask) / 8;
                }
+               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;
+               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;
+               break;
        }
 
-       desc_limit = desc_limit_scaled(&next_tss_desc);
-       if (!next_tss_desc.p ||
-           ((desc_limit < 0x67 && (next_tss_desc.type & 8)) ||
-            desc_limit < 0x2b)) {
-               emulate_ts(ctxt, tss_selector & 0xfffc);
-               return X86EMUL_PROPAGATE_FAULT;
-       }
-
-       if (reason == TASK_SWITCH_IRET || reason == TASK_SWITCH_JMP) {
-               curr_tss_desc.type &= ~(1 << 1); /* clear busy flag */
-               write_segment_descriptor(ctxt, ops, old_tss_sel,
-                                        &curr_tss_desc);
-       }
-
-       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,
-                        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;
-
-       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;
-       }
-
+done:
        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->ptr = (unsigned long *)register_address(c,  base, c->regs[reg]);
-}
-
 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;
@@ -2647,6 +2725,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;
 
@@ -2716,9 +2801,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);
@@ -2740,10 +2822,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);
@@ -2913,6 +2991,12 @@ special_insn:
                break;
        case 0xcb:              /* ret far */
                rc = emulate_ret_far(ctxt, ops);
+               if (rc != X86EMUL_CONTINUE)
+                       goto done;
+               break;
+       case 0xcf:              /* iret */
+               rc = emulate_iret(ctxt, ops);
+
                if (rc != X86EMUL_CONTINUE)
                        goto done;
                break;
@@ -3135,7 +3219,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;