]> git.karo-electronics.de Git - mv-sheeva.git/blobdiff - arch/x86/kvm/emulate.c
Merge branch 'master' into csb1725
[mv-sheeva.git] / arch / x86 / kvm / emulate.c
index 66ca98aafdd6a73d7eea8834d1f1c930384b8268..38b6e8dafaff9a3d46184db6c05516db826a75ec 100644 (file)
@@ -9,7 +9,7 @@
  * privileged instructions:
  *
  * Copyright (C) 2006 Qumranet
- * Copyright 2010 Red Hat, Inc. and/or its affilates.
+ * Copyright 2010 Red Hat, Inc. and/or its affiliates.
  *
  *   Avi Kivity <avi@qumranet.com>
  *   Yaniv Kamay <yaniv@qumranet.com>
 #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 DstImmUByte (7<<1)     /* 8-bit unsigned immediate operand */
 #define DstMask     (7<<1)
 /* Source operand type. */
 #define SrcNone     (0<<4)     /* No source operand. */
-#define SrcImplicit (0<<4)     /* Source operand is implicit in the opcode. */
 #define SrcReg      (1<<4)     /* Register operand. */
 #define SrcMem      (2<<4)     /* Memory operand. */
 #define SrcMem16    (3<<4)     /* Memory operand (16-bit). */
@@ -71,6 +71,7 @@
 #define SrcImmFAddr (0xb<<4)   /* Source is immediate far address */
 #define SrcMemFAddr (0xc<<4)   /* Source is far address in memory */
 #define SrcAcc      (0xd<<4)   /* Source Accumulator */
+#define SrcImmU16   (0xe<<4)    /* Immediate operand, unsigned, 16 bits */
 #define SrcMask     (0xf<<4)
 /* Generic ModRM decode. */
 #define ModRM       (1<<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 NoAccess    (1<<23) /* Don't access memory (lea/invlpg/verr etc) */
+#define Op3264      (1<<24) /* Operand is 64b in long mode, 32b otherwise */
+#define Undefined   (1<<25) /* No Such Instruction */
 #define Lock        (1<<26) /* lock prefix is allowed for the instruction */
 #define Priv        (1<<27) /* instruction generates #GP if current CPL != 0 */
 #define No64       (1<<28)
 #define Src2CL      (1<<29)
 #define Src2ImmByte (2<<29)
 #define Src2One     (3<<29)
+#define Src2Imm     (4<<29)
 #define Src2Mask    (7<<29)
 
-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 - 0x47 */
-       DstReg, DstReg, DstReg, DstReg, DstReg, DstReg, DstReg, DstReg,
-       /* 0x48 - 0x4F */
-       DstReg, DstReg, DstReg, DstReg, DstReg, DstReg, DstReg, 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. */
@@ -392,6 +140,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
@@ -444,13 +195,13 @@ static u32 group2_table[] = {
 #define ON64(x)
 #endif
 
-#define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix)     \
+#define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix, _dsttype) \
        do {                                                            \
                __asm__ __volatile__ (                                  \
                        _PRE_EFLAGS("0", "4", "2")                      \
                        _op _suffix " %"_x"3,%1; "                      \
                        _POST_EFLAGS("0", "4", "2")                     \
-                       : "=m" (_eflags), "=m" ((_dst).val),            \
+                       : "=m" (_eflags), "+q" (*(_dsttype*)&(_dst).val),\
                          "=&r" (_tmp)                                  \
                        : _y ((_src).val), "i" (EFLAGS_MASK));          \
        } while (0)
@@ -463,13 +214,13 @@ static u32 group2_table[] = {
                                                                        \
                switch ((_dst).bytes) {                                 \
                case 2:                                                 \
-                       ____emulate_2op(_op,_src,_dst,_eflags,_wx,_wy,"w"); \
+                       ____emulate_2op(_op,_src,_dst,_eflags,_wx,_wy,"w",u16);\
                        break;                                          \
                case 4:                                                 \
-                       ____emulate_2op(_op,_src,_dst,_eflags,_lx,_ly,"l"); \
+                       ____emulate_2op(_op,_src,_dst,_eflags,_lx,_ly,"l",u32);\
                        break;                                          \
                case 8:                                                 \
-                       ON64(____emulate_2op(_op,_src,_dst,_eflags,_qx,_qy,"q")); \
+                       ON64(____emulate_2op(_op,_src,_dst,_eflags,_qx,_qy,"q",u64)); \
                        break;                                          \
                }                                                       \
        } while (0)
@@ -479,7 +230,7 @@ static u32 group2_table[] = {
                unsigned long _tmp;                                          \
                switch ((_dst).bytes) {                                      \
                case 1:                                                      \
-                       ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b");  \
+                       ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \
                        break;                                               \
                default:                                                     \
                        __emulate_2op_nobyte(_op, _src, _dst, _eflags,       \
@@ -566,6 +317,74 @@ static u32 group2_table[] = {
                }                                                       \
        } while (0)
 
+#define __emulate_1op_rax_rdx(_op, _src, _rax, _rdx, _eflags, _suffix)         \
+       do {                                                            \
+               unsigned long _tmp;                                     \
+                                                                       \
+               __asm__ __volatile__ (                                  \
+                       _PRE_EFLAGS("0", "4", "1")                      \
+                       _op _suffix " %5; "                             \
+                       _POST_EFLAGS("0", "4", "1")                     \
+                       : "=m" (_eflags), "=&r" (_tmp),                 \
+                         "+a" (_rax), "+d" (_rdx)                      \
+                       : "i" (EFLAGS_MASK), "m" ((_src).val),          \
+                         "a" (_rax), "d" (_rdx));                      \
+       } while (0)
+
+#define __emulate_1op_rax_rdx_ex(_op, _src, _rax, _rdx, _eflags, _suffix, _ex) \
+       do {                                                            \
+               unsigned long _tmp;                                     \
+                                                                       \
+               __asm__ __volatile__ (                                  \
+                       _PRE_EFLAGS("0", "5", "1")                      \
+                       "1: \n\t"                                       \
+                       _op _suffix " %6; "                             \
+                       "2: \n\t"                                       \
+                       _POST_EFLAGS("0", "5", "1")                     \
+                       ".pushsection .fixup,\"ax\" \n\t"               \
+                       "3: movb $1, %4 \n\t"                           \
+                       "jmp 2b \n\t"                                   \
+                       ".popsection \n\t"                              \
+                       _ASM_EXTABLE(1b, 3b)                            \
+                       : "=m" (_eflags), "=&r" (_tmp),                 \
+                         "+a" (_rax), "+d" (_rdx), "+qm"(_ex)          \
+                       : "i" (EFLAGS_MASK), "m" ((_src).val),          \
+                         "a" (_rax), "d" (_rdx));                      \
+       } while (0)
+
+/* instruction has only one source operand, destination is implicit (e.g. mul, div, imul, idiv) */
+#define emulate_1op_rax_rdx(_op, _src, _rax, _rdx, _eflags)                    \
+       do {                                                                    \
+               switch((_src).bytes) {                                          \
+               case 1: __emulate_1op_rax_rdx(_op, _src, _rax, _rdx, _eflags, "b"); break; \
+               case 2: __emulate_1op_rax_rdx(_op, _src, _rax, _rdx,  _eflags, "w"); break; \
+               case 4: __emulate_1op_rax_rdx(_op, _src, _rax, _rdx, _eflags, "l"); break; \
+               case 8: ON64(__emulate_1op_rax_rdx(_op, _src, _rax, _rdx, _eflags, "q")); break; \
+               }                                                       \
+       } while (0)
+
+#define emulate_1op_rax_rdx_ex(_op, _src, _rax, _rdx, _eflags, _ex)    \
+       do {                                                            \
+               switch((_src).bytes) {                                  \
+               case 1:                                                 \
+                       __emulate_1op_rax_rdx_ex(_op, _src, _rax, _rdx, \
+                                                _eflags, "b", _ex);    \
+                       break;                                          \
+               case 2:                                                 \
+                       __emulate_1op_rax_rdx_ex(_op, _src, _rax, _rdx, \
+                                                _eflags, "w", _ex);    \
+                       break;                                          \
+               case 4:                                                 \
+                       __emulate_1op_rax_rdx_ex(_op, _src, _rax, _rdx, \
+                                                _eflags, "l", _ex);    \
+                       break;                                          \
+               case 8: ON64(                                           \
+                       __emulate_1op_rax_rdx_ex(_op, _src, _rax, _rdx, \
+                                                _eflags, "q", _ex));   \
+                       break;                                          \
+               }                                                       \
+       } while (0)
+
 /* Fetch next part of the instruction being emulated. */
 #define insn_fetch(_type, _size, _eip)                                  \
 ({     unsigned long _x;                                               \
@@ -661,7 +480,6 @@ static void emulate_exception(struct x86_emulate_ctxt *ctxt, int vec,
        ctxt->exception = vec;
        ctxt->error_code = error;
        ctxt->error_code_valid = valid;
-       ctxt->restart = false;
 }
 
 static void emulate_gp(struct x86_emulate_ctxt *ctxt, int err)
@@ -669,11 +487,9 @@ static void emulate_gp(struct x86_emulate_ctxt *ctxt, int err)
        emulate_exception(ctxt, GP_VECTOR, err, true);
 }
 
-static void emulate_pf(struct x86_emulate_ctxt *ctxt, unsigned long addr,
-                      int err)
+static void emulate_pf(struct x86_emulate_ctxt *ctxt)
 {
-       ctxt->cr2 = addr;
-       emulate_exception(ctxt, PF_VECTOR, err, true);
+       emulate_exception(ctxt, PF_VECTOR, 0, true);
 }
 
 static void emulate_ud(struct x86_emulate_ctxt *ctxt)
@@ -686,6 +502,12 @@ static void emulate_ts(struct x86_emulate_ctxt *ctxt, int err)
        emulate_exception(ctxt, TS_VECTOR, err, true);
 }
 
+static int emulate_de(struct x86_emulate_ctxt *ctxt)
+{
+       emulate_exception(ctxt, DE_VECTOR, 0, false);
+       return X86EMUL_PROPAGATE_FAULT;
+}
+
 static int do_fetch_insn_byte(struct x86_emulate_ctxt *ctxt,
                              struct x86_emulate_ops *ops,
                              unsigned long eip, u8 *dest)
@@ -742,7 +564,7 @@ static void *decode_register(u8 modrm_reg, unsigned long *regs,
 
 static int read_descriptor(struct x86_emulate_ctxt *ctxt,
                           struct x86_emulate_ops *ops,
-                          void *ptr,
+                          ulong addr,
                           u16 *size, unsigned long *address, int op_bytes)
 {
        int rc;
@@ -750,12 +572,10 @@ static int read_descriptor(struct x86_emulate_ctxt *ctxt,
        if (op_bytes == 2)
                op_bytes = 3;
        *address = 0;
-       rc = ops->read_std((unsigned long)ptr, (unsigned long *)size, 2,
-                          ctxt->vcpu, NULL);
+       rc = ops->read_std(addr, (unsigned long *)size, 2, ctxt->vcpu, NULL);
        if (rc != X86EMUL_CONTINUE)
                return rc;
-       rc = ops->read_std((unsigned long)ptr + 2, address, op_bytes,
-                          ctxt->vcpu, NULL);
+       rc = ops->read_std(addr + 2, address, op_bytes, ctxt->vcpu, NULL);
        return rc;
 }
 
@@ -794,6 +614,24 @@ static int test_cc(unsigned int condition, unsigned int flags)
        return (!!rc ^ (condition & 1));
 }
 
+static void fetch_register_operand(struct operand *op)
+{
+       switch (op->bytes) {
+       case 1:
+               op->val = *(u8 *)op->addr.reg;
+               break;
+       case 2:
+               op->val = *(u16 *)op->addr.reg;
+               break;
+       case 4:
+               op->val = *(u32 *)op->addr.reg;
+               break;
+       case 8:
+               op->val = *(u64 *)op->addr.reg;
+               break;
+       }
+}
+
 static void decode_register_operand(struct operand *op,
                                    struct decode_cache *c,
                                    int inhibit_bytereg)
@@ -805,34 +643,25 @@ static void decode_register_operand(struct operand *op,
                reg = (c->b & 7) | ((c->rex_prefix & 1) << 3);
        op->type = OP_REG;
        if ((c->d & ByteOp) && !inhibit_bytereg) {
-               op->ptr = decode_register(reg, c->regs, highbyte_regs);
-               op->val = *(u8 *)op->ptr;
+               op->addr.reg = decode_register(reg, c->regs, highbyte_regs);
                op->bytes = 1;
        } else {
-               op->ptr = decode_register(reg, c->regs, 0);
+               op->addr.reg = decode_register(reg, c->regs, 0);
                op->bytes = c->op_bytes;
-               switch (op->bytes) {
-               case 2:
-                       op->val = *(u16 *)op->ptr;
-                       break;
-               case 4:
-                       op->val = *(u32 *)op->ptr;
-                       break;
-               case 8:
-                       op->val = *(u64 *) op->ptr;
-                       break;
-               }
        }
+       fetch_register_operand(op);
        op->orig_val = op->val;
 }
 
 static int decode_modrm(struct x86_emulate_ctxt *ctxt,
-                       struct x86_emulate_ops *ops)
+                       struct x86_emulate_ops *ops,
+                       struct operand *op)
 {
        struct decode_cache *c = &ctxt->decode;
        u8 sib;
        int index_reg = 0, base_reg = 0, scale;
        int rc = X86EMUL_CONTINUE;
+       ulong modrm_ea = 0;
 
        if (c->rex_prefix) {
                c->modrm_reg = (c->rex_prefix & 4) << 1;        /* REX.R */
@@ -844,16 +673,19 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
        c->modrm_mod |= (c->modrm & 0xc0) >> 6;
        c->modrm_reg |= (c->modrm & 0x38) >> 3;
        c->modrm_rm |= (c->modrm & 0x07);
-       c->modrm_ea = 0;
-       c->use_modrm_ea = 1;
+       c->modrm_seg = VCPU_SREG_DS;
 
        if (c->modrm_mod == 3) {
-               c->modrm_ptr = decode_register(c->modrm_rm,
+               op->type = OP_REG;
+               op->bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
+               op->addr.reg = decode_register(c->modrm_rm,
                                               c->regs, c->d & ByteOp);
-               c->modrm_val = *(unsigned long *)c->modrm_ptr;
+               fetch_register_operand(op);
                return rc;
        }
 
+       op->type = OP_MEM;
+
        if (c->ad_bytes == 2) {
                unsigned bx = c->regs[VCPU_REGS_RBX];
                unsigned bp = c->regs[VCPU_REGS_RBP];
@@ -864,47 +696,46 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
                switch (c->modrm_mod) {
                case 0:
                        if (c->modrm_rm == 6)
-                               c->modrm_ea += insn_fetch(u16, 2, c->eip);
+                               modrm_ea += insn_fetch(u16, 2, c->eip);
                        break;
                case 1:
-                       c->modrm_ea += insn_fetch(s8, 1, c->eip);
+                       modrm_ea += insn_fetch(s8, 1, c->eip);
                        break;
                case 2:
-                       c->modrm_ea += insn_fetch(u16, 2, c->eip);
+                       modrm_ea += insn_fetch(u16, 2, c->eip);
                        break;
                }
                switch (c->modrm_rm) {
                case 0:
-                       c->modrm_ea += bx + si;
+                       modrm_ea += bx + si;
                        break;
                case 1:
-                       c->modrm_ea += bx + di;
+                       modrm_ea += bx + di;
                        break;
                case 2:
-                       c->modrm_ea += bp + si;
+                       modrm_ea += bp + si;
                        break;
                case 3:
-                       c->modrm_ea += bp + di;
+                       modrm_ea += bp + di;
                        break;
                case 4:
-                       c->modrm_ea += si;
+                       modrm_ea += si;
                        break;
                case 5:
-                       c->modrm_ea += di;
+                       modrm_ea += di;
                        break;
                case 6:
                        if (c->modrm_mod != 0)
-                               c->modrm_ea += bp;
+                               modrm_ea += bp;
                        break;
                case 7:
-                       c->modrm_ea += bx;
+                       modrm_ea += bx;
                        break;
                }
                if (c->modrm_rm == 2 || c->modrm_rm == 3 ||
                    (c->modrm_rm == 6 && c->modrm_mod != 0))
-                       if (!c->has_seg_override)
-                               set_seg_override(c, VCPU_SREG_SS);
-               c->modrm_ea = (u16)c->modrm_ea;
+                       c->modrm_seg = VCPU_SREG_SS;
+               modrm_ea = (u16)modrm_ea;
        } else {
                /* 32/64-bit ModR/M decode. */
                if ((c->modrm_rm & 7) == 4) {
@@ -914,479 +745,143 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
                        scale = sib >> 6;
 
                        if ((base_reg & 7) == 5 && c->modrm_mod == 0)
-                               c->modrm_ea += insn_fetch(s32, 4, c->eip);
+                               modrm_ea += insn_fetch(s32, 4, c->eip);
                        else
-                               c->modrm_ea += c->regs[base_reg];
+                               modrm_ea += c->regs[base_reg];
                        if (index_reg != 4)
-                               c->modrm_ea += c->regs[index_reg] << scale;
+                               modrm_ea += c->regs[index_reg] << scale;
                } else if ((c->modrm_rm & 7) == 5 && c->modrm_mod == 0) {
                        if (ctxt->mode == X86EMUL_MODE_PROT64)
                                c->rip_relative = 1;
                } else
-                       c->modrm_ea += c->regs[c->modrm_rm];
+                       modrm_ea += c->regs[c->modrm_rm];
                switch (c->modrm_mod) {
                case 0:
                        if (c->modrm_rm == 5)
-                               c->modrm_ea += insn_fetch(s32, 4, c->eip);
+                               modrm_ea += insn_fetch(s32, 4, c->eip);
                        break;
                case 1:
-                       c->modrm_ea += insn_fetch(s8, 1, c->eip);
+                       modrm_ea += insn_fetch(s8, 1, c->eip);
                        break;
                case 2:
-                       c->modrm_ea += insn_fetch(s32, 4, c->eip);
+                       modrm_ea += insn_fetch(s32, 4, c->eip);
                        break;
                }
        }
+       op->addr.mem = modrm_ea;
 done:
        return rc;
 }
 
 static int decode_abs(struct x86_emulate_ctxt *ctxt,
-                     struct x86_emulate_ops *ops)
+                     struct x86_emulate_ops *ops,
+                     struct operand *op)
 {
        struct decode_cache *c = &ctxt->decode;
        int rc = X86EMUL_CONTINUE;
 
+       op->type = OP_MEM;
        switch (c->ad_bytes) {
        case 2:
-               c->modrm_ea = insn_fetch(u16, 2, c->eip);
+               op->addr.mem = insn_fetch(u16, 2, c->eip);
                break;
        case 4:
-               c->modrm_ea = insn_fetch(u32, 4, c->eip);
+               op->addr.mem = insn_fetch(u32, 4, c->eip);
                break;
        case 8:
-               c->modrm_ea = insn_fetch(u64, 8, c->eip);
+               op->addr.mem = insn_fetch(u64, 8, c->eip);
                break;
        }
 done:
        return rc;
 }
 
-int
-x86_decode_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
+static void fetch_bit_operand(struct decode_cache *c)
 {
-       struct decode_cache *c = &ctxt->decode;
-       int rc = X86EMUL_CONTINUE;
-       int mode = ctxt->mode;
-       int def_op_bytes, def_ad_bytes, group;
+       long sv = 0, mask;
 
+       if (c->dst.type == OP_MEM && c->src.type == OP_REG) {
+               mask = ~(c->dst.bytes * 8 - 1);
 
-       /* 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);
+               if (c->src.bytes == 2)
+                       sv = (s16)c->src.val & (s16)mask;
+               else if (c->src.bytes == 4)
+                       sv = (s32)c->src.val & (s32)mask;
 
-       switch (mode) {
-       case X86EMUL_MODE_REAL:
-       case X86EMUL_MODE_VM86:
-       case X86EMUL_MODE_PROT16:
-               def_op_bytes = def_ad_bytes = 2;
-               break;
-       case X86EMUL_MODE_PROT32:
-               def_op_bytes = def_ad_bytes = 4;
-               break;
-#ifdef CONFIG_X86_64
-       case X86EMUL_MODE_PROT64:
-               def_op_bytes = 4;
-               def_ad_bytes = 8;
-               break;
-#endif
-       default:
-               return -1;
+               c->dst.addr.mem += (sv >> 3);
        }
 
-       c->op_bytes = def_op_bytes;
-       c->ad_bytes = def_ad_bytes;
-
-       /* 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. */
+       /* only subword offset */
+       c->src.val &= (c->dst.bytes << 3) - 1;
+}
 
-               c->rex_prefix = 0;
-       }
+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;
 
-done_prefixes:
+       while (size) {
+               int n = min(size, 8u);
+               size -= n;
+               if (mc->pos < mc->end)
+                       goto read_cached;
 
-       /* REX prefix. */
-       if (c->rex_prefix)
-               if (c->rex_prefix & 8)
-                       c->op_bytes = 8;        /* REX.W */
+               rc = ops->read_emulated(addr, mc->data + mc->end, n, &err,
+                                       ctxt->vcpu);
+               if (rc == X86EMUL_PROPAGATE_FAULT)
+                       emulate_pf(ctxt);
+               if (rc != X86EMUL_CONTINUE)
+                       return rc;
+               mc->end += n;
 
-       /* 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];
-               }
+       read_cached:
+               memcpy(dest, mc->data + mc->pos, n);
+               mc->pos += n;
+               dest += n;
+               addr += n;
        }
+       return X86EMUL_CONTINUE;
+}
 
-       if (c->d & Group) {
-               group = c->d & GroupMask;
-               c->modrm = insn_fetch(u8, 1, c->eip);
-               --c->eip;
-
-               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];
-       }
+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;
 
-       /* Unrecognised? */
-       if (c->d == 0) {
-               DPRINTF("Cannot emulate %02x\n", c->b);
-               return -1;
+       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;
        }
 
-       if (mode == X86EMUL_MODE_PROT64 && (c->d & Stack))
-               c->op_bytes = 8;
-
-       /* 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;
-
-       if (!c->has_seg_override)
-               set_seg_override(c, VCPU_SREG_DS);
-
-       if (!(!c->twobyte && c->b == 0x8d))
-               c->modrm_ea += seg_override_base(ctxt, ops, c);
+       memcpy(dest, rc->data + rc->pos, size);
+       rc->pos += size;
+       return 1;
+}
 
-       if (c->ad_bytes != 8)
-               c->modrm_ea = (u32)c->modrm_ea;
+static u32 desc_limit_scaled(struct desc_struct *desc)
+{
+       u32 limit = get_desc_limit(desc);
 
-       if (c->rip_relative)
-               c->modrm_ea += c->eip;
-
-       /*
-        * Decode and fetch the source operand: register, memory
-        * or immediate.
-        */
-       switch (c->d & SrcMask) {
-       case SrcNone:
-               break;
-       case SrcReg:
-               decode_register_operand(&c->src, c, 0);
-               break;
-       case SrcMem16:
-               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;
-       }
-
-       /*
-        * 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;
-       }
-
-       /* 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);
-
-                       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;
-       }
-
-done:
-       return (rc == X86EMUL_UNHANDLEABLE) ? -1 : 0;
-}
-
-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;
-
-       while (size) {
-               int n = min(size, 8u);
-               size -= n;
-               if (mc->pos < mc->end)
-                       goto read_cached;
-
-               rc = ops->read_emulated(addr, mc->data + mc->end, n, &err,
-                                       ctxt->vcpu);
-               if (rc == X86EMUL_PROPAGATE_FAULT)
-                       emulate_pf(ctxt, addr, err);
-               if (rc != X86EMUL_CONTINUE)
-                       return rc;
-               mc->end += n;
-
-       read_cached:
-               memcpy(dest, mc->data + mc->pos, n);
-               mc->pos += n;
-               dest += n;
-               addr += n;
-       }
-       return X86EMUL_CONTINUE;
-}
-
-static int pio_in_emulated(struct x86_emulate_ctxt *ctxt,
-                          struct x86_emulate_ops *ops,
-                          unsigned int size, unsigned short port,
-                          void *dest)
-{
-       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;
-       }
-
-       memcpy(dest, rc->data + rc->pos, size);
-       rc->pos += size;
-       return 1;
-}
-
-static u32 desc_limit_scaled(struct desc_struct *desc)
-{
-       u32 limit = get_desc_limit(desc);
-
-       return desc->g ? (limit << 12) | 0xfff : limit;
-}
+       return desc->g ? (limit << 12) | 0xfff : limit;
+}
 
 static void get_descriptor_table_ptr(struct x86_emulate_ctxt *ctxt,
                                     struct x86_emulate_ops *ops,
@@ -1424,7 +919,7 @@ static int read_segment_descriptor(struct x86_emulate_ctxt *ctxt,
        addr = dt.address + index * 8;
        ret = ops->read_std(addr, desc, sizeof *desc, ctxt->vcpu,  &err);
        if (ret == X86EMUL_PROPAGATE_FAULT)
-               emulate_pf(ctxt, addr, err);
+               emulate_pf(ctxt);
 
        return ret;
 }
@@ -1450,7 +945,7 @@ static int write_segment_descriptor(struct x86_emulate_ctxt *ctxt,
        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);
+               emulate_pf(ctxt);
 
        return ret;
 }
@@ -1573,6 +1068,25 @@ exception:
        return X86EMUL_PROPAGATE_FAULT;
 }
 
+static void write_register_operand(struct operand *op)
+{
+       /* The 4-byte case *is* correct: in 64-bit mode we zero-extend. */
+       switch (op->bytes) {
+       case 1:
+               *(u8 *)op->addr.reg = (u8)op->val;
+               break;
+       case 2:
+               *(u16 *)op->addr.reg = (u16)op->val;
+               break;
+       case 4:
+               *op->addr.reg = (u32)op->val;
+               break;  /* 64b: zero-extend */
+       case 8:
+               *op->addr.reg = op->val;
+               break;
+       }
+}
+
 static inline int writeback(struct x86_emulate_ctxt *ctxt,
                            struct x86_emulate_ops *ops)
 {
@@ -1582,28 +1096,12 @@ static inline int writeback(struct x86_emulate_ctxt *ctxt,
 
        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;
-               }
+               write_register_operand(&c->dst);
                break;
        case OP_MEM:
                if (c->lock_prefix)
                        rc = ops->cmpxchg_emulated(
-                                       (unsigned long)c->dst.ptr,
+                                       c->dst.addr.mem,
                                        &c->dst.orig_val,
                                        &c->dst.val,
                                        c->dst.bytes,
@@ -1611,14 +1109,13 @@ static inline int writeback(struct x86_emulate_ctxt *ctxt,
                                        ctxt->vcpu);
                else
                        rc = ops->write_emulated(
-                                       (unsigned long)c->dst.ptr,
+                                       c->dst.addr.mem,
                                        &c->dst.val,
                                        c->dst.bytes,
                                        &err,
                                        ctxt->vcpu);
                if (rc == X86EMUL_PROPAGATE_FAULT)
-                       emulate_pf(ctxt,
-                                             (unsigned long)c->dst.ptr, err);
+                       emulate_pf(ctxt);
                if (rc != X86EMUL_CONTINUE)
                        return rc;
                break;
@@ -1640,8 +1137,8 @@ static inline void emulate_push(struct x86_emulate_ctxt *ctxt,
        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]);
+       c->dst.addr.mem = register_address(c, ss_base(ctxt, ops),
+                                          c->regs[VCPU_REGS_RSP]);
 }
 
 static int emulate_pop(struct x86_emulate_ctxt *ctxt,
@@ -1701,6 +1198,9 @@ static int emulate_popf(struct x86_emulate_ctxt *ctxt,
        *(unsigned long *)dest =
                (ctxt->eflags & ~change_mask) | (val & change_mask);
 
+       if (rc == X86EMUL_PROPAGATE_FAULT)
+               emulate_pf(ctxt);
+
        return rc;
 }
 
@@ -1778,38 +1278,182 @@ static int emulate_popa(struct x86_emulate_ctxt *ctxt,
        return rc;
 }
 
-static inline int emulate_grp1a(struct x86_emulate_ctxt *ctxt,
-                               struct x86_emulate_ops *ops)
+int emulate_int_real(struct x86_emulate_ctxt *ctxt,
+                              struct x86_emulate_ops *ops, int irq)
 {
        struct decode_cache *c = &ctxt->decode;
+       int rc;
+       struct desc_ptr dt;
+       gva_t cs_addr;
+       gva_t eip_addr;
+       u16 cs, eip;
+       u32 err;
 
-       return emulate_pop(ctxt, ops, &c->dst.val, c->dst.bytes);
-}
+       /* TODO: Add limit checks */
+       c->src.val = ctxt->eflags;
+       emulate_push(ctxt, ops);
+       rc = writeback(ctxt, ops);
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
 
-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 */
+       ctxt->eflags &= ~(EFLG_IF | EFLG_TF | EFLG_AC);
+
+       c->src.val = ops->get_segment_selector(VCPU_SREG_CS, ctxt->vcpu);
+       emulate_push(ctxt, ops);
+       rc = writeback(ctxt, ops);
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
+
+       c->src.val = c->eip;
+       emulate_push(ctxt, ops);
+       rc = writeback(ctxt, ops);
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
+
+       c->dst.type = OP_NONE;
+
+       ops->get_idt(&dt, ctxt->vcpu);
+
+       eip_addr = dt.address + (irq << 2);
+       cs_addr = dt.address + (irq << 2) + 2;
+
+       rc = ops->read_std(cs_addr, &cs, 2, ctxt->vcpu, &err);
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
+
+       rc = ops->read_std(eip_addr, &eip, 2, ctxt->vcpu, &err);
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
+
+       rc = load_segment_descriptor(ctxt, ops, cs, VCPU_SREG_CS);
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
+
+       c->eip = eip;
+
+       return rc;
+}
+
+static int emulate_int(struct x86_emulate_ctxt *ctxt,
+                      struct x86_emulate_ops *ops, int irq)
+{
+       switch(ctxt->mode) {
+       case X86EMUL_MODE_REAL:
+               return emulate_int_real(ctxt, ops, irq);
+       case X86EMUL_MODE_VM86:
+       case X86EMUL_MODE_PROT16:
+       case X86EMUL_MODE_PROT32:
+       case X86EMUL_MODE_PROT64:
+       default:
+               /* Protected mode interrupts unimplemented yet */
+               return X86EMUL_UNHANDLEABLE;
+       }
+}
+
+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;
+       }
+
+       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;
+
+       rc = load_segment_descriptor(ctxt, ops, (u16)cs, VCPU_SREG_CS);
+
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
+
+       c->eip = temp_eip;
+
+
+       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;
+       }
+
+       ctxt->eflags &= ~EFLG_RESERVED_ZEROS_MASK; /* Clear reserved zeros */
+       ctxt->eflags |= EFLG_RESERVED_ONE_MASK;
+
+       return rc;
+}
+
+static inline int emulate_iret(struct x86_emulate_ctxt *ctxt,
+                                   struct x86_emulate_ops* ops)
+{
+       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;
+       }
+}
+
+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 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;
        }
@@ -1819,6 +1463,9 @@ static inline int emulate_grp3(struct x86_emulate_ctxt *ctxt,
                               struct x86_emulate_ops *ops)
 {
        struct decode_cache *c = &ctxt->decode;
+       unsigned long *rax = &c->regs[VCPU_REGS_RAX];
+       unsigned long *rdx = &c->regs[VCPU_REGS_RDX];
+       u8 de = 0;
 
        switch (c->modrm_reg) {
        case 0 ... 1:   /* test */
@@ -1830,10 +1477,26 @@ static inline int emulate_grp3(struct x86_emulate_ctxt *ctxt,
        case 3: /* neg */
                emulate_1op("neg", c->dst, ctxt->eflags);
                break;
+       case 4: /* mul */
+               emulate_1op_rax_rdx("mul", c->src, *rax, *rdx, ctxt->eflags);
+               break;
+       case 5: /* imul */
+               emulate_1op_rax_rdx("imul", c->src, *rax, *rdx, ctxt->eflags);
+               break;
+       case 6: /* div */
+               emulate_1op_rax_rdx_ex("div", c->src, *rax, *rdx,
+                                      ctxt->eflags, de);
+               break;
+       case 7: /* idiv */
+               emulate_1op_rax_rdx_ex("idiv", c->src, *rax, *rdx,
+                                      ctxt->eflags, de);
+               break;
        default:
-               return 0;
+               return X86EMUL_UNHANDLEABLE;
        }
-       return 1;
+       if (de)
+               return emulate_de(ctxt);
+       return X86EMUL_CONTINUE;
 }
 
 static inline int emulate_grp45(struct x86_emulate_ctxt *ctxt,
@@ -1905,6 +1568,23 @@ static int emulate_ret_far(struct x86_emulate_ctxt *ctxt,
        return rc;
 }
 
+static int emulate_load_segment(struct x86_emulate_ctxt *ctxt,
+                          struct x86_emulate_ops *ops, int seg)
+{
+       struct decode_cache *c = &ctxt->decode;
+       unsigned short sel;
+       int rc;
+
+       memcpy(&sel, c->src.valptr + c->op_bytes, 2);
+
+       rc = load_segment_descriptor(ctxt, ops, sel, seg);
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
+
+       c->dst.val = c->src.val;
+       return rc;
+}
+
 static inline void
 setup_syscalls_segments(struct x86_emulate_ctxt *ctxt,
                        struct x86_emulate_ops *ops, struct desc_struct *cs,
@@ -2160,9 +1840,15 @@ static bool emulator_io_permited(struct x86_emulate_ctxt *ctxt,
                                 struct x86_emulate_ops *ops,
                                 u16 port, u16 len)
 {
+       if (ctxt->perm_ok)
+               return true;
+
        if (emulator_bad_iopl(ctxt, ops))
                if (!emulator_io_port_access_allowed(ctxt, ops, port, len))
                        return false;
+
+       ctxt->perm_ok = true;
+
        return true;
 }
 
@@ -2254,7 +1940,7 @@ static int task_switch_16(struct x86_emulate_ctxt *ctxt,
                            &err);
        if (ret == X86EMUL_PROPAGATE_FAULT) {
                /* FIXME: need to provide precise fault address */
-               emulate_pf(ctxt, old_tss_base, err);
+               emulate_pf(ctxt);
                return ret;
        }
 
@@ -2264,7 +1950,7 @@ static int task_switch_16(struct x86_emulate_ctxt *ctxt,
                             &err);
        if (ret == X86EMUL_PROPAGATE_FAULT) {
                /* FIXME: need to provide precise fault address */
-               emulate_pf(ctxt, old_tss_base, err);
+               emulate_pf(ctxt);
                return ret;
        }
 
@@ -2272,7 +1958,7 @@ static int task_switch_16(struct x86_emulate_ctxt *ctxt,
                            &err);
        if (ret == X86EMUL_PROPAGATE_FAULT) {
                /* FIXME: need to provide precise fault address */
-               emulate_pf(ctxt, new_tss_base, err);
+               emulate_pf(ctxt);
                return ret;
        }
 
@@ -2285,7 +1971,7 @@ static int task_switch_16(struct x86_emulate_ctxt *ctxt,
                                     ctxt->vcpu, &err);
                if (ret == X86EMUL_PROPAGATE_FAULT) {
                        /* FIXME: need to provide precise fault address */
-                       emulate_pf(ctxt, new_tss_base, err);
+                       emulate_pf(ctxt);
                        return ret;
                }
        }
@@ -2396,7 +2082,7 @@ static int task_switch_32(struct x86_emulate_ctxt *ctxt,
                            &err);
        if (ret == X86EMUL_PROPAGATE_FAULT) {
                /* FIXME: need to provide precise fault address */
-               emulate_pf(ctxt, old_tss_base, err);
+               emulate_pf(ctxt);
                return ret;
        }
 
@@ -2406,7 +2092,7 @@ static int task_switch_32(struct x86_emulate_ctxt *ctxt,
                             &err);
        if (ret == X86EMUL_PROPAGATE_FAULT) {
                /* FIXME: need to provide precise fault address */
-               emulate_pf(ctxt, old_tss_base, err);
+               emulate_pf(ctxt);
                return ret;
        }
 
@@ -2414,7 +2100,7 @@ static int task_switch_32(struct x86_emulate_ctxt *ctxt,
                            &err);
        if (ret == X86EMUL_PROPAGATE_FAULT) {
                /* FIXME: need to provide precise fault address */
-               emulate_pf(ctxt, new_tss_base, err);
+               emulate_pf(ctxt);
                return ret;
        }
 
@@ -2427,7 +2113,7 @@ static int task_switch_32(struct x86_emulate_ctxt *ctxt,
                                     ctxt->vcpu, &err);
                if (ret == X86EMUL_PROPAGATE_FAULT) {
                        /* FIXME: need to provide precise fault address */
-                       emulate_pf(ctxt, new_tss_base, err);
+                       emulate_pf(ctxt);
                        return ret;
                }
        }
@@ -2506,62 +2192,830 @@ static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt,
                                         &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;
+       ops->set_cr(0,  ops->get_cr(0, ctxt->vcpu) | X86_CR0_TS, ctxt->vcpu);
+       ops->set_cached_descriptor(&next_tss_desc, VCPU_SREG_TR, ctxt->vcpu);
+       ops->set_segment_selector(tss_selector, VCPU_SREG_TR, ctxt->vcpu);
+
+       if (has_error_code) {
+               struct decode_cache *c = &ctxt->decode;
+
+               c->op_bytes = c->ad_bytes = (next_tss_desc.type & 8) ? 4 : 2;
+               c->lock_prefix = 0;
+               c->src.val = (unsigned long) error_code;
+               emulate_push(ctxt, ops);
+       }
+
+       return ret;
+}
+
+int emulator_task_switch(struct x86_emulate_ctxt *ctxt,
+                        u16 tss_selector, int reason,
+                        bool has_error_code, u32 error_code)
+{
+       struct x86_emulate_ops *ops = ctxt->ops;
+       struct decode_cache *c = &ctxt->decode;
+       int rc;
+
+       c->eip = ctxt->eip;
+       c->dst.type = OP_NONE;
+
+       rc = emulator_do_task_switch(ctxt, ops, tss_selector, reason,
+                                    has_error_code, error_code);
+
+       if (rc == X86EMUL_CONTINUE) {
+               rc = writeback(ctxt, ops);
+               if (rc == X86EMUL_CONTINUE)
+                       ctxt->eip = c->eip;
+       }
+
+       return (rc == X86EMUL_UNHANDLEABLE) ? -1 : 0;
+}
+
+static void string_addr_inc(struct x86_emulate_ctxt *ctxt, unsigned long base,
+                           int reg, struct operand *op)
+{
+       struct decode_cache *c = &ctxt->decode;
+       int df = (ctxt->eflags & EFLG_DF) ? -1 : 1;
+
+       register_address_increment(c, &c->regs[reg], df * op->bytes);
+       op->addr.mem = register_address(c,  base, c->regs[reg]);
+}
+
+static int em_push(struct x86_emulate_ctxt *ctxt)
+{
+       emulate_push(ctxt, ctxt->ops);
+       return X86EMUL_CONTINUE;
+}
+
+static int em_das(struct x86_emulate_ctxt *ctxt)
+{
+       struct decode_cache *c = &ctxt->decode;
+       u8 al, old_al;
+       bool af, cf, old_cf;
+
+       cf = ctxt->eflags & X86_EFLAGS_CF;
+       al = c->dst.val;
+
+       old_al = al;
+       old_cf = cf;
+       cf = false;
+       af = ctxt->eflags & X86_EFLAGS_AF;
+       if ((al & 0x0f) > 9 || af) {
+               al -= 6;
+               cf = old_cf | (al >= 250);
+               af = true;
+       } else {
+               af = false;
+       }
+       if (old_al > 0x99 || old_cf) {
+               al -= 0x60;
+               cf = true;
+       }
+
+       c->dst.val = al;
+       /* Set PF, ZF, SF */
+       c->src.type = OP_IMM;
+       c->src.val = 0;
+       c->src.bytes = 1;
+       emulate_2op_SrcV("or", c->src, c->dst, ctxt->eflags);
+       ctxt->eflags &= ~(X86_EFLAGS_AF | X86_EFLAGS_CF);
+       if (cf)
+               ctxt->eflags |= X86_EFLAGS_CF;
+       if (af)
+               ctxt->eflags |= X86_EFLAGS_AF;
+       return X86EMUL_CONTINUE;
+}
+
+static int em_call_far(struct x86_emulate_ctxt *ctxt)
+{
+       struct decode_cache *c = &ctxt->decode;
+       u16 sel, old_cs;
+       ulong old_eip;
+       int rc;
+
+       old_cs = ctxt->ops->get_segment_selector(VCPU_SREG_CS, ctxt->vcpu);
+       old_eip = c->eip;
+
+       memcpy(&sel, c->src.valptr + c->op_bytes, 2);
+       if (load_segment_descriptor(ctxt, ctxt->ops, sel, VCPU_SREG_CS))
+               return X86EMUL_CONTINUE;
+
+       c->eip = 0;
+       memcpy(&c->eip, c->src.valptr, c->op_bytes);
+
+       c->src.val = old_cs;
+       emulate_push(ctxt, ctxt->ops);
+       rc = writeback(ctxt, ctxt->ops);
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
+
+       c->src.val = old_eip;
+       emulate_push(ctxt, ctxt->ops);
+       rc = writeback(ctxt, ctxt->ops);
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
+
+       c->dst.type = OP_NONE;
+
+       return X86EMUL_CONTINUE;
+}
+
+static int em_ret_near_imm(struct x86_emulate_ctxt *ctxt)
+{
+       struct decode_cache *c = &ctxt->decode;
+       int rc;
+
+       c->dst.type = OP_REG;
+       c->dst.addr.reg = &c->eip;
+       c->dst.bytes = c->op_bytes;
+       rc = emulate_pop(ctxt, ctxt->ops, &c->dst.val, c->op_bytes);
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
+       register_address_increment(c, &c->regs[VCPU_REGS_RSP], c->src.val);
+       return X86EMUL_CONTINUE;
+}
+
+static int em_imul(struct x86_emulate_ctxt *ctxt)
+{
+       struct decode_cache *c = &ctxt->decode;
+
+       emulate_2op_SrcV_nobyte("imul", c->src, c->dst, ctxt->eflags);
+       return X86EMUL_CONTINUE;
+}
+
+static int em_imul_3op(struct x86_emulate_ctxt *ctxt)
+{
+       struct decode_cache *c = &ctxt->decode;
+
+       c->dst.val = c->src2.val;
+       return em_imul(ctxt);
+}
+
+static int em_cwd(struct x86_emulate_ctxt *ctxt)
+{
+       struct decode_cache *c = &ctxt->decode;
+
+       c->dst.type = OP_REG;
+       c->dst.bytes = c->src.bytes;
+       c->dst.addr.reg = &c->regs[VCPU_REGS_RDX];
+       c->dst.val = ~((c->src.val >> (c->src.bytes * 8 - 1)) - 1);
+
+       return X86EMUL_CONTINUE;
+}
+
+static int em_rdtsc(struct x86_emulate_ctxt *ctxt)
+{
+       unsigned cpl = ctxt->ops->cpl(ctxt->vcpu);
+       struct decode_cache *c = &ctxt->decode;
+       u64 tsc = 0;
+
+       if (cpl > 0 && (ctxt->ops->get_cr(4, ctxt->vcpu) & X86_CR4_TSD)) {
+               emulate_gp(ctxt, 0);
+               return X86EMUL_PROPAGATE_FAULT;
+       }
+       ctxt->ops->get_msr(ctxt->vcpu, MSR_IA32_TSC, &tsc);
+       c->regs[VCPU_REGS_RAX] = (u32)tsc;
+       c->regs[VCPU_REGS_RDX] = tsc >> 32;
+       return X86EMUL_CONTINUE;
+}
+
+static int em_mov(struct x86_emulate_ctxt *ctxt)
+{
+       struct decode_cache *c = &ctxt->decode;
+       c->dst.val = c->src.val;
+       return X86EMUL_CONTINUE;
+}
+
+#define D(_y) { .flags = (_y) }
+#define N    D(0)
+#define G(_f, _g) { .flags = ((_f) | Group), .u.group = (_g) }
+#define GD(_f, _g) { .flags = ((_f) | Group | GroupDual), .u.gdual = (_g) }
+#define I(_f, _e) { .flags = (_f), .u.execute = (_e) }
+
+#define D2bv(_f)      D((_f) | ByteOp), D(_f)
+#define I2bv(_f, _e)  I((_f) | ByteOp, _e), I(_f, _e)
+
+#define D6ALU(_f) D2bv((_f) | DstMem | SrcReg | ModRM),                        \
+               D2bv(((_f) | DstReg | SrcMem | ModRM) & ~Lock),         \
+               D2bv(((_f) & ~Lock) | DstAcc | SrcImm)
+
+
+static struct opcode group1[] = {
+       X7(D(Lock)), N
+};
+
+static struct opcode group1A[] = {
+       D(DstMem | SrcNone | ModRM | Mov | Stack), N, N, N, N, N, N, N,
+};
+
+static struct opcode group3[] = {
+       D(DstMem | SrcImm | ModRM), D(DstMem | SrcImm | ModRM),
+       D(DstMem | SrcNone | ModRM | Lock), D(DstMem | SrcNone | ModRM | Lock),
+       X4(D(SrcMem | ModRM)),
+};
+
+static struct opcode group4[] = {
+       D(ByteOp | DstMem | SrcNone | ModRM | Lock), D(ByteOp | DstMem | SrcNone | ModRM | Lock),
+       N, N, N, N, N, N,
+};
+
+static struct opcode group5[] = {
+       D(DstMem | SrcNone | ModRM | Lock), D(DstMem | SrcNone | ModRM | Lock),
+       D(SrcMem | ModRM | Stack),
+       I(SrcMemFAddr | ModRM | ImplicitOps | Stack, em_call_far),
+       D(SrcMem | ModRM | Stack), D(SrcMemFAddr | ModRM | ImplicitOps),
+       D(SrcMem | ModRM | Stack), N,
+};
+
+static struct group_dual group7 = { {
+       N, N, D(ModRM | SrcMem | Priv), D(ModRM | SrcMem | Priv),
+       D(SrcNone | ModRM | DstMem | Mov), N,
+       D(SrcMem16 | ModRM | Mov | Priv),
+       D(SrcMem | ModRM | ByteOp | Priv | NoAccess),
+}, {
+       D(SrcNone | ModRM | Priv), N, N, D(SrcNone | ModRM | Priv),
+       D(SrcNone | ModRM | DstMem | Mov), N,
+       D(SrcMem16 | ModRM | Mov | Priv), N,
+} };
+
+static struct opcode group8[] = {
+       N, N, N, N,
+       D(DstMem | SrcImmByte | ModRM), D(DstMem | SrcImmByte | ModRM | Lock),
+       D(DstMem | SrcImmByte | ModRM | Lock), D(DstMem | SrcImmByte | ModRM | Lock),
+};
+
+static struct group_dual group9 = { {
+       N, D(DstMem64 | ModRM | Lock), N, N, N, N, N, N,
+}, {
+       N, N, N, N, N, N, N, N,
+} };
+
+static struct opcode group11[] = {
+       I(DstMem | SrcImm | ModRM | Mov, em_mov), X7(D(Undefined)),
+};
+
+static struct opcode opcode_table[256] = {
+       /* 0x00 - 0x07 */
+       D6ALU(Lock),
+       D(ImplicitOps | Stack | No64), D(ImplicitOps | Stack | No64),
+       /* 0x08 - 0x0F */
+       D6ALU(Lock),
+       D(ImplicitOps | Stack | No64), N,
+       /* 0x10 - 0x17 */
+       D6ALU(Lock),
+       D(ImplicitOps | Stack | No64), D(ImplicitOps | Stack | No64),
+       /* 0x18 - 0x1F */
+       D6ALU(Lock),
+       D(ImplicitOps | Stack | No64), D(ImplicitOps | Stack | No64),
+       /* 0x20 - 0x27 */
+       D6ALU(Lock), N, N,
+       /* 0x28 - 0x2F */
+       D6ALU(Lock), N, I(ByteOp | DstAcc | No64, em_das),
+       /* 0x30 - 0x37 */
+       D6ALU(Lock), N, N,
+       /* 0x38 - 0x3F */
+       D6ALU(0), 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),
+       I(DstReg | SrcMem | ModRM | Src2Imm, em_imul_3op),
+       I(SrcImmByte | Mov | Stack, em_push),
+       I(DstReg | SrcMem | ModRM | Src2ImmByte, em_imul_3op),
+       D2bv(DstDI | Mov | String), /* insb, insw/insd */
+       D2bv(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),
+       D2bv(DstMem | SrcReg | ModRM), D2bv(DstMem | SrcReg | ModRM | Lock),
+       /* 0x88 - 0x8F */
+       I2bv(DstMem | SrcReg | ModRM | Mov, em_mov),
+       I2bv(DstReg | SrcMem | ModRM | Mov, em_mov),
+       D(DstMem | SrcNone | ModRM | Mov), D(ModRM | SrcMem | NoAccess | DstReg),
+       D(ImplicitOps | SrcMem16 | ModRM), G(0, group1A),
+       /* 0x90 - 0x97 */
+       X8(D(SrcAcc | DstReg)),
+       /* 0x98 - 0x9F */
+       D(DstAcc | SrcNone), I(ImplicitOps | SrcAcc, em_cwd),
+       I(SrcImmFAddr | No64, em_call_far), N,
+       D(ImplicitOps | Stack), D(ImplicitOps | Stack), N, N,
+       /* 0xA0 - 0xA7 */
+       I2bv(DstAcc | SrcMem | Mov | MemAbs, em_mov),
+       I2bv(DstMem | SrcAcc | Mov | MemAbs, em_mov),
+       I2bv(SrcSI | DstDI | Mov | String, em_mov),
+       D2bv(SrcSI | DstDI | String),
+       /* 0xA8 - 0xAF */
+       D2bv(DstAcc | SrcImm),
+       I2bv(SrcAcc | DstDI | Mov | String, em_mov),
+       I2bv(SrcSI | DstAcc | Mov | String, em_mov),
+       D2bv(SrcAcc | DstDI | String),
+       /* 0xB0 - 0xB7 */
+       X8(I(ByteOp | DstReg | SrcImm | Mov, em_mov)),
+       /* 0xB8 - 0xBF */
+       X8(I(DstReg | SrcImm | Mov, em_mov)),
+       /* 0xC0 - 0xC7 */
+       D2bv(DstMem | SrcImmByte | ModRM),
+       I(ImplicitOps | Stack | SrcImmU16, em_ret_near_imm),
+       D(ImplicitOps | Stack),
+       D(DstReg | SrcMemFAddr | ModRM | No64), D(DstReg | SrcMemFAddr | ModRM | No64),
+       G(ByteOp, group11), G(0, group11),
+       /* 0xC8 - 0xCF */
+       N, N, N, D(ImplicitOps | Stack),
+       D(ImplicitOps), D(SrcImmByte), D(ImplicitOps | No64), D(ImplicitOps),
+       /* 0xD0 - 0xD7 */
+       D2bv(DstMem | SrcOne | ModRM), D2bv(DstMem | ModRM),
+       N, N, N, N,
+       /* 0xD8 - 0xDF */
+       N, N, N, N, N, N, N, N,
+       /* 0xE0 - 0xE7 */
+       X4(D(SrcImmByte)),
+       D2bv(SrcImmUByte | DstAcc), D2bv(SrcAcc | DstImmUByte),
+       /* 0xE8 - 0xEF */
+       D(SrcImm | Stack), D(SrcImm | ImplicitOps),
+       D(SrcImmFAddr | No64), D(SrcImmByte | ImplicitOps),
+       D2bv(SrcNone | DstAcc), D2bv(SrcAcc | ImplicitOps),
+       /* 0xF0 - 0xF7 */
+       N, N, N, N,
+       D(ImplicitOps | Priv), D(ImplicitOps), G(ByteOp, group3), G(0, group3),
+       /* 0xF8 - 0xFF */
+       D(ImplicitOps), D(ImplicitOps), D(ImplicitOps), D(ImplicitOps),
+       D(ImplicitOps), D(ImplicitOps), G(0, group4), G(0, group5),
+};
+
+static struct opcode twobyte_table[256] = {
+       /* 0x00 - 0x0F */
+       N, GD(0, &group7), N, N,
+       N, D(ImplicitOps), D(ImplicitOps | Priv), N,
+       D(ImplicitOps | Priv), D(ImplicitOps | Priv), N, N,
+       N, D(ImplicitOps | ModRM), N, N,
+       /* 0x10 - 0x1F */
+       N, N, N, N, N, N, N, N, D(ImplicitOps | ModRM), N, N, N, N, N, N, N,
+       /* 0x20 - 0x2F */
+       D(ModRM | DstMem | Priv | Op3264), D(ModRM | DstMem | Priv | Op3264),
+       D(ModRM | SrcMem | Priv | Op3264), D(ModRM | SrcMem | Priv | Op3264),
+       N, N, N, N,
+       N, N, N, N, N, N, N, N,
+       /* 0x30 - 0x3F */
+       D(ImplicitOps | Priv), I(ImplicitOps, em_rdtsc),
+       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 */
+       X16(D(ByteOp | DstMem | SrcNone | ModRM| Mov)),
+       /* 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), I(DstReg | SrcMem | ModRM, em_imul),
+       /* 0xB0 - 0xB7 */
+       D2bv(DstMem | SrcReg | ModRM | Lock),
+       D(DstReg | SrcMemFAddr | ModRM), D(DstMem | SrcReg | ModRM | BitOp | Lock),
+       D(DstReg | SrcMemFAddr | ModRM), D(DstReg | SrcMemFAddr | ModRM),
+       D(ByteOp | DstReg | SrcMem | ModRM | Mov), D(DstReg | SrcMem16 | ModRM | Mov),
+       /* 0xB8 - 0xBF */
+       N, N,
+       G(BitOp, group8), D(DstMem | SrcReg | ModRM | BitOp | Lock),
+       D(DstReg | SrcMem | ModRM), D(DstReg | SrcMem | ModRM),
+       D(ByteOp | DstReg | SrcMem | ModRM | Mov), D(DstReg | SrcMem16 | ModRM | Mov),
+       /* 0xC0 - 0xCF */
+       D2bv(DstMem | SrcReg | ModRM | Lock),
+       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
+
+#undef D2bv
+#undef I2bv
+#undef D6ALU
+
+static unsigned imm_size(struct decode_cache *c)
+{
+       unsigned size;
+
+       size = (c->d & ByteOp) ? 1 : c->op_bytes;
+       if (size == 8)
+               size = 4;
+       return size;
+}
+
+static int decode_imm(struct x86_emulate_ctxt *ctxt, struct operand *op,
+                     unsigned size, bool sign_extension)
+{
+       struct decode_cache *c = &ctxt->decode;
+       struct x86_emulate_ops *ops = ctxt->ops;
+       int rc = X86EMUL_CONTINUE;
+
+       op->type = OP_IMM;
+       op->bytes = size;
+       op->addr.mem = c->eip;
+       /* NB. Immediates are sign-extended as necessary. */
+       switch (op->bytes) {
+       case 1:
+               op->val = insn_fetch(s8, 1, c->eip);
+               break;
+       case 2:
+               op->val = insn_fetch(s16, 2, c->eip);
+               break;
+       case 4:
+               op->val = insn_fetch(s32, 4, c->eip);
+               break;
+       }
+       if (!sign_extension) {
+               switch (op->bytes) {
+               case 1:
+                       op->val &= 0xff;
+                       break;
+               case 2:
+                       op->val &= 0xffff;
+                       break;
+               case 4:
+                       op->val &= 0xffffffff;
+                       break;
+               }
+       }
+done:
+       return rc;
+}
+
+int
+x86_decode_insn(struct x86_emulate_ctxt *ctxt)
+{
+       struct x86_emulate_ops *ops = ctxt->ops;
+       struct decode_cache *c = &ctxt->decode;
+       int rc = X86EMUL_CONTINUE;
+       int mode = ctxt->mode;
+       int def_op_bytes, def_ad_bytes, dual, goffset;
+       struct opcode opcode, *g_mod012, *g_mod3;
+       struct operand memop = { .type = OP_NONE };
+
+       c->eip = ctxt->eip;
+       c->fetch.start = c->fetch.end = c->eip;
+       ctxt->cs_base = seg_base(ctxt, ops, VCPU_SREG_CS);
+
+       switch (mode) {
+       case X86EMUL_MODE_REAL:
+       case X86EMUL_MODE_VM86:
+       case X86EMUL_MODE_PROT16:
+               def_op_bytes = def_ad_bytes = 2;
+               break;
+       case X86EMUL_MODE_PROT32:
+               def_op_bytes = def_ad_bytes = 4;
+               break;
+#ifdef CONFIG_X86_64
+       case X86EMUL_MODE_PROT64:
+               def_op_bytes = 4;
+               def_ad_bytes = 8;
+               break;
+#endif
+       default:
+               return -1;
+       }
+
+       c->op_bytes = def_op_bytes;
+       c->ad_bytes = def_ad_bytes;
+
+       /* Legacy prefixes. */
+       for (;;) {
+               switch (c->b = insn_fetch(u8, 1, c->eip)) {
+               case 0x66:      /* operand-size override */
+                       /* switch between 2/4 bytes */
+                       c->op_bytes = def_op_bytes ^ 6;
+                       break;
+               case 0x67:      /* address-size override */
+                       if (mode == X86EMUL_MODE_PROT64)
+                               /* switch between 4/8 bytes */
+                               c->ad_bytes = def_ad_bytes ^ 12;
+                       else
+                               /* switch between 2/4 bytes */
+                               c->ad_bytes = def_ad_bytes ^ 6;
+                       break;
+               case 0x26:      /* ES override */
+               case 0x2e:      /* CS override */
+               case 0x36:      /* SS override */
+               case 0x3e:      /* DS override */
+                       set_seg_override(c, (c->b >> 3) & 3);
+                       break;
+               case 0x64:      /* FS override */
+               case 0x65:      /* GS override */
+                       set_seg_override(c, c->b & 7);
+                       break;
+               case 0x40 ... 0x4f: /* REX */
+                       if (mode != X86EMUL_MODE_PROT64)
+                               goto done_prefixes;
+                       c->rex_prefix = c->b;
+                       continue;
+               case 0xf0:      /* LOCK */
+                       c->lock_prefix = 1;
+                       break;
+               case 0xf2:      /* REPNE/REPNZ */
+                       c->rep_prefix = REPNE_PREFIX;
+                       break;
+               case 0xf3:      /* REP/REPE/REPZ */
+                       c->rep_prefix = REPE_PREFIX;
+                       break;
+               default:
+                       goto done_prefixes;
+               }
+
+               /* Any legacy prefix after a REX prefix nullifies its effect. */
+
+               c->rex_prefix = 0;
+       }
+
+done_prefixes:
+
+       /* REX prefix. */
+       if (c->rex_prefix & 8)
+               c->op_bytes = 8;        /* REX.W */
+
+       /* Opcode byte(s). */
+       opcode = opcode_table[c->b];
+       /* Two-byte opcode? */
+       if (c->b == 0x0f) {
+               c->twobyte = 1;
+               c->b = insn_fetch(u8, 1, c->eip);
+               opcode = twobyte_table[c->b];
+       }
+       c->d = opcode.flags;
+
+       if (c->d & Group) {
+               dual = c->d & GroupDual;
+               c->modrm = insn_fetch(u8, 1, c->eip);
+               --c->eip;
+
+               if (c->d & GroupDual) {
+                       g_mod012 = opcode.u.gdual->mod012;
+                       g_mod3 = opcode.u.gdual->mod3;
+               } else
+                       g_mod012 = g_mod3 = opcode.u.group;
+
+               c->d &= ~(Group | GroupDual);
+
+               goffset = (c->modrm >> 3) & 7;
+
+               if ((c->modrm >> 6) == 3)
+                       opcode = g_mod3[goffset];
+               else
+                       opcode = g_mod012[goffset];
+               c->d |= opcode.flags;
+       }
+
+       c->execute = opcode.u.execute;
+
+       /* Unrecognised? */
+       if (c->d == 0 || (c->d & Undefined)) {
+               DPRINTF("Cannot emulate %02x\n", c->b);
+               return -1;
+       }
+
+       if (mode == X86EMUL_MODE_PROT64 && (c->d & Stack))
+               c->op_bytes = 8;
+
+       if (c->d & Op3264) {
+               if (mode == X86EMUL_MODE_PROT64)
+                       c->op_bytes = 8;
+               else
+                       c->op_bytes = 4;
+       }
+
+       /* ModRM and SIB bytes. */
+       if (c->d & ModRM) {
+               rc = decode_modrm(ctxt, ops, &memop);
+               if (!c->has_seg_override)
+                       set_seg_override(c, c->modrm_seg);
+       } else if (c->d & MemAbs)
+               rc = decode_abs(ctxt, ops, &memop);
+       if (rc != X86EMUL_CONTINUE)
+               goto done;
+
+       if (!c->has_seg_override)
+               set_seg_override(c, VCPU_SREG_DS);
+
+       if (memop.type == OP_MEM && !(!c->twobyte && c->b == 0x8d))
+               memop.addr.mem += seg_override_base(ctxt, ops, c);
+
+       if (memop.type == OP_MEM && c->ad_bytes != 8)
+               memop.addr.mem = (u32)memop.addr.mem;
+
+       if (memop.type == OP_MEM && c->rip_relative)
+               memop.addr.mem += c->eip;
+
+       /*
+        * Decode and fetch the source operand: register, memory
+        * or immediate.
+        */
+       switch (c->d & SrcMask) {
+       case SrcNone:
+               break;
+       case SrcReg:
+               decode_register_operand(&c->src, c, 0);
+               break;
+       case SrcMem16:
+               memop.bytes = 2;
+               goto srcmem_common;
+       case SrcMem32:
+               memop.bytes = 4;
+               goto srcmem_common;
+       case SrcMem:
+               memop.bytes = (c->d & ByteOp) ? 1 :
+                                                          c->op_bytes;
+       srcmem_common:
+               c->src = memop;
+               break;
+       case SrcImmU16:
+               rc = decode_imm(ctxt, &c->src, 2, false);
+               break;
+       case SrcImm:
+               rc = decode_imm(ctxt, &c->src, imm_size(c), true);
+               break;
+       case SrcImmU:
+               rc = decode_imm(ctxt, &c->src, imm_size(c), false);
+               break;
+       case SrcImmByte:
+               rc = decode_imm(ctxt, &c->src, 1, true);
+               break;
+       case SrcImmUByte:
+               rc = decode_imm(ctxt, &c->src, 1, false);
+               break;
+       case SrcAcc:
+               c->src.type = OP_REG;
+               c->src.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
+               c->src.addr.reg = &c->regs[VCPU_REGS_RAX];
+               fetch_register_operand(&c->src);
+               break;
+       case SrcOne:
+               c->src.bytes = 1;
+               c->src.val = 1;
+               break;
+       case SrcSI:
+               c->src.type = OP_MEM;
+               c->src.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
+               c->src.addr.mem =
+                       register_address(c,  seg_override_base(ctxt, ops, c),
+                                        c->regs[VCPU_REGS_RSI]);
+               c->src.val = 0;
+               break;
+       case SrcImmFAddr:
+               c->src.type = OP_IMM;
+               c->src.addr.mem = c->eip;
+               c->src.bytes = c->op_bytes + 2;
+               insn_fetch_arr(c->src.valptr, c->src.bytes, c->eip);
+               break;
+       case SrcMemFAddr:
+               memop.bytes = c->op_bytes + 2;
+               goto srcmem_common;
+               break;
+       }
+
+       if (rc != X86EMUL_CONTINUE)
+               goto done;
 
-               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);
+       /*
+        * 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:
+               rc = decode_imm(ctxt, &c->src2, 1, true);
+               break;
+       case Src2One:
+               c->src2.bytes = 1;
+               c->src2.val = 1;
+               break;
+       case Src2Imm:
+               rc = decode_imm(ctxt, &c->src2, imm_size(c), true);
+               break;
        }
 
-       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)
+               goto done;
 
-       if (rc == X86EMUL_CONTINUE) {
-               rc = writeback(ctxt, ops);
-               if (rc == X86EMUL_CONTINUE)
-                       ctxt->eip = c->eip;
+       /* Decode and fetch the destination operand: register or memory. */
+       switch (c->d & DstMask) {
+       case DstReg:
+               decode_register_operand(&c->dst, c,
+                        c->twobyte && (c->b == 0xb6 || c->b == 0xb7));
+               break;
+       case DstImmUByte:
+               c->dst.type = OP_IMM;
+               c->dst.addr.mem = c->eip;
+               c->dst.bytes = 1;
+               c->dst.val = insn_fetch(u8, 1, c->eip);
+               break;
+       case DstMem:
+       case DstMem64:
+               c->dst = memop;
+               if ((c->d & DstMask) == DstMem64)
+                       c->dst.bytes = 8;
+               else
+                       c->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
+               if (c->d & BitOp)
+                       fetch_bit_operand(c);
+               c->dst.orig_val = c->dst.val;
+               break;
+       case DstAcc:
+               c->dst.type = OP_REG;
+               c->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
+               c->dst.addr.reg = &c->regs[VCPU_REGS_RAX];
+               fetch_register_operand(&c->dst);
+               c->dst.orig_val = c->dst.val;
+               break;
+       case DstDI:
+               c->dst.type = OP_MEM;
+               c->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
+               c->dst.addr.mem =
+                       register_address(c, es_base(ctxt, ops),
+                                        c->regs[VCPU_REGS_RDI]);
+               c->dst.val = 0;
+               break;
+       case ImplicitOps:
+               /* Special instructions do their own operand decoding. */
+       default:
+               c->dst.type = OP_NONE; /* Disable writeback. */
+               return 0;
        }
 
+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)
+static bool string_insn_completed(struct x86_emulate_ctxt *ctxt)
 {
        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]);
+       /* The second termination condition only applies for REPE
+        * and REPNE. Test if the repeat string operation prefix is
+        * REPE/REPZ or REPNE/REPNZ and if it's the case it tests the
+        * corresponding termination condition according to:
+        *      - if REPE/REPZ and ZF = 0 then done
+        *      - if REPNE/REPNZ and ZF = 1 then done
+        */
+       if (((c->b == 0xa6) || (c->b == 0xa7) ||
+            (c->b == 0xae) || (c->b == 0xaf))
+           && (((c->rep_prefix == REPE_PREFIX) &&
+                ((ctxt->eflags & EFLG_ZF) == 0))
+               || ((c->rep_prefix == REPNE_PREFIX) &&
+                   ((ctxt->eflags & EFLG_ZF) == EFLG_ZF))))
+               return true;
+
+       return false;
 }
 
 int
-x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
+x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
 {
+       struct x86_emulate_ops *ops = ctxt->ops;
        u64 msr_data;
        struct decode_cache *c = &ctxt->decode;
        int rc = X86EMUL_CONTINUE;
        int saved_dst_type = c->dst.type;
+       int irq; /* Used for int 3, int, and into */
 
        ctxt->decode.mem_read.pos = 0;
 
@@ -2576,6 +3030,11 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
                goto done;
        }
 
+       if ((c->d & SrcMask) == SrcMemFAddr && c->src.type != OP_MEM) {
+               emulate_ud(ctxt);
+               goto done;
+       }
+
        /* Privileged instruction can be executed only in CPL=0 */
        if ((c->d & Priv) && ops->cpl(ctxt->vcpu)) {
                emulate_gp(ctxt, 0);
@@ -2583,35 +3042,15 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
        }
 
        if (c->rep_prefix && (c->d & String)) {
-               ctxt->restart = true;
                /* All REP prefixes have the same first termination condition */
                if (address_mask(c, c->regs[VCPU_REGS_RCX]) == 0) {
-               string_done:
-                       ctxt->restart = false;
                        ctxt->eip = c->eip;
                        goto done;
                }
-               /* The second termination condition only applies for REPE
-                * and REPNE. Test if the repeat string operation prefix is
-                * REPE/REPZ or REPNE/REPNZ and if it's the case it tests the
-                * corresponding termination condition according to:
-                *      - if REPE/REPZ and ZF = 0 then done
-                *      - if REPNE/REPNZ and ZF = 1 then done
-                */
-               if ((c->b == 0xa6) || (c->b == 0xa7) ||
-                   (c->b == 0xae) || (c->b == 0xaf)) {
-                       if ((c->rep_prefix == REPE_PREFIX) &&
-                           ((ctxt->eflags & EFLG_ZF) == 0))
-                               goto string_done;
-                       if ((c->rep_prefix == REPNE_PREFIX) &&
-                           ((ctxt->eflags & EFLG_ZF) == EFLG_ZF))
-                               goto string_done;
-               }
-               c->eip = ctxt->eip;
        }
 
-       if (c->src.type == OP_MEM) {
-               rc = read_emulated(ctxt, ops, (unsigned long)c->src.ptr,
+       if ((c->src.type == OP_MEM) && !(c->d & NoAccess)) {
+               rc = read_emulated(ctxt, ops, c->src.addr.mem,
                                        c->src.valptr, c->src.bytes);
                if (rc != X86EMUL_CONTINUE)
                        goto done;
@@ -2619,7 +3058,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
        }
 
        if (c->src2.type == OP_MEM) {
-               rc = read_emulated(ctxt, ops, (unsigned long)c->src2.ptr,
+               rc = read_emulated(ctxt, ops, c->src2.addr.mem,
                                        &c->src2.val, c->src2.bytes);
                if (rc != X86EMUL_CONTINUE)
                        goto done;
@@ -2631,7 +3070,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
 
        if ((c->dst.type == OP_MEM) && !(c->d & Mov)) {
                /* optimisation - avoid slow emulated read if Mov */
-               rc = read_emulated(ctxt, ops, (unsigned long)c->dst.ptr,
+               rc = read_emulated(ctxt, ops, c->dst.addr.mem,
                                   &c->dst.val, c->dst.bytes);
                if (rc != X86EMUL_CONTINUE)
                        goto done;
@@ -2640,6 +3079,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;
 
@@ -2653,8 +3099,6 @@ special_insn:
                break;
        case 0x07:              /* pop es */
                rc = emulate_pop_sreg(ctxt, ops, VCPU_SREG_ES);
-               if (rc != X86EMUL_CONTINUE)
-                       goto done;
                break;
        case 0x08 ... 0x0d:
              or:               /* or */
@@ -2672,8 +3116,6 @@ special_insn:
                break;
        case 0x17:              /* pop ss */
                rc = emulate_pop_sreg(ctxt, ops, VCPU_SREG_SS);
-               if (rc != X86EMUL_CONTINUE)
-                       goto done;
                break;
        case 0x18 ... 0x1d:
              sbb:              /* sbb */
@@ -2684,8 +3126,6 @@ special_insn:
                break;
        case 0x1f:              /* pop ds */
                rc = emulate_pop_sreg(ctxt, ops, VCPU_SREG_DS);
-               if (rc != X86EMUL_CONTINUE)
-                       goto done;
                break;
        case 0x20 ... 0x25:
              and:              /* and */
@@ -2709,58 +3149,29 @@ 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);
-               if (rc != X86EMUL_CONTINUE)
-                       goto done;
                break;
        case 0x60:      /* pusha */
                rc = emulate_pusha(ctxt, ops);
-               if (rc != X86EMUL_CONTINUE)
-                       goto done;
                break;
        case 0x61:      /* popa */
                rc = emulate_popa(ctxt, ops);
-               if (rc != X86EMUL_CONTINUE)
-                       goto done;
                break;
        case 0x63:              /* movsxd */
                if (ctxt->mode != X86EMUL_MODE_PROT64)
                        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);
-               if (!emulator_io_permited(ctxt, ops, c->regs[VCPU_REGS_RDX],
-                                         c->dst.bytes)) {
-                       emulate_gp(ctxt, 0);
-                       goto done;
-               }
-               if (!pio_in_emulated(ctxt, ops, c->dst.bytes,
-                                    c->regs[VCPU_REGS_RDX], &c->dst.val))
-                       goto done; /* IO is needed, skip writeback */
-               break;
+               c->src.val = c->regs[VCPU_REGS_RDX];
+               goto do_io_in;
        case 0x6e:              /* outsb */
        case 0x6f:              /* outsw/outsd */
-               c->src.bytes = min(c->src.bytes, 4u);
-               if (!emulator_io_permited(ctxt, ops, c->regs[VCPU_REGS_RDX],
-                                         c->src.bytes)) {
-                       emulate_gp(ctxt, 0);
-                       goto done;
-               }
-               ops->pio_out_emulated(c->src.bytes, c->regs[VCPU_REGS_RDX],
-                                     &c->src.val, 1, ctxt->vcpu);
-
-               c->dst.type = OP_NONE; /* nothing to writeback */
+               c->dst.val = c->regs[VCPU_REGS_RDX];
+               goto do_io_out;
                break;
        case 0x70 ... 0x7f: /* jcc (short) */
                if (test_cc(c->b, ctxt->eflags))
@@ -2793,29 +3204,15 @@ special_insn:
        case 0x86 ... 0x87:     /* xchg */
        xchg:
                /* Write back the register source. */
-               switch (c->dst.bytes) {
-               case 1:
-                       *(u8 *) c->src.ptr = (u8) c->dst.val;
-                       break;
-               case 2:
-                       *(u16 *) c->src.ptr = (u16) c->dst.val;
-                       break;
-               case 4:
-                       *c->src.ptr = (u32) c->dst.val;
-                       break;  /* 64b reg: zero-extend */
-               case 8:
-                       *c->src.ptr = c->dst.val;
-                       break;
-               }
+               c->src.val = c->dst.val;
+               write_register_operand(&c->src);
                /*
                 * Write back the memory destination with implicit LOCK
                 * prefix.
                 */
-               c->dst.val = c->src.val;
+               c->dst.val = c->src.orig_val;
                c->lock_prefix = 1;
                break;
-       case 0x88 ... 0x8b:     /* mov */
-               goto mov;
        case 0x8c:  /* mov r/m, sreg */
                if (c->modrm_reg > VCPU_SREG_GS) {
                        emulate_ud(ctxt);
@@ -2824,7 +3221,7 @@ special_insn:
                c->dst.val = ops->get_segment_selector(c->modrm_reg, ctxt->vcpu);
                break;
        case 0x8d: /* lea r16/r32, m */
-               c->dst.val = c->modrm_ea;
+               c->dst.val = c->src.addr.mem;
                break;
        case 0x8e: { /* mov seg, r/m16 */
                uint16_t sel;
@@ -2847,76 +3244,87 @@ special_insn:
        }
        case 0x8f:              /* pop (sole member of Grp1a) */
                rc = emulate_grp1a(ctxt, ops);
-               if (rc != X86EMUL_CONTINUE)
-                       goto done;
                break;
-       case 0x90: /* nop / xchg r8,rax */
-               if (c->dst.ptr == (unsigned long *)&c->regs[VCPU_REGS_RAX]) {
-                       c->dst.type = OP_NONE;  /* nop */
+       case 0x90 ... 0x97: /* nop / xchg reg, rax */
+               if (c->dst.addr.reg == &c->regs[VCPU_REGS_RAX])
                        break;
-               }
-       case 0x91 ... 0x97: /* xchg reg,rax */
-               c->src.type = OP_REG;
-               c->src.bytes = c->op_bytes;
-               c->src.ptr = (unsigned long *) &c->regs[VCPU_REGS_RAX];
-               c->src.val = *(c->src.ptr);
                goto xchg;
+       case 0x98: /* cbw/cwde/cdqe */
+               switch (c->op_bytes) {
+               case 2: c->dst.val = (s8)c->dst.val; break;
+               case 4: c->dst.val = (s16)c->dst.val; break;
+               case 8: c->dst.val = (s32)c->dst.val; break;
+               }
+               break;
        case 0x9c: /* pushf */
                c->src.val =  (unsigned long) ctxt->eflags;
                emulate_push(ctxt, ops);
                break;
        case 0x9d: /* popf */
                c->dst.type = OP_REG;
-               c->dst.ptr = (unsigned long *) &ctxt->eflags;
+               c->dst.addr.reg = &ctxt->eflags;
                c->dst.bytes = c->op_bytes;
                rc = emulate_popf(ctxt, ops, &c->dst.val, c->op_bytes);
-               if (rc != X86EMUL_CONTINUE)
-                       goto done;
                break;
-       case 0xa0 ... 0xa3:     /* mov */
-       case 0xa4 ... 0xa5:     /* movs */
-               goto mov;
        case 0xa6 ... 0xa7:     /* cmps */
                c->dst.type = OP_NONE; /* Disable writeback. */
-               DPRINTF("cmps: mem1=0x%p mem2=0x%p\n", c->src.ptr, c->dst.ptr);
+               DPRINTF("cmps: mem1=0x%p mem2=0x%p\n", c->src.addr.mem, c->dst.addr.mem);
                goto cmp;
        case 0xa8 ... 0xa9:     /* test ax, imm */
                goto test;
-       case 0xaa ... 0xab:     /* stos */
-               c->dst.val = c->regs[VCPU_REGS_RAX];
-               break;
-       case 0xac ... 0xad:     /* lods */
-               goto mov;
        case 0xae ... 0xaf:     /* scas */
-               DPRINTF("Urk! I don't handle SCAS.\n");
-               goto cannot_emulate;
-       case 0xb0 ... 0xbf: /* mov r, imm */
-               goto mov;
+               goto cmp;
        case 0xc0 ... 0xc1:
                emulate_grp2(ctxt);
                break;
        case 0xc3: /* ret */
                c->dst.type = OP_REG;
-               c->dst.ptr = &c->eip;
+               c->dst.addr.reg = &c->eip;
                c->dst.bytes = c->op_bytes;
                goto pop_instruction;
-       case 0xc6 ... 0xc7:     /* mov (sole member of Grp11) */
-       mov:
-               c->dst.val = c->src.val;
+       case 0xc4:              /* les */
+               rc = emulate_load_segment(ctxt, ops, VCPU_SREG_ES);
+               break;
+       case 0xc5:              /* lds */
+               rc = emulate_load_segment(ctxt, ops, VCPU_SREG_DS);
                break;
        case 0xcb:              /* ret far */
                rc = emulate_ret_far(ctxt, ops);
-               if (rc != X86EMUL_CONTINUE)
-                       goto done;
+               break;
+       case 0xcc:              /* int3 */
+               irq = 3;
+               goto do_interrupt;
+       case 0xcd:              /* int n */
+               irq = c->src.val;
+       do_interrupt:
+               rc = emulate_int(ctxt, ops, irq);
+               break;
+       case 0xce:              /* into */
+               if (ctxt->eflags & EFLG_OF) {
+                       irq = 4;
+                       goto do_interrupt;
+               }
+               break;
+       case 0xcf:              /* iret */
+               rc = emulate_iret(ctxt, ops);
                break;
        case 0xd0 ... 0xd1:     /* Grp2 */
-               c->src.val = 1;
                emulate_grp2(ctxt);
                break;
        case 0xd2 ... 0xd3:     /* Grp2 */
                c->src.val = c->regs[VCPU_REGS_RCX];
                emulate_grp2(ctxt);
                break;
+       case 0xe0 ... 0xe2:     /* loop/loopz/loopnz */
+               register_address_increment(c, &c->regs[VCPU_REGS_RCX], -1);
+               if (address_mask(c, c->regs[VCPU_REGS_RCX]) != 0 &&
+                   (c->b == 0xe2 || test_cc(c->b ^ 0x5, ctxt->eflags)))
+                       jmp_rel(c, c->src.val);
+               break;
+       case 0xe3:      /* jcxz/jecxz/jrcxz */
+               if (address_mask(c, c->regs[VCPU_REGS_RCX]) == 0)
+                       jmp_rel(c, c->src.val);
+               break;
        case 0xe4:      /* inb */
        case 0xe5:      /* in */
                goto do_io_in;
@@ -2964,15 +3372,16 @@ special_insn:
                break;
        case 0xee: /* out dx,al */
        case 0xef: /* out dx,(e/r)ax */
-               c->src.val = c->regs[VCPU_REGS_RDX];
+               c->dst.val = c->regs[VCPU_REGS_RDX];
        do_io_out:
-               c->dst.bytes = min(c->dst.bytes, 4u);
-               if (!emulator_io_permited(ctxt, ops, c->src.val, c->dst.bytes)) {
+               c->src.bytes = min(c->src.bytes, 4u);
+               if (!emulator_io_permited(ctxt, ops, c->dst.val,
+                                         c->src.bytes)) {
                        emulate_gp(ctxt, 0);
                        goto done;
                }
-               ops->pio_out_emulated(c->dst.bytes, c->src.val, &c->dst.val, 1,
-                                     ctxt->vcpu);
+               ops->pio_out_emulated(c->src.bytes, c->dst.val,
+                                     &c->src.val, 1, ctxt->vcpu);
                c->dst.type = OP_NONE;  /* Disable writeback. */
                break;
        case 0xf4:              /* hlt */
@@ -2981,24 +3390,22 @@ special_insn:
        case 0xf5:      /* cmc */
                /* complement carry flag from eflags reg */
                ctxt->eflags ^= EFLG_CF;
-               c->dst.type = OP_NONE;  /* Disable writeback. */
                break;
        case 0xf6 ... 0xf7:     /* Grp3 */
-               if (!emulate_grp3(ctxt, ops))
-                       goto cannot_emulate;
+               rc = emulate_grp3(ctxt, ops);
                break;
        case 0xf8: /* clc */
                ctxt->eflags &= ~EFLG_CF;
-               c->dst.type = OP_NONE;  /* Disable writeback. */
+               break;
+       case 0xf9: /* stc */
+               ctxt->eflags |= EFLG_CF;
                break;
        case 0xfa: /* cli */
                if (emulator_bad_iopl(ctxt, ops)) {
                        emulate_gp(ctxt, 0);
                        goto done;
-               } else {
+               } else
                        ctxt->eflags &= ~X86_EFLAGS_IF;
-                       c->dst.type = OP_NONE;  /* Disable writeback. */
-               }
                break;
        case 0xfb: /* sti */
                if (emulator_bad_iopl(ctxt, ops)) {
@@ -3007,29 +3414,29 @@ special_insn:
                } else {
                        ctxt->interruptibility = KVM_X86_SHADOW_INT_STI;
                        ctxt->eflags |= X86_EFLAGS_IF;
-                       c->dst.type = OP_NONE;  /* Disable writeback. */
                }
                break;
        case 0xfc: /* cld */
                ctxt->eflags &= ~EFLG_DF;
-               c->dst.type = OP_NONE;  /* Disable writeback. */
                break;
        case 0xfd: /* std */
                ctxt->eflags |= EFLG_DF;
-               c->dst.type = OP_NONE;  /* Disable writeback. */
                break;
        case 0xfe: /* Grp4 */
        grp45:
                rc = emulate_grp45(ctxt, ops);
-               if (rc != X86EMUL_CONTINUE)
-                       goto done;
                break;
        case 0xff: /* Grp5 */
                if (c->modrm_reg == 5)
                        goto jump_far;
                goto grp45;
+       default:
+               goto cannot_emulate;
        }
 
+       if (rc != X86EMUL_CONTINUE)
+               goto done;
+
 writeback:
        rc = writeback(ctxt, ops);
        if (rc != X86EMUL_CONTINUE)
@@ -3050,25 +3457,32 @@ writeback:
                                &c->dst);
 
        if (c->rep_prefix && (c->d & String)) {
-               struct read_cache *rc = &ctxt->decode.io_read;
+               struct read_cache *r = &ctxt->decode.io_read;
                register_address_increment(c, &c->regs[VCPU_REGS_RCX], -1);
-               /*
-                * Re-enter guest when pio read ahead buffer is empty or,
-                * if it is not used, after each 1024 iteration.
-                */
-               if ((rc->end == 0 && !(c->regs[VCPU_REGS_RCX] & 0x3ff)) ||
-                   (rc->end != 0 && rc->end == rc->pos))
-                       ctxt->restart = false;
+
+               if (!string_insn_completed(ctxt)) {
+                       /*
+                        * Re-enter guest when pio read ahead buffer is empty
+                        * or, if it is not used, after each 1024 iteration.
+                        */
+                       if ((r->end != 0 || c->regs[VCPU_REGS_RCX] & 0x3ff) &&
+                           (r->end == 0 || r->end != r->pos)) {
+                               /*
+                                * Reset read cache. Usually happens before
+                                * decode, but since instruction is restarted
+                                * we have to do it here.
+                                */
+                               ctxt->decode.mem_read.end = 0;
+                               return EMULATION_RESTART;
+                       }
+                       goto done; /* skip rip writeback */
+               }
        }
-       /*
-        * reset read cache here in case string instruction is restared
-        * without decoding
-        */
-       ctxt->decode.mem_read.end = 0;
+
        ctxt->eip = c->eip;
 
 done:
-       return (rc == X86EMUL_UNHANDLEABLE) ? -1 : 0;
+       return (rc == X86EMUL_UNHANDLEABLE) ? EMULATION_FAILED : EMULATION_OK;
 
 twobyte_insn:
        switch (c->b) {
@@ -3091,7 +3505,7 @@ twobyte_insn:
                        c->dst.type = OP_NONE;
                        break;
                case 2: /* lgdt */
-                       rc = read_descriptor(ctxt, ops, c->src.ptr,
+                       rc = read_descriptor(ctxt, ops, c->src.addr.mem,
                                             &size, &address, c->op_bytes);
                        if (rc != X86EMUL_CONTINUE)
                                goto done;
@@ -3104,14 +3518,12 @@ twobyte_insn:
                                switch (c->modrm_rm) {
                                case 1:
                                        rc = kvm_fix_hypercall(ctxt->vcpu);
-                                       if (rc != X86EMUL_CONTINUE)
-                                               goto done;
                                        break;
                                default:
                                        goto cannot_emulate;
                                }
                        } else {
-                               rc = read_descriptor(ctxt, ops, c->src.ptr,
+                               rc = read_descriptor(ctxt, ops, c->src.addr.mem,
                                                     &size, &address,
                                                     c->op_bytes);
                                if (rc != X86EMUL_CONTINUE)
@@ -3126,7 +3538,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;
@@ -3134,7 +3546,7 @@ twobyte_insn:
                        emulate_ud(ctxt);
                        goto done;
                case 7: /* invlpg*/
-                       emulate_invlpg(ctxt->vcpu, c->modrm_ea);
+                       emulate_invlpg(ctxt->vcpu, c->src.addr.mem);
                        /* Disable writeback. */
                        c->dst.type = OP_NONE;
                        break;
@@ -3144,23 +3556,16 @@ twobyte_insn:
                break;
        case 0x05:              /* syscall */
                rc = emulate_syscall(ctxt, ops);
-               if (rc != X86EMUL_CONTINUE)
-                       goto done;
-               else
-                       goto writeback;
                break;
        case 0x06:
                emulate_clts(ctxt->vcpu);
-               c->dst.type = OP_NONE;
                break;
        case 0x09:              /* wbinvd */
                kvm_emulate_wbinvd(ctxt->vcpu);
-               c->dst.type = OP_NONE;
                break;
        case 0x08:              /* invd */
        case 0x0d:              /* GrpP (prefetch) */
        case 0x18:              /* Grp16 (prefetch/nop) */
-               c->dst.type = OP_NONE;
                break;
        case 0x20: /* mov cr, reg */
                switch (c->modrm_reg) {
@@ -3170,8 +3575,7 @@ twobyte_insn:
                        emulate_ud(ctxt);
                        goto done;
                }
-               c->regs[c->modrm_rm] = ops->get_cr(c->modrm_reg, ctxt->vcpu);
-               c->dst.type = OP_NONE;  /* no writeback */
+               c->dst.val = ops->get_cr(c->modrm_reg, ctxt->vcpu);
                break;
        case 0x21: /* mov from dr to reg */
                if ((ops->get_cr(4, ctxt->vcpu) & X86_CR4_DE) &&
@@ -3179,11 +3583,10 @@ twobyte_insn:
                        emulate_ud(ctxt);
                        goto done;
                }
-               ops->get_dr(c->modrm_reg, &c->regs[c->modrm_rm], ctxt->vcpu);
-               c->dst.type = OP_NONE;  /* no writeback */
+               ops->get_dr(c->modrm_reg, &c->dst.val, ctxt->vcpu);
                break;
        case 0x22: /* mov reg, cr */
-               if (ops->set_cr(c->modrm_reg, c->modrm_val, ctxt->vcpu)) {
+               if (ops->set_cr(c->modrm_reg, c->src.val, ctxt->vcpu)) {
                        emulate_gp(ctxt, 0);
                        goto done;
                }
@@ -3196,7 +3599,7 @@ twobyte_insn:
                        goto done;
                }
 
-               if (ops->set_dr(c->modrm_reg, c->regs[c->modrm_rm] &
+               if (ops->set_dr(c->modrm_reg, c->src.val &
                                ((ctxt->mode == X86EMUL_MODE_PROT64) ?
                                 ~0ULL : ~0U), ctxt->vcpu) < 0) {
                        /* #UD condition is already handled by the code above */
@@ -3215,7 +3618,6 @@ twobyte_insn:
                        goto done;
                }
                rc = X86EMUL_CONTINUE;
-               c->dst.type = OP_NONE;
                break;
        case 0x32:
                /* rdmsr */
@@ -3227,21 +3629,12 @@ twobyte_insn:
                        c->regs[VCPU_REGS_RDX] = msr_data >> 32;
                }
                rc = X86EMUL_CONTINUE;
-               c->dst.type = OP_NONE;
                break;
        case 0x34:              /* sysenter */
                rc = emulate_sysenter(ctxt, ops);
-               if (rc != X86EMUL_CONTINUE)
-                       goto done;
-               else
-                       goto writeback;
                break;
        case 0x35:              /* sysexit */
                rc = emulate_sysexit(ctxt, ops);
-               if (rc != X86EMUL_CONTINUE)
-                       goto done;
-               else
-                       goto writeback;
                break;
        case 0x40 ... 0x4f:     /* cmov */
                c->dst.val = c->dst.orig_val = c->src.val;
@@ -3251,15 +3644,15 @@ twobyte_insn:
        case 0x80 ... 0x8f: /* jnz rel, etc*/
                if (test_cc(c->b, ctxt->eflags))
                        jmp_rel(c, c->src.val);
-               c->dst.type = OP_NONE;
+               break;
+       case 0x90 ... 0x9f:     /* setcc r/m8 */
+               c->dst.val = test_cc(c->b, ctxt->eflags);
                break;
        case 0xa0:        /* push fs */
                emulate_push_sreg(ctxt, ops, VCPU_SREG_FS);
                break;
        case 0xa1:       /* pop fs */
                rc = emulate_pop_sreg(ctxt, ops, VCPU_SREG_FS);
-               if (rc != X86EMUL_CONTINUE)
-                       goto done;
                break;
        case 0xa3:
              bt:               /* bt */
@@ -3277,13 +3670,9 @@ twobyte_insn:
                break;
        case 0xa9:      /* pop gs */
                rc = emulate_pop_sreg(ctxt, ops, VCPU_SREG_GS);
-               if (rc != X86EMUL_CONTINUE)
-                       goto done;
                break;
        case 0xab:
              bts:              /* bts */
-               /* only subword offset */
-               c->src.val &= (c->dst.bytes << 3) - 1;
                emulate_2op_SrcV_nobyte("bts", c->src, c->dst, ctxt->eflags);
                break;
        case 0xac: /* shrd imm8, r, r/m */
@@ -3306,15 +3695,22 @@ twobyte_insn:
                } else {
                        /* Failure: write the value we saw to EAX. */
                        c->dst.type = OP_REG;
-                       c->dst.ptr = (unsigned long *)&c->regs[VCPU_REGS_RAX];
+                       c->dst.addr.reg = (unsigned long *)&c->regs[VCPU_REGS_RAX];
                }
                break;
+       case 0xb2:              /* lss */
+               rc = emulate_load_segment(ctxt, ops, VCPU_SREG_SS);
+               break;
        case 0xb3:
              btr:              /* btr */
-               /* only subword offset */
-               c->src.val &= (c->dst.bytes << 3) - 1;
                emulate_2op_SrcV_nobyte("btr", c->src, c->dst, ctxt->eflags);
                break;
+       case 0xb4:              /* lfs */
+               rc = emulate_load_segment(ctxt, ops, VCPU_SREG_FS);
+               break;
+       case 0xb5:              /* lgs */
+               rc = emulate_load_segment(ctxt, ops, VCPU_SREG_GS);
+               break;
        case 0xb6 ... 0xb7:     /* movzx */
                c->dst.bytes = c->op_bytes;
                c->dst.val = (c->d & ByteOp) ? (u8) c->src.val
@@ -3334,15 +3730,43 @@ twobyte_insn:
                break;
        case 0xbb:
              btc:              /* btc */
-               /* only subword offset */
-               c->src.val &= (c->dst.bytes << 3) - 1;
                emulate_2op_SrcV_nobyte("btc", c->src, c->dst, ctxt->eflags);
                break;
+       case 0xbc: {            /* bsf */
+               u8 zf;
+               __asm__ ("bsf %2, %0; setz %1"
+                        : "=r"(c->dst.val), "=q"(zf)
+                        : "r"(c->src.val));
+               ctxt->eflags &= ~X86_EFLAGS_ZF;
+               if (zf) {
+                       ctxt->eflags |= X86_EFLAGS_ZF;
+                       c->dst.type = OP_NONE;  /* Disable writeback. */
+               }
+               break;
+       }
+       case 0xbd: {            /* bsr */
+               u8 zf;
+               __asm__ ("bsr %2, %0; setz %1"
+                        : "=r"(c->dst.val), "=q"(zf)
+                        : "r"(c->src.val));
+               ctxt->eflags &= ~X86_EFLAGS_ZF;
+               if (zf) {
+                       ctxt->eflags |= X86_EFLAGS_ZF;
+                       c->dst.type = OP_NONE;  /* Disable writeback. */
+               }
+               break;
+       }
        case 0xbe ... 0xbf:     /* movsx */
                c->dst.bytes = c->op_bytes;
                c->dst.val = (c->d & ByteOp) ? (s8) c->src.val :
                                                        (s16) c->src.val;
                break;
+       case 0xc0 ... 0xc1:     /* xadd */
+               emulate_2op_SrcV("add", c->src, c->dst, ctxt->eflags);
+               /* Write back the register source. */
+               c->src.val = c->dst.orig_val;
+               write_register_operand(&c->src);
+               break;
        case 0xc3:              /* movnti */
                c->dst.bytes = c->op_bytes;
                c->dst.val = (c->op_bytes == 4) ? (u32) c->src.val :
@@ -3350,10 +3774,14 @@ twobyte_insn:
                break;
        case 0xc7:              /* Grp9 (cmpxchg8b) */
                rc = emulate_grp9(ctxt, ops);
-               if (rc != X86EMUL_CONTINUE)
-                       goto done;
                break;
+       default:
+               goto cannot_emulate;
        }
+
+       if (rc != X86EMUL_CONTINUE)
+               goto done;
+
        goto writeback;
 
 cannot_emulate: