]> nv-tegra.nvidia Code Review - linux-2.6.git/blobdiff - arch/x86/kvm/emulate.c
KVM: x86 emulator: simplify emulate_1op_rax_rdx()
[linux-2.6.git] / arch / x86 / kvm / emulate.c
index a2d343c4c0c1dc7afdabee0a489d82190c518a7b..e10fd3732d10ad42c7eb35172ffa683181067f3b 100644 (file)
 #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)
+#define DstDX       (8<<1)     /* Destination is in DX register */
+#define DstMask     (0xf<<1)
 /* Source operand type. */
-#define SrcNone     (0<<4)     /* No source operand. */
-#define SrcReg      (1<<4)     /* Register operand. */
-#define SrcMem      (2<<4)     /* Memory operand. */
-#define SrcMem16    (3<<4)     /* Memory operand (16-bit). */
-#define SrcMem32    (4<<4)     /* Memory operand (32-bit). */
-#define SrcImm      (5<<4)     /* Immediate operand. */
-#define SrcImmByte  (6<<4)     /* 8-bit sign-extended immediate operand. */
-#define SrcOne      (7<<4)     /* Implied '1' */
-#define SrcImmUByte (8<<4)      /* 8-bit unsigned immediate operand. */
-#define SrcImmU     (9<<4)      /* Immediate operand, unsigned */
-#define SrcSI       (0xa<<4)   /* Source is in the DS:RSI */
-#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)
+#define SrcNone     (0<<5)     /* No source operand. */
+#define SrcReg      (1<<5)     /* Register operand. */
+#define SrcMem      (2<<5)     /* Memory operand. */
+#define SrcMem16    (3<<5)     /* Memory operand (16-bit). */
+#define SrcMem32    (4<<5)     /* Memory operand (32-bit). */
+#define SrcImm      (5<<5)     /* Immediate operand. */
+#define SrcImmByte  (6<<5)     /* 8-bit sign-extended immediate operand. */
+#define SrcOne      (7<<5)     /* Implied '1' */
+#define SrcImmUByte (8<<5)      /* 8-bit unsigned immediate operand. */
+#define SrcImmU     (9<<5)      /* Immediate operand, unsigned */
+#define SrcSI       (0xa<<5)   /* Source is in the DS:RSI */
+#define SrcImmFAddr (0xb<<5)   /* Source is immediate far address */
+#define SrcMemFAddr (0xc<<5)   /* Source is far address in memory */
+#define SrcAcc      (0xd<<5)   /* Source Accumulator */
+#define SrcImmU16   (0xe<<5)    /* Immediate operand, unsigned, 16 bits */
+#define SrcDX       (0xf<<5)   /* Source is in DX register */
+#define SrcMask     (0xf<<5)
 /* Generic ModRM decode. */
-#define ModRM       (1<<8)
+#define ModRM       (1<<9)
 /* Destination is only written; never read. */
-#define Mov         (1<<9)
-#define BitOp       (1<<10)
-#define MemAbs      (1<<11)      /* Memory operand is absolute displacement */
-#define String      (1<<12)     /* String instruction (rep capable) */
-#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 Prefix      (1<<16)     /* Instruction varies with 66/f2/f3 prefix */
-#define Sse         (1<<17)     /* SSE Vector instruction */
-#define RMExt       (1<<18)     /* Opcode extension in ModRM r/m if mod == 3 */
+#define Mov         (1<<10)
+#define BitOp       (1<<11)
+#define MemAbs      (1<<12)      /* Memory operand is absolute displacement */
+#define String      (1<<13)     /* String instruction (rep capable) */
+#define Stack       (1<<14)     /* Stack instruction (push/pop) */
+#define GroupMask   (7<<15)     /* Opcode uses one of the group mechanisms */
+#define Group       (1<<15)     /* Bits 3:5 of modrm byte extend opcode */
+#define GroupDual   (2<<15)     /* Alternate decoding of mod == 3 */
+#define Prefix      (3<<15)     /* Instruction varies with 66/f2/f3 prefix */
+#define RMExt       (4<<15)     /* Opcode extension in ModRM r/m if mod == 3 */
+#define Sse         (1<<18)     /* SSE Vector instruction */
 /* Misc flags */
 #define Prot        (1<<21) /* instruction generates #UD if not in prot-mode */
 #define VendorSpecific (1<<22) /* Vendor specific instruction */
@@ -202,105 +205,100 @@ struct gprefix {
 #define ON64(x)
 #endif
 
-#define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix, _dsttype) \
+#define ____emulate_2op(ctxt, _op, _x, _y, _suffix, _dsttype)  \
        do {                                                            \
                __asm__ __volatile__ (                                  \
                        _PRE_EFLAGS("0", "4", "2")                      \
                        _op _suffix " %"_x"3,%1; "                      \
                        _POST_EFLAGS("0", "4", "2")                     \
-                       : "=m" (_eflags), "+q" (*(_dsttype*)&(_dst).val),\
+                       : "=m" ((ctxt)->eflags),                        \
+                         "+q" (*(_dsttype*)&(ctxt)->dst.val),          \
                          "=&r" (_tmp)                                  \
-                       : _y ((_src).val), "i" (EFLAGS_MASK));          \
+                       : _y ((ctxt)->src.val), "i" (EFLAGS_MASK));     \
        } while (0)
 
 
 /* Raw emulation: instruction has two explicit operands. */
-#define __emulate_2op_nobyte(_op,_src,_dst,_eflags,_wx,_wy,_lx,_ly,_qx,_qy) \
+#define __emulate_2op_nobyte(ctxt,_op,_wx,_wy,_lx,_ly,_qx,_qy)         \
        do {                                                            \
                unsigned long _tmp;                                     \
                                                                        \
-               switch ((_dst).bytes) {                                 \
+               switch ((ctxt)->dst.bytes) {                            \
                case 2:                                                 \
-                       ____emulate_2op(_op,_src,_dst,_eflags,_wx,_wy,"w",u16);\
+                       ____emulate_2op(ctxt,_op,_wx,_wy,"w",u16);      \
                        break;                                          \
                case 4:                                                 \
-                       ____emulate_2op(_op,_src,_dst,_eflags,_lx,_ly,"l",u32);\
+                       ____emulate_2op(ctxt,_op,_lx,_ly,"l",u32);      \
                        break;                                          \
                case 8:                                                 \
-                       ON64(____emulate_2op(_op,_src,_dst,_eflags,_qx,_qy,"q",u64)); \
+                       ON64(____emulate_2op(ctxt,_op,_qx,_qy,"q",u64)); \
                        break;                                          \
                }                                                       \
        } while (0)
 
-#define __emulate_2op(_op,_src,_dst,_eflags,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
+#define __emulate_2op(ctxt,_op,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy)                     \
        do {                                                                 \
                unsigned long _tmp;                                          \
-               switch ((_dst).bytes) {                                      \
+               switch ((ctxt)->dst.bytes) {                                 \
                case 1:                                                      \
-                       ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \
+                       ____emulate_2op(ctxt,_op,_bx,_by,"b",u8);            \
                        break;                                               \
                default:                                                     \
-                       __emulate_2op_nobyte(_op, _src, _dst, _eflags,       \
+                       __emulate_2op_nobyte(ctxt, _op,                      \
                                             _wx, _wy, _lx, _ly, _qx, _qy);  \
                        break;                                               \
                }                                                            \
        } while (0)
 
 /* Source operand is byte-sized and may be restricted to just %cl. */
-#define emulate_2op_SrcB(_op, _src, _dst, _eflags)                      \
-       __emulate_2op(_op, _src, _dst, _eflags,                         \
-                     "b", "c", "b", "c", "b", "c", "b", "c")
+#define emulate_2op_SrcB(ctxt, _op)                                    \
+       __emulate_2op(ctxt, _op, "b", "c", "b", "c", "b", "c", "b", "c")
 
 /* Source operand is byte, word, long or quad sized. */
-#define emulate_2op_SrcV(_op, _src, _dst, _eflags)                      \
-       __emulate_2op(_op, _src, _dst, _eflags,                         \
-                     "b", "q", "w", "r", _LO32, "r", "", "r")
+#define emulate_2op_SrcV(ctxt, _op)                                    \
+       __emulate_2op(ctxt, _op, "b", "q", "w", "r", _LO32, "r", "", "r")
 
 /* Source operand is word, long or quad sized. */
-#define emulate_2op_SrcV_nobyte(_op, _src, _dst, _eflags)               \
-       __emulate_2op_nobyte(_op, _src, _dst, _eflags,                  \
-                            "w", "r", _LO32, "r", "", "r")
+#define emulate_2op_SrcV_nobyte(ctxt, _op)                             \
+       __emulate_2op_nobyte(ctxt, _op, "w", "r", _LO32, "r", "", "r")
 
 /* Instruction has three operands and one operand is stored in ECX register */
-#define __emulate_2op_cl(_op, _cl, _src, _dst, _eflags, _suffix, _type)        \
-       do {                                                                    \
-               unsigned long _tmp;                                             \
-               _type _clv  = (_cl).val;                                        \
-               _type _srcv = (_src).val;                                       \
-               _type _dstv = (_dst).val;                                       \
-                                                                               \
-               __asm__ __volatile__ (                                          \
-                       _PRE_EFLAGS("0", "5", "2")                              \
-                       _op _suffix " %4,%1 \n"                                 \
-                       _POST_EFLAGS("0", "5", "2")                             \
-                       : "=m" (_eflags), "+r" (_dstv), "=&r" (_tmp)            \
-                       : "c" (_clv) , "r" (_srcv), "i" (EFLAGS_MASK)           \
-                       );                                                      \
-                                                                               \
-               (_cl).val  = (unsigned long) _clv;                              \
-               (_src).val = (unsigned long) _srcv;                             \
-               (_dst).val = (unsigned long) _dstv;                             \
+#define __emulate_2op_cl(ctxt, _op, _suffix, _type)            \
+       do {                                                            \
+               unsigned long _tmp;                                     \
+               _type _clv  = (ctxt)->src2.val;                         \
+               _type _srcv = (ctxt)->src.val;                          \
+               _type _dstv = (ctxt)->dst.val;                          \
+                                                                       \
+               __asm__ __volatile__ (                                  \
+                       _PRE_EFLAGS("0", "5", "2")                      \
+                       _op _suffix " %4,%1 \n"                         \
+                       _POST_EFLAGS("0", "5", "2")                     \
+                       : "=m" ((ctxt)->eflags), "+r" (_dstv), "=&r" (_tmp) \
+                       : "c" (_clv) , "r" (_srcv), "i" (EFLAGS_MASK)   \
+                       );                                              \
+                                                                       \
+               (ctxt)->src2.val  = (unsigned long) _clv;               \
+               (ctxt)->src2.val = (unsigned long) _srcv;               \
+               (ctxt)->dst.val = (unsigned long) _dstv;                \
        } while (0)
 
-#define emulate_2op_cl(_op, _cl, _src, _dst, _eflags)                          \
-       do {                                                                    \
-               switch ((_dst).bytes) {                                         \
-               case 2:                                                         \
-                       __emulate_2op_cl(_op, _cl, _src, _dst, _eflags,         \
-                                               "w", unsigned short);           \
-                       break;                                                  \
-               case 4:                                                         \
-                       __emulate_2op_cl(_op, _cl, _src, _dst, _eflags,         \
-                                               "l", unsigned int);             \
-                       break;                                                  \
-               case 8:                                                         \
-                       ON64(__emulate_2op_cl(_op, _cl, _src, _dst, _eflags,    \
-                                               "q", unsigned long));           \
-                       break;                                                  \
-               }                                                               \
+#define emulate_2op_cl(ctxt, _op)                                      \
+       do {                                                            \
+               switch ((ctxt)->dst.bytes) {                            \
+               case 2:                                                 \
+                       __emulate_2op_cl(ctxt, _op, "w", u16);          \
+                       break;                                          \
+               case 4:                                                 \
+                       __emulate_2op_cl(ctxt, _op, "l", u32);          \
+                       break;                                          \
+               case 8:                                                 \
+                       ON64(__emulate_2op_cl(ctxt, _op, "q", ulong));  \
+                       break;                                          \
+               }                                                       \
        } while (0)
 
-#define __emulate_1op(_op, _dst, _eflags, _suffix)                     \
+#define __emulate_1op(ctxt, _op, _suffix)                              \
        do {                                                            \
                unsigned long _tmp;                                     \
                                                                        \
@@ -308,39 +306,27 @@ struct gprefix {
                        _PRE_EFLAGS("0", "3", "2")                      \
                        _op _suffix " %1; "                             \
                        _POST_EFLAGS("0", "3", "2")                     \
-                       : "=m" (_eflags), "+m" ((_dst).val),            \
+                       : "=m" ((ctxt)->eflags), "+m" ((ctxt)->dst.val), \
                          "=&r" (_tmp)                                  \
                        : "i" (EFLAGS_MASK));                           \
        } while (0)
 
 /* Instruction has only one explicit operand (no source operand). */
-#define emulate_1op(_op, _dst, _eflags)                                    \
+#define emulate_1op(ctxt, _op)                                         \
        do {                                                            \
-               switch ((_dst).bytes) {                                 \
-               case 1: __emulate_1op(_op, _dst, _eflags, "b"); break;  \
-               case 2: __emulate_1op(_op, _dst, _eflags, "w"); break;  \
-               case 4: __emulate_1op(_op, _dst, _eflags, "l"); break;  \
-               case 8: ON64(__emulate_1op(_op, _dst, _eflags, "q")); break; \
+               switch ((ctxt)->dst.bytes) {                            \
+               case 1: __emulate_1op(ctxt, _op, "b"); break;           \
+               case 2: __emulate_1op(ctxt, _op, "w"); break;           \
+               case 4: __emulate_1op(ctxt, _op, "l"); break;           \
+               case 8: ON64(__emulate_1op(ctxt, _op, "q")); break;     \
                }                                                       \
        } 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) \
+#define __emulate_1op_rax_rdx(ctxt, _op, _suffix, _ex)                 \
        do {                                                            \
                unsigned long _tmp;                                     \
+               ulong *rax = &(ctxt)->regs[VCPU_REGS_RAX];              \
+               ulong *rdx = &(ctxt)->regs[VCPU_REGS_RDX];              \
                                                                        \
                __asm__ __volatile__ (                                  \
                        _PRE_EFLAGS("0", "5", "1")                      \
@@ -353,155 +339,113 @@ struct gprefix {
                        "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));                      \
+                       : "=m" ((ctxt)->eflags), "=&r" (_tmp),          \
+                         "+a" (*rax), "+d" (*rdx), "+qm"(_ex)          \
+                       : "i" (EFLAGS_MASK), "m" ((ctxt)->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)    \
+#define emulate_1op_rax_rdx(ctxt, _op, _ex)    \
        do {                                                            \
-               switch((_src).bytes) {                                  \
+               switch((ctxt)->src.bytes) {                             \
                case 1:                                                 \
-                       __emulate_1op_rax_rdx_ex(_op, _src, _rax, _rdx, \
-                                                _eflags, "b", _ex);    \
+                       __emulate_1op_rax_rdx(ctxt, _op, "b", _ex);     \
                        break;                                          \
                case 2:                                                 \
-                       __emulate_1op_rax_rdx_ex(_op, _src, _rax, _rdx, \
-                                                _eflags, "w", _ex);    \
+                       __emulate_1op_rax_rdx(ctxt, _op, "w", _ex);     \
                        break;                                          \
                case 4:                                                 \
-                       __emulate_1op_rax_rdx_ex(_op, _src, _rax, _rdx, \
-                                                _eflags, "l", _ex);    \
+                       __emulate_1op_rax_rdx(ctxt, _op, "l", _ex);     \
                        break;                                          \
                case 8: ON64(                                           \
-                       __emulate_1op_rax_rdx_ex(_op, _src, _rax, _rdx, \
-                                                _eflags, "q", _ex));   \
+                       __emulate_1op_rax_rdx(ctxt, _op, "q", _ex));    \
                        break;                                          \
                }                                                       \
        } while (0)
 
-/* Fetch next part of the instruction being emulated. */
-#define insn_fetch(_type, _size, _eip)                                  \
-({     unsigned long _x;                                               \
-       rc = do_insn_fetch(ctxt, ops, (_eip), &_x, (_size));            \
-       if (rc != X86EMUL_CONTINUE)                                     \
-               goto done;                                              \
-       (_eip) += (_size);                                              \
-       (_type)_x;                                                      \
-})
-
-#define insn_fetch_arr(_arr, _size, _eip)                                \
-({     rc = do_insn_fetch(ctxt, ops, (_eip), _arr, (_size));           \
-       if (rc != X86EMUL_CONTINUE)                                     \
-               goto done;                                              \
-       (_eip) += (_size);                                              \
-})
-
 static int emulator_check_intercept(struct x86_emulate_ctxt *ctxt,
                                    enum x86_intercept intercept,
                                    enum x86_intercept_stage stage)
 {
        struct x86_instruction_info info = {
                .intercept  = intercept,
-               .rep_prefix = ctxt->decode.rep_prefix,
-               .modrm_mod  = ctxt->decode.modrm_mod,
-               .modrm_reg  = ctxt->decode.modrm_reg,
-               .modrm_rm   = ctxt->decode.modrm_rm,
-               .src_val    = ctxt->decode.src.val64,
-               .src_bytes  = ctxt->decode.src.bytes,
-               .dst_bytes  = ctxt->decode.dst.bytes,
-               .ad_bytes   = ctxt->decode.ad_bytes,
+               .rep_prefix = ctxt->rep_prefix,
+               .modrm_mod  = ctxt->modrm_mod,
+               .modrm_reg  = ctxt->modrm_reg,
+               .modrm_rm   = ctxt->modrm_rm,
+               .src_val    = ctxt->src.val64,
+               .src_bytes  = ctxt->src.bytes,
+               .dst_bytes  = ctxt->dst.bytes,
+               .ad_bytes   = ctxt->ad_bytes,
                .next_rip   = ctxt->eip,
        };
 
-       return ctxt->ops->intercept(ctxt->vcpu, &info, stage);
+       return ctxt->ops->intercept(ctxt, &info, stage);
 }
 
-static inline unsigned long ad_mask(struct decode_cache *c)
+static inline unsigned long ad_mask(struct x86_emulate_ctxt *ctxt)
 {
-       return (1UL << (c->ad_bytes << 3)) - 1;
+       return (1UL << (ctxt->ad_bytes << 3)) - 1;
 }
 
 /* Access/update address held in a register, based on addressing mode. */
 static inline unsigned long
-address_mask(struct decode_cache *c, unsigned long reg)
+address_mask(struct x86_emulate_ctxt *ctxt, unsigned long reg)
 {
-       if (c->ad_bytes == sizeof(unsigned long))
+       if (ctxt->ad_bytes == sizeof(unsigned long))
                return reg;
        else
-               return reg & ad_mask(c);
+               return reg & ad_mask(ctxt);
 }
 
 static inline unsigned long
-register_address(struct decode_cache *c, unsigned long reg)
+register_address(struct x86_emulate_ctxt *ctxt, unsigned long reg)
 {
-       return address_mask(c, reg);
+       return address_mask(ctxt, reg);
 }
 
 static inline void
-register_address_increment(struct decode_cache *c, unsigned long *reg, int inc)
+register_address_increment(struct x86_emulate_ctxt *ctxt, unsigned long *reg, int inc)
 {
-       if (c->ad_bytes == sizeof(unsigned long))
+       if (ctxt->ad_bytes == sizeof(unsigned long))
                *reg += inc;
        else
-               *reg = (*reg & ~ad_mask(c)) | ((*reg + inc) & ad_mask(c));
+               *reg = (*reg & ~ad_mask(ctxt)) | ((*reg + inc) & ad_mask(ctxt));
 }
 
-static inline void jmp_rel(struct decode_cache *c, int rel)
+static inline void jmp_rel(struct x86_emulate_ctxt *ctxt, int rel)
 {
-       register_address_increment(c, &c->eip, rel);
+       register_address_increment(ctxt, &ctxt->_eip, rel);
 }
 
-static void set_seg_override(struct decode_cache *c, int seg)
+static u32 desc_limit_scaled(struct desc_struct *desc)
 {
-       c->has_seg_override = true;
-       c->seg_override = seg;
+       u32 limit = get_desc_limit(desc);
+
+       return desc->g ? (limit << 12) | 0xfff : limit;
 }
 
-static unsigned long seg_base(struct x86_emulate_ctxt *ctxt,
-                             struct x86_emulate_ops *ops, int seg)
+static void set_seg_override(struct x86_emulate_ctxt *ctxt, int seg)
 {
-       if (ctxt->mode == X86EMUL_MODE_PROT64 && seg < VCPU_SREG_FS)
-               return 0;
-
-       return ops->get_cached_segment_base(seg, ctxt->vcpu);
+       ctxt->has_seg_override = true;
+       ctxt->seg_override = seg;
 }
 
-static unsigned seg_override(struct x86_emulate_ctxt *ctxt,
-                            struct x86_emulate_ops *ops,
-                            struct decode_cache *c)
+static unsigned long seg_base(struct x86_emulate_ctxt *ctxt, int seg)
 {
-       if (!c->has_seg_override)
+       if (ctxt->mode == X86EMUL_MODE_PROT64 && seg < VCPU_SREG_FS)
                return 0;
 
-       return c->seg_override;
+       return ctxt->ops->get_cached_segment_base(ctxt, seg);
 }
 
-static int linearize(struct x86_emulate_ctxt *ctxt,
-                    struct segmented_address addr,
-                    unsigned size, bool write,
-                    ulong *linear)
+static unsigned seg_override(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
-       ulong la;
+       if (!ctxt->has_seg_override)
+               return 0;
 
-       la = seg_base(ctxt, ctxt->ops, addr.seg) + addr.ea;
-       if (c->ad_bytes != 8)
-               la &= (u32)-1;
-       *linear = la;
-       return X86EMUL_CONTINUE;
+       return ctxt->seg_override;
 }
 
 static int emulate_exception(struct x86_emulate_ctxt *ctxt, int vec,
@@ -523,6 +467,11 @@ static int emulate_gp(struct x86_emulate_ctxt *ctxt, int err)
        return emulate_exception(ctxt, GP_VECTOR, err, true);
 }
 
+static int emulate_ss(struct x86_emulate_ctxt *ctxt, int err)
+{
+       return emulate_exception(ctxt, SS_VECTOR, err, true);
+}
+
 static int emulate_ud(struct x86_emulate_ctxt *ctxt)
 {
        return emulate_exception(ctxt, UD_VECTOR, 0, false);
@@ -543,6 +492,108 @@ static int emulate_nm(struct x86_emulate_ctxt *ctxt)
        return emulate_exception(ctxt, NM_VECTOR, 0, false);
 }
 
+static u16 get_segment_selector(struct x86_emulate_ctxt *ctxt, unsigned seg)
+{
+       u16 selector;
+       struct desc_struct desc;
+
+       ctxt->ops->get_segment(ctxt, &selector, &desc, NULL, seg);
+       return selector;
+}
+
+static void set_segment_selector(struct x86_emulate_ctxt *ctxt, u16 selector,
+                                unsigned seg)
+{
+       u16 dummy;
+       u32 base3;
+       struct desc_struct desc;
+
+       ctxt->ops->get_segment(ctxt, &dummy, &desc, &base3, seg);
+       ctxt->ops->set_segment(ctxt, selector, &desc, base3, seg);
+}
+
+static int __linearize(struct x86_emulate_ctxt *ctxt,
+                    struct segmented_address addr,
+                    unsigned size, bool write, bool fetch,
+                    ulong *linear)
+{
+       struct desc_struct desc;
+       bool usable;
+       ulong la;
+       u32 lim;
+       u16 sel;
+       unsigned cpl, rpl;
+
+       la = seg_base(ctxt, addr.seg) + addr.ea;
+       switch (ctxt->mode) {
+       case X86EMUL_MODE_REAL:
+               break;
+       case X86EMUL_MODE_PROT64:
+               if (((signed long)la << 16) >> 16 != la)
+                       return emulate_gp(ctxt, 0);
+               break;
+       default:
+               usable = ctxt->ops->get_segment(ctxt, &sel, &desc, NULL,
+                                               addr.seg);
+               if (!usable)
+                       goto bad;
+               /* code segment or read-only data segment */
+               if (((desc.type & 8) || !(desc.type & 2)) && write)
+                       goto bad;
+               /* unreadable code segment */
+               if (!fetch && (desc.type & 8) && !(desc.type & 2))
+                       goto bad;
+               lim = desc_limit_scaled(&desc);
+               if ((desc.type & 8) || !(desc.type & 4)) {
+                       /* expand-up segment */
+                       if (addr.ea > lim || (u32)(addr.ea + size - 1) > lim)
+                               goto bad;
+               } else {
+                       /* exapand-down segment */
+                       if (addr.ea <= lim || (u32)(addr.ea + size - 1) <= lim)
+                               goto bad;
+                       lim = desc.d ? 0xffffffff : 0xffff;
+                       if (addr.ea > lim || (u32)(addr.ea + size - 1) > lim)
+                               goto bad;
+               }
+               cpl = ctxt->ops->cpl(ctxt);
+               rpl = sel & 3;
+               cpl = max(cpl, rpl);
+               if (!(desc.type & 8)) {
+                       /* data segment */
+                       if (cpl > desc.dpl)
+                               goto bad;
+               } else if ((desc.type & 8) && !(desc.type & 4)) {
+                       /* nonconforming code segment */
+                       if (cpl != desc.dpl)
+                               goto bad;
+               } else if ((desc.type & 8) && (desc.type & 4)) {
+                       /* conforming code segment */
+                       if (cpl < desc.dpl)
+                               goto bad;
+               }
+               break;
+       }
+       if (fetch ? ctxt->mode != X86EMUL_MODE_PROT64 : ctxt->ad_bytes != 8)
+               la &= (u32)-1;
+       *linear = la;
+       return X86EMUL_CONTINUE;
+bad:
+       if (addr.seg == VCPU_SREG_SS)
+               return emulate_ss(ctxt, addr.seg);
+       else
+               return emulate_gp(ctxt, addr.seg);
+}
+
+static int linearize(struct x86_emulate_ctxt *ctxt,
+                    struct segmented_address addr,
+                    unsigned size, bool write,
+                    ulong *linear)
+{
+       return __linearize(ctxt, addr, size, write, false, linear);
+}
+
+
 static int segmented_read_std(struct x86_emulate_ctxt *ctxt,
                              struct segmented_address addr,
                              void *data,
@@ -554,48 +605,74 @@ static int segmented_read_std(struct x86_emulate_ctxt *ctxt,
        rc = linearize(ctxt, addr, size, false, &linear);
        if (rc != X86EMUL_CONTINUE)
                return rc;
-       return ctxt->ops->read_std(linear, data, size, ctxt->vcpu,
-                                  &ctxt->exception);
+       return ctxt->ops->read_std(ctxt, linear, data, size, &ctxt->exception);
 }
 
-static int do_fetch_insn_byte(struct x86_emulate_ctxt *ctxt,
-                             struct x86_emulate_ops *ops,
-                             unsigned long eip, u8 *dest)
+/*
+ * Fetch the next byte of the instruction being emulated which is pointed to
+ * by ctxt->_eip, then increment ctxt->_eip.
+ *
+ * Also prefetch the remaining bytes of the instruction without crossing page
+ * boundary if they are not in fetch_cache yet.
+ */
+static int do_insn_fetch_byte(struct x86_emulate_ctxt *ctxt, u8 *dest)
 {
-       struct fetch_cache *fc = &ctxt->decode.fetch;
+       struct fetch_cache *fc = &ctxt->fetch;
        int rc;
        int size, cur_size;
 
-       if (eip == fc->end) {
+       if (ctxt->_eip == fc->end) {
+               unsigned long linear;
+               struct segmented_address addr = { .seg = VCPU_SREG_CS,
+                                                 .ea  = ctxt->_eip };
                cur_size = fc->end - fc->start;
-               size = min(15UL - cur_size, PAGE_SIZE - offset_in_page(eip));
-               rc = ops->fetch(ctxt->cs_base + eip, fc->data + cur_size,
-                               size, ctxt->vcpu, &ctxt->exception);
-               if (rc != X86EMUL_CONTINUE)
+               size = min(15UL - cur_size,
+                          PAGE_SIZE - offset_in_page(ctxt->_eip));
+               rc = __linearize(ctxt, addr, size, false, true, &linear);
+               if (unlikely(rc != X86EMUL_CONTINUE))
+                       return rc;
+               rc = ctxt->ops->fetch(ctxt, linear, fc->data + cur_size,
+                                     size, &ctxt->exception);
+               if (unlikely(rc != X86EMUL_CONTINUE))
                        return rc;
                fc->end += size;
        }
-       *dest = fc->data[eip - fc->start];
+       *dest = fc->data[ctxt->_eip - fc->start];
+       ctxt->_eip++;
        return X86EMUL_CONTINUE;
 }
 
 static int do_insn_fetch(struct x86_emulate_ctxt *ctxt,
-                        struct x86_emulate_ops *ops,
-                        unsigned long eip, void *dest, unsigned size)
+                        void *dest, unsigned size)
 {
        int rc;
 
        /* x86 instructions are limited to 15 bytes. */
-       if (eip + size - ctxt->eip > 15)
+       if (unlikely(ctxt->_eip + size - ctxt->eip > 15))
                return X86EMUL_UNHANDLEABLE;
        while (size--) {
-               rc = do_fetch_insn_byte(ctxt, ops, eip++, dest++);
+               rc = do_insn_fetch_byte(ctxt, dest++);
                if (rc != X86EMUL_CONTINUE)
                        return rc;
        }
        return X86EMUL_CONTINUE;
 }
 
+/* Fetch next part of the instruction being emulated. */
+#define insn_fetch(_type, _ctxt)                                       \
+({     unsigned long _x;                                               \
+       rc = do_insn_fetch(_ctxt, &_x, sizeof(_type));                  \
+       if (rc != X86EMUL_CONTINUE)                                     \
+               goto done;                                              \
+       (_type)_x;                                                      \
+})
+
+#define insn_fetch_arr(_arr, _size, _ctxt)                             \
+({     rc = do_insn_fetch(_ctxt, _arr, (_size));                       \
+       if (rc != X86EMUL_CONTINUE)                                     \
+               goto done;                                              \
+})
+
 /*
  * Given the 'reg' portion of a ModRM byte, and a register block, return a
  * pointer into the block that addresses the relevant register.
@@ -613,7 +690,6 @@ static void *decode_register(u8 modrm_reg, unsigned long *regs,
 }
 
 static int read_descriptor(struct x86_emulate_ctxt *ctxt,
-                          struct x86_emulate_ops *ops,
                           struct segmented_address addr,
                           u16 *size, unsigned long *address, int op_bytes)
 {
@@ -740,16 +816,15 @@ static void write_sse_reg(struct x86_emulate_ctxt *ctxt, sse128_t *data,
 
 static void decode_register_operand(struct x86_emulate_ctxt *ctxt,
                                    struct operand *op,
-                                   struct decode_cache *c,
                                    int inhibit_bytereg)
 {
-       unsigned reg = c->modrm_reg;
-       int highbyte_regs = c->rex_prefix == 0;
+       unsigned reg = ctxt->modrm_reg;
+       int highbyte_regs = ctxt->rex_prefix == 0;
 
-       if (!(c->d & ModRM))
-               reg = (c->b & 7) | ((c->rex_prefix & 1) << 3);
+       if (!(ctxt->d & ModRM))
+               reg = (ctxt->b & 7) | ((ctxt->rex_prefix & 1) << 3);
 
-       if (c->d & Sse) {
+       if (ctxt->d & Sse) {
                op->type = OP_XMM;
                op->bytes = 16;
                op->addr.xmm = reg;
@@ -758,49 +833,47 @@ static void decode_register_operand(struct x86_emulate_ctxt *ctxt,
        }
 
        op->type = OP_REG;
-       if ((c->d & ByteOp) && !inhibit_bytereg) {
-               op->addr.reg = decode_register(reg, c->regs, highbyte_regs);
+       if ((ctxt->d & ByteOp) && !inhibit_bytereg) {
+               op->addr.reg = decode_register(reg, ctxt->regs, highbyte_regs);
                op->bytes = 1;
        } else {
-               op->addr.reg = decode_register(reg, c->regs, 0);
-               op->bytes = c->op_bytes;
+               op->addr.reg = decode_register(reg, ctxt->regs, 0);
+               op->bytes = ctxt->op_bytes;
        }
        fetch_register_operand(op);
        op->orig_val = op->val;
 }
 
 static int decode_modrm(struct x86_emulate_ctxt *ctxt,
-                       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 */
-               index_reg = (c->rex_prefix & 2) << 2; /* REX.X */
-               c->modrm_rm = base_reg = (c->rex_prefix & 1) << 3; /* REG.B */
+       if (ctxt->rex_prefix) {
+               ctxt->modrm_reg = (ctxt->rex_prefix & 4) << 1;  /* REX.R */
+               index_reg = (ctxt->rex_prefix & 2) << 2; /* REX.X */
+               ctxt->modrm_rm = base_reg = (ctxt->rex_prefix & 1) << 3; /* REG.B */
        }
 
-       c->modrm = insn_fetch(u8, 1, c->eip);
-       c->modrm_mod |= (c->modrm & 0xc0) >> 6;
-       c->modrm_reg |= (c->modrm & 0x38) >> 3;
-       c->modrm_rm |= (c->modrm & 0x07);
-       c->modrm_seg = VCPU_SREG_DS;
+       ctxt->modrm = insn_fetch(u8, ctxt);
+       ctxt->modrm_mod |= (ctxt->modrm & 0xc0) >> 6;
+       ctxt->modrm_reg |= (ctxt->modrm & 0x38) >> 3;
+       ctxt->modrm_rm |= (ctxt->modrm & 0x07);
+       ctxt->modrm_seg = VCPU_SREG_DS;
 
-       if (c->modrm_mod == 3) {
+       if (ctxt->modrm_mod == 3) {
                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);
-               if (c->d & Sse) {
+               op->bytes = (ctxt->d & ByteOp) ? 1 : ctxt->op_bytes;
+               op->addr.reg = decode_register(ctxt->modrm_rm,
+                                              ctxt->regs, ctxt->d & ByteOp);
+               if (ctxt->d & Sse) {
                        op->type = OP_XMM;
                        op->bytes = 16;
-                       op->addr.xmm = c->modrm_rm;
-                       read_sse_reg(ctxt, &op->vec_val, c->modrm_rm);
+                       op->addr.xmm = ctxt->modrm_rm;
+                       read_sse_reg(ctxt, &op->vec_val, ctxt->modrm_rm);
                        return rc;
                }
                fetch_register_operand(op);
@@ -809,26 +882,26 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
 
        op->type = OP_MEM;
 
-       if (c->ad_bytes == 2) {
-               unsigned bx = c->regs[VCPU_REGS_RBX];
-               unsigned bp = c->regs[VCPU_REGS_RBP];
-               unsigned si = c->regs[VCPU_REGS_RSI];
-               unsigned di = c->regs[VCPU_REGS_RDI];
+       if (ctxt->ad_bytes == 2) {
+               unsigned bx = ctxt->regs[VCPU_REGS_RBX];
+               unsigned bp = ctxt->regs[VCPU_REGS_RBP];
+               unsigned si = ctxt->regs[VCPU_REGS_RSI];
+               unsigned di = ctxt->regs[VCPU_REGS_RDI];
 
                /* 16-bit ModR/M decode. */
-               switch (c->modrm_mod) {
+               switch (ctxt->modrm_mod) {
                case 0:
-                       if (c->modrm_rm == 6)
-                               modrm_ea += insn_fetch(u16, 2, c->eip);
+                       if (ctxt->modrm_rm == 6)
+                               modrm_ea += insn_fetch(u16, ctxt);
                        break;
                case 1:
-                       modrm_ea += insn_fetch(s8, 1, c->eip);
+                       modrm_ea += insn_fetch(s8, ctxt);
                        break;
                case 2:
-                       modrm_ea += insn_fetch(u16, 2, c->eip);
+                       modrm_ea += insn_fetch(u16, ctxt);
                        break;
                }
-               switch (c->modrm_rm) {
+               switch (ctxt->modrm_rm) {
                case 0:
                        modrm_ea += bx + si;
                        break;
@@ -848,46 +921,46 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
                        modrm_ea += di;
                        break;
                case 6:
-                       if (c->modrm_mod != 0)
+                       if (ctxt->modrm_mod != 0)
                                modrm_ea += bp;
                        break;
                case 7:
                        modrm_ea += bx;
                        break;
                }
-               if (c->modrm_rm == 2 || c->modrm_rm == 3 ||
-                   (c->modrm_rm == 6 && c->modrm_mod != 0))
-                       c->modrm_seg = VCPU_SREG_SS;
+               if (ctxt->modrm_rm == 2 || ctxt->modrm_rm == 3 ||
+                   (ctxt->modrm_rm == 6 && ctxt->modrm_mod != 0))
+                       ctxt->modrm_seg = VCPU_SREG_SS;
                modrm_ea = (u16)modrm_ea;
        } else {
                /* 32/64-bit ModR/M decode. */
-               if ((c->modrm_rm & 7) == 4) {
-                       sib = insn_fetch(u8, 1, c->eip);
+               if ((ctxt->modrm_rm & 7) == 4) {
+                       sib = insn_fetch(u8, ctxt);
                        index_reg |= (sib >> 3) & 7;
                        base_reg |= sib & 7;
                        scale = sib >> 6;
 
-                       if ((base_reg & 7) == 5 && c->modrm_mod == 0)
-                               modrm_ea += insn_fetch(s32, 4, c->eip);
+                       if ((base_reg & 7) == 5 && ctxt->modrm_mod == 0)
+                               modrm_ea += insn_fetch(s32, ctxt);
                        else
-                               modrm_ea += c->regs[base_reg];
+                               modrm_ea += ctxt->regs[base_reg];
                        if (index_reg != 4)
-                               modrm_ea += c->regs[index_reg] << scale;
-               } else if ((c->modrm_rm & 7) == 5 && c->modrm_mod == 0) {
+                               modrm_ea += ctxt->regs[index_reg] << scale;
+               } else if ((ctxt->modrm_rm & 7) == 5 && ctxt->modrm_mod == 0) {
                        if (ctxt->mode == X86EMUL_MODE_PROT64)
-                               c->rip_relative = 1;
+                               ctxt->rip_relative = 1;
                } else
-                       modrm_ea += c->regs[c->modrm_rm];
-               switch (c->modrm_mod) {
+                       modrm_ea += ctxt->regs[ctxt->modrm_rm];
+               switch (ctxt->modrm_mod) {
                case 0:
-                       if (c->modrm_rm == 5)
-                               modrm_ea += insn_fetch(s32, 4, c->eip);
+                       if (ctxt->modrm_rm == 5)
+                               modrm_ea += insn_fetch(s32, ctxt);
                        break;
                case 1:
-                       modrm_ea += insn_fetch(s8, 1, c->eip);
+                       modrm_ea += insn_fetch(s8, ctxt);
                        break;
                case 2:
-                       modrm_ea += insn_fetch(s32, 4, c->eip);
+                       modrm_ea += insn_fetch(s32, ctxt);
                        break;
                }
        }
@@ -897,53 +970,50 @@ done:
 }
 
 static int decode_abs(struct x86_emulate_ctxt *ctxt,
-                     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) {
+       switch (ctxt->ad_bytes) {
        case 2:
-               op->addr.mem.ea = insn_fetch(u16, 2, c->eip);
+               op->addr.mem.ea = insn_fetch(u16, ctxt);
                break;
        case 4:
-               op->addr.mem.ea = insn_fetch(u32, 4, c->eip);
+               op->addr.mem.ea = insn_fetch(u32, ctxt);
                break;
        case 8:
-               op->addr.mem.ea = insn_fetch(u64, 8, c->eip);
+               op->addr.mem.ea = insn_fetch(u64, ctxt);
                break;
        }
 done:
        return rc;
 }
 
-static void fetch_bit_operand(struct decode_cache *c)
+static void fetch_bit_operand(struct x86_emulate_ctxt *ctxt)
 {
        long sv = 0, mask;
 
-       if (c->dst.type == OP_MEM && c->src.type == OP_REG) {
-               mask = ~(c->dst.bytes * 8 - 1);
+       if (ctxt->dst.type == OP_MEM && ctxt->src.type == OP_REG) {
+               mask = ~(ctxt->dst.bytes * 8 - 1);
 
-               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;
+               if (ctxt->src.bytes == 2)
+                       sv = (s16)ctxt->src.val & (s16)mask;
+               else if (ctxt->src.bytes == 4)
+                       sv = (s32)ctxt->src.val & (s32)mask;
 
-               c->dst.addr.mem.ea += (sv >> 3);
+               ctxt->dst.addr.mem.ea += (sv >> 3);
        }
 
        /* only subword offset */
-       c->src.val &= (c->dst.bytes << 3) - 1;
+       ctxt->src.val &= (ctxt->dst.bytes << 3) - 1;
 }
 
 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;
+       struct read_cache *mc = &ctxt->mem_read;
 
        while (size) {
                int n = min(size, 8u);
@@ -951,8 +1021,8 @@ static int read_emulated(struct x86_emulate_ctxt *ctxt,
                if (mc->pos < mc->end)
                        goto read_cached;
 
-               rc = ops->read_emulated(addr, mc->data + mc->end, n,
-                                       &ctxt->exception, ctxt->vcpu);
+               rc = ctxt->ops->read_emulated(ctxt, addr, mc->data + mc->end, n,
+                                             &ctxt->exception);
                if (rc != X86EMUL_CONTINUE)
                        return rc;
                mc->end += n;
@@ -977,7 +1047,7 @@ static int segmented_read(struct x86_emulate_ctxt *ctxt,
        rc = linearize(ctxt, addr, size, false, &linear);
        if (rc != X86EMUL_CONTINUE)
                return rc;
-       return read_emulated(ctxt, ctxt->ops, linear, data, size);
+       return read_emulated(ctxt, linear, data, size);
 }
 
 static int segmented_write(struct x86_emulate_ctxt *ctxt,
@@ -991,8 +1061,8 @@ static int segmented_write(struct x86_emulate_ctxt *ctxt,
        rc = linearize(ctxt, addr, size, true, &linear);
        if (rc != X86EMUL_CONTINUE)
                return rc;
-       return ctxt->ops->write_emulated(linear, data, size,
-                                        &ctxt->exception, ctxt->vcpu);
+       return ctxt->ops->write_emulated(ctxt, linear, data, size,
+                                        &ctxt->exception);
 }
 
 static int segmented_cmpxchg(struct x86_emulate_ctxt *ctxt,
@@ -1006,31 +1076,29 @@ static int segmented_cmpxchg(struct x86_emulate_ctxt *ctxt,
        rc = linearize(ctxt, addr, size, true, &linear);
        if (rc != X86EMUL_CONTINUE)
                return rc;
-       return ctxt->ops->cmpxchg_emulated(linear, orig_data, data,
-                                          size, &ctxt->exception, ctxt->vcpu);
+       return ctxt->ops->cmpxchg_emulated(ctxt, linear, orig_data, data,
+                                          size, &ctxt->exception);
 }
 
 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;
+       struct read_cache *rc = &ctxt->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;
+               unsigned int count = ctxt->rep_prefix ?
+                       address_mask(ctxt, ctxt->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]);
+                       offset_in_page(ctxt->regs[VCPU_REGS_RDI]) :
+                       PAGE_SIZE - offset_in_page(ctxt->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))
+               if (!ctxt->ops->pio_in_emulated(ctxt, size, port, rc->data, n))
                        return 0;
                rc->end = n * size;
        }
@@ -1040,76 +1108,63 @@ static int pio_in_emulated(struct x86_emulate_ctxt *ctxt,
        return 1;
 }
 
-static u32 desc_limit_scaled(struct desc_struct *desc)
-{
-       u32 limit = get_desc_limit(desc);
-
-       return desc->g ? (limit << 12) | 0xfff : limit;
-}
-
 static void get_descriptor_table_ptr(struct x86_emulate_ctxt *ctxt,
-                                    struct x86_emulate_ops *ops,
                                     u16 selector, struct desc_ptr *dt)
 {
+       struct x86_emulate_ops *ops = ctxt->ops;
+
        if (selector & 1 << 2) {
                struct desc_struct desc;
+               u16 sel;
+
                memset (dt, 0, sizeof *dt);
-               if (!ops->get_cached_descriptor(&desc, NULL, VCPU_SREG_LDTR,
-                                               ctxt->vcpu))
+               if (!ops->get_segment(ctxt, &sel, &desc, NULL, VCPU_SREG_LDTR))
                        return;
 
                dt->size = desc_limit_scaled(&desc); /* what if limit > 65535? */
                dt->address = get_desc_base(&desc);
        } else
-               ops->get_gdt(dt, ctxt->vcpu);
+               ops->get_gdt(ctxt, dt);
 }
 
 /* allowed just for 8 bytes segments */
 static int read_segment_descriptor(struct x86_emulate_ctxt *ctxt,
-                                  struct x86_emulate_ops *ops,
                                   u16 selector, struct desc_struct *desc)
 {
        struct desc_ptr dt;
        u16 index = selector >> 3;
-       int ret;
        ulong addr;
 
-       get_descriptor_table_ptr(ctxt, ops, selector, &dt);
+       get_descriptor_table_ptr(ctxt, selector, &dt);
 
        if (dt.size < index * 8 + 7)
                return emulate_gp(ctxt, selector & 0xfffc);
-       addr = dt.address + index * 8;
-       ret = ops->read_std(addr, desc, sizeof *desc, ctxt->vcpu,
-                           &ctxt->exception);
 
-       return ret;
+       addr = dt.address + index * 8;
+       return ctxt->ops->read_std(ctxt, addr, desc, sizeof *desc,
+                                  &ctxt->exception);
 }
 
 /* allowed just for 8 bytes segments */
 static int write_segment_descriptor(struct x86_emulate_ctxt *ctxt,
-                                   struct x86_emulate_ops *ops,
                                    u16 selector, struct desc_struct *desc)
 {
        struct desc_ptr dt;
        u16 index = selector >> 3;
        ulong addr;
-       int ret;
 
-       get_descriptor_table_ptr(ctxt, ops, selector, &dt);
+       get_descriptor_table_ptr(ctxt, selector, &dt);
 
        if (dt.size < index * 8 + 7)
                return emulate_gp(ctxt, selector & 0xfffc);
 
        addr = dt.address + index * 8;
-       ret = ops->write_std(addr, desc, sizeof *desc, ctxt->vcpu,
-                            &ctxt->exception);
-
-       return ret;
+       return ctxt->ops->write_std(ctxt, addr, desc, sizeof *desc,
+                                   &ctxt->exception);
 }
 
 /* Does not support long mode */
 static int load_segment_descriptor(struct x86_emulate_ctxt *ctxt,
-                                  struct x86_emulate_ops *ops,
                                   u16 selector, int seg)
 {
        struct desc_struct seg_desc;
@@ -1144,7 +1199,7 @@ static int load_segment_descriptor(struct x86_emulate_ctxt *ctxt,
        if (null_selector) /* for NULL selector skip all following checks */
                goto load;
 
-       ret = read_segment_descriptor(ctxt, ops, selector, &seg_desc);
+       ret = read_segment_descriptor(ctxt, selector, &seg_desc);
        if (ret != X86EMUL_CONTINUE)
                return ret;
 
@@ -1162,7 +1217,7 @@ static int load_segment_descriptor(struct x86_emulate_ctxt *ctxt,
 
        rpl = selector & 3;
        dpl = seg_desc.dpl;
-       cpl = ops->cpl(ctxt->vcpu);
+       cpl = ctxt->ops->cpl(ctxt);
 
        switch (seg) {
        case VCPU_SREG_SS:
@@ -1213,13 +1268,12 @@ static int load_segment_descriptor(struct x86_emulate_ctxt *ctxt,
        if (seg_desc.s) {
                /* mark segment as accessed */
                seg_desc.type |= 1;
-               ret = write_segment_descriptor(ctxt, ops, selector, &seg_desc);
+               ret = write_segment_descriptor(ctxt, selector, &seg_desc);
                if (ret != X86EMUL_CONTINUE)
                        return ret;
        }
 load:
-       ops->set_segment_selector(selector, seg, ctxt->vcpu);
-       ops->set_cached_descriptor(&seg_desc, 0, seg, ctxt->vcpu);
+       ctxt->ops->set_segment(ctxt, selector, &seg_desc, 0, seg);
        return X86EMUL_CONTINUE;
 exception:
        emulate_exception(ctxt, err_vec, err_code, true);
@@ -1245,33 +1299,31 @@ static void write_register_operand(struct operand *op)
        }
 }
 
-static inline int writeback(struct x86_emulate_ctxt *ctxt,
-                           struct x86_emulate_ops *ops)
+static int writeback(struct x86_emulate_ctxt *ctxt)
 {
        int rc;
-       struct decode_cache *c = &ctxt->decode;
 
-       switch (c->dst.type) {
+       switch (ctxt->dst.type) {
        case OP_REG:
-               write_register_operand(&c->dst);
+               write_register_operand(&ctxt->dst);
                break;
        case OP_MEM:
-               if (c->lock_prefix)
+               if (ctxt->lock_prefix)
                        rc = segmented_cmpxchg(ctxt,
-                                              c->dst.addr.mem,
-                                              &c->dst.orig_val,
-                                              &c->dst.val,
-                                              c->dst.bytes);
+                                              ctxt->dst.addr.mem,
+                                              &ctxt->dst.orig_val,
+                                              &ctxt->dst.val,
+                                              ctxt->dst.bytes);
                else
                        rc = segmented_write(ctxt,
-                                            c->dst.addr.mem,
-                                            &c->dst.val,
-                                            c->dst.bytes);
+                                            ctxt->dst.addr.mem,
+                                            &ctxt->dst.val,
+                                            ctxt->dst.bytes);
                if (rc != X86EMUL_CONTINUE)
                        return rc;
                break;
        case OP_XMM:
-               write_sse_reg(ctxt, &c->dst.vec_val, c->dst.addr.xmm);
+               write_sse_reg(ctxt, &ctxt->dst.vec_val, ctxt->dst.addr.xmm);
                break;
        case OP_NONE:
                /* no writeback */
@@ -1282,47 +1334,49 @@ static inline int writeback(struct x86_emulate_ctxt *ctxt,
        return X86EMUL_CONTINUE;
 }
 
-static inline void emulate_push(struct x86_emulate_ctxt *ctxt,
-                               struct x86_emulate_ops *ops)
+static int em_push(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
+       struct segmented_address addr;
+
+       register_address_increment(ctxt, &ctxt->regs[VCPU_REGS_RSP], -ctxt->op_bytes);
+       addr.ea = register_address(ctxt, ctxt->regs[VCPU_REGS_RSP]);
+       addr.seg = VCPU_SREG_SS;
 
-       c->dst.type  = OP_MEM;
-       c->dst.bytes = c->op_bytes;
-       c->dst.val = c->src.val;
-       register_address_increment(c, &c->regs[VCPU_REGS_RSP], -c->op_bytes);
-       c->dst.addr.mem.ea = register_address(c, c->regs[VCPU_REGS_RSP]);
-       c->dst.addr.mem.seg = VCPU_SREG_SS;
+       /* Disable writeback. */
+       ctxt->dst.type = OP_NONE;
+       return segmented_write(ctxt, addr, &ctxt->src.val, ctxt->op_bytes);
 }
 
 static int emulate_pop(struct x86_emulate_ctxt *ctxt,
-                      struct x86_emulate_ops *ops,
                       void *dest, int len)
 {
-       struct decode_cache *c = &ctxt->decode;
        int rc;
        struct segmented_address addr;
 
-       addr.ea = register_address(c, c->regs[VCPU_REGS_RSP]);
+       addr.ea = register_address(ctxt, ctxt->regs[VCPU_REGS_RSP]);
        addr.seg = VCPU_SREG_SS;
        rc = segmented_read(ctxt, addr, dest, len);
        if (rc != X86EMUL_CONTINUE)
                return rc;
 
-       register_address_increment(c, &c->regs[VCPU_REGS_RSP], len);
+       register_address_increment(ctxt, &ctxt->regs[VCPU_REGS_RSP], len);
        return rc;
 }
 
+static int em_pop(struct x86_emulate_ctxt *ctxt)
+{
+       return emulate_pop(ctxt, &ctxt->dst.val, ctxt->op_bytes);
+}
+
 static int emulate_popf(struct x86_emulate_ctxt *ctxt,
-                      struct x86_emulate_ops *ops,
-                      void *dest, int len)
+                       void *dest, int len)
 {
        int rc;
        unsigned long val, change_mask;
        int iopl = (ctxt->eflags & X86_EFLAGS_IOPL) >> IOPL_SHIFT;
-       int cpl = ops->cpl(ctxt->vcpu);
+       int cpl = ctxt->ops->cpl(ctxt);
 
-       rc = emulate_pop(ctxt, ops, &val, len);
+       rc = emulate_pop(ctxt, &val, len);
        if (rc != X86EMUL_CONTINUE)
                return rc;
 
@@ -1354,73 +1408,73 @@ static int emulate_popf(struct x86_emulate_ctxt *ctxt,
        return rc;
 }
 
-static void emulate_push_sreg(struct x86_emulate_ctxt *ctxt,
-                             struct x86_emulate_ops *ops, int seg)
+static int em_popf(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
+       ctxt->dst.type = OP_REG;
+       ctxt->dst.addr.reg = &ctxt->eflags;
+       ctxt->dst.bytes = ctxt->op_bytes;
+       return emulate_popf(ctxt, &ctxt->dst.val, ctxt->op_bytes);
+}
 
-       c->src.val = ops->get_segment_selector(seg, ctxt->vcpu);
+static int emulate_push_sreg(struct x86_emulate_ctxt *ctxt, int seg)
+{
+       ctxt->src.val = get_segment_selector(ctxt, seg);
 
-       emulate_push(ctxt, ops);
+       return em_push(ctxt);
 }
 
-static int emulate_pop_sreg(struct x86_emulate_ctxt *ctxt,
-                            struct x86_emulate_ops *ops, int seg)
+static int emulate_pop_sreg(struct x86_emulate_ctxt *ctxt, int seg)
 {
-       struct decode_cache *c = &ctxt->decode;
        unsigned long selector;
        int rc;
 
-       rc = emulate_pop(ctxt, ops, &selector, c->op_bytes);
+       rc = emulate_pop(ctxt, &selector, ctxt->op_bytes);
        if (rc != X86EMUL_CONTINUE)
                return rc;
 
-       rc = load_segment_descriptor(ctxt, ops, (u16)selector, seg);
+       rc = load_segment_descriptor(ctxt, (u16)selector, seg);
        return rc;
 }
 
-static int emulate_pusha(struct x86_emulate_ctxt *ctxt,
-                         struct x86_emulate_ops *ops)
+static int em_pusha(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
-       unsigned long old_esp = c->regs[VCPU_REGS_RSP];
+       unsigned long old_esp = ctxt->regs[VCPU_REGS_RSP];
        int rc = X86EMUL_CONTINUE;
        int reg = VCPU_REGS_RAX;
 
        while (reg <= VCPU_REGS_RDI) {
                (reg == VCPU_REGS_RSP) ?
-               (c->src.val = old_esp) : (c->src.val = c->regs[reg]);
-
-               emulate_push(ctxt, ops);
+               (ctxt->src.val = old_esp) : (ctxt->src.val = ctxt->regs[reg]);
 
-               rc = writeback(ctxt, ops);
+               rc = em_push(ctxt);
                if (rc != X86EMUL_CONTINUE)
                        return rc;
 
                ++reg;
        }
 
-       /* Disable writeback. */
-       c->dst.type = OP_NONE;
-
        return rc;
 }
 
-static int emulate_popa(struct x86_emulate_ctxt *ctxt,
-                       struct x86_emulate_ops *ops)
+static int em_pushf(struct x86_emulate_ctxt *ctxt)
+{
+       ctxt->src.val =  (unsigned long)ctxt->eflags;
+       return em_push(ctxt);
+}
+
+static int em_popa(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
        int rc = X86EMUL_CONTINUE;
        int reg = VCPU_REGS_RDI;
 
        while (reg >= VCPU_REGS_RAX) {
                if (reg == VCPU_REGS_RSP) {
-                       register_address_increment(c, &c->regs[VCPU_REGS_RSP],
-                                                       c->op_bytes);
+                       register_address_increment(ctxt, &ctxt->regs[VCPU_REGS_RSP],
+                                                       ctxt->op_bytes);
                        --reg;
                }
 
-               rc = emulate_pop(ctxt, ops, &c->regs[reg], c->op_bytes);
+               rc = emulate_pop(ctxt, &ctxt->regs[reg], ctxt->op_bytes);
                if (rc != X86EMUL_CONTINUE)
                        break;
                --reg;
@@ -1428,10 +1482,9 @@ static int emulate_popa(struct x86_emulate_ctxt *ctxt,
        return rc;
 }
 
-int emulate_int_real(struct x86_emulate_ctxt *ctxt,
-                              struct x86_emulate_ops *ops, int irq)
+int emulate_int_real(struct x86_emulate_ctxt *ctxt, int irq)
 {
-       struct decode_cache *c = &ctxt->decode;
+       struct x86_emulate_ops *ops = ctxt->ops;
        int rc;
        struct desc_ptr dt;
        gva_t cs_addr;
@@ -1439,56 +1492,50 @@ int emulate_int_real(struct x86_emulate_ctxt *ctxt,
        u16 cs, eip;
 
        /* TODO: Add limit checks */
-       c->src.val = ctxt->eflags;
-       emulate_push(ctxt, ops);
-       rc = writeback(ctxt, ops);
+       ctxt->src.val = ctxt->eflags;
+       rc = em_push(ctxt);
        if (rc != X86EMUL_CONTINUE)
                return rc;
 
        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);
+       ctxt->src.val = get_segment_selector(ctxt, VCPU_SREG_CS);
+       rc = em_push(ctxt);
        if (rc != X86EMUL_CONTINUE)
                return rc;
 
-       c->src.val = c->eip;
-       emulate_push(ctxt, ops);
-       rc = writeback(ctxt, ops);
+       ctxt->src.val = ctxt->_eip;
+       rc = em_push(ctxt);
        if (rc != X86EMUL_CONTINUE)
                return rc;
 
-       c->dst.type = OP_NONE;
-
-       ops->get_idt(&dt, ctxt->vcpu);
+       ops->get_idt(ctxt, &dt);
 
        eip_addr = dt.address + (irq << 2);
        cs_addr = dt.address + (irq << 2) + 2;
 
-       rc = ops->read_std(cs_addr, &cs, 2, ctxt->vcpu, &ctxt->exception);
+       rc = ops->read_std(ctxt, cs_addr, &cs, 2, &ctxt->exception);
        if (rc != X86EMUL_CONTINUE)
                return rc;
 
-       rc = ops->read_std(eip_addr, &eip, 2, ctxt->vcpu, &ctxt->exception);
+       rc = ops->read_std(ctxt, eip_addr, &eip, 2, &ctxt->exception);
        if (rc != X86EMUL_CONTINUE)
                return rc;
 
-       rc = load_segment_descriptor(ctxt, ops, cs, VCPU_SREG_CS);
+       rc = load_segment_descriptor(ctxt, cs, VCPU_SREG_CS);
        if (rc != X86EMUL_CONTINUE)
                return rc;
 
-       c->eip = eip;
+       ctxt->_eip = eip;
 
        return rc;
 }
 
-static int emulate_int(struct x86_emulate_ctxt *ctxt,
-                      struct x86_emulate_ops *ops, int irq)
+static int emulate_int(struct x86_emulate_ctxt *ctxt, int irq)
 {
        switch(ctxt->mode) {
        case X86EMUL_MODE_REAL:
-               return emulate_int_real(ctxt, ops, irq);
+               return emulate_int_real(ctxt, irq);
        case X86EMUL_MODE_VM86:
        case X86EMUL_MODE_PROT16:
        case X86EMUL_MODE_PROT32:
@@ -1499,10 +1546,8 @@ static int emulate_int(struct x86_emulate_ctxt *ctxt,
        }
 }
 
-static int emulate_iret_real(struct x86_emulate_ctxt *ctxt,
-                            struct x86_emulate_ops *ops)
+static int emulate_iret_real(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
        int rc = X86EMUL_CONTINUE;
        unsigned long temp_eip = 0;
        unsigned long temp_eflags = 0;
@@ -1514,7 +1559,7 @@ static int emulate_iret_real(struct x86_emulate_ctxt *ctxt,
 
        /* TODO: Add stack limit check */
 
-       rc = emulate_pop(ctxt, ops, &temp_eip, c->op_bytes);
+       rc = emulate_pop(ctxt, &temp_eip, ctxt->op_bytes);
 
        if (rc != X86EMUL_CONTINUE)
                return rc;
@@ -1522,27 +1567,27 @@ static int emulate_iret_real(struct x86_emulate_ctxt *ctxt,
        if (temp_eip & ~0xffff)
                return emulate_gp(ctxt, 0);
 
-       rc = emulate_pop(ctxt, ops, &cs, c->op_bytes);
+       rc = emulate_pop(ctxt, &cs, ctxt->op_bytes);
 
        if (rc != X86EMUL_CONTINUE)
                return rc;
 
-       rc = emulate_pop(ctxt, ops, &temp_eflags, c->op_bytes);
+       rc = emulate_pop(ctxt, &temp_eflags, ctxt->op_bytes);
 
        if (rc != X86EMUL_CONTINUE)
                return rc;
 
-       rc = load_segment_descriptor(ctxt, ops, (u16)cs, VCPU_SREG_CS);
+       rc = load_segment_descriptor(ctxt, (u16)cs, VCPU_SREG_CS);
 
        if (rc != X86EMUL_CONTINUE)
                return rc;
 
-       c->eip = temp_eip;
+       ctxt->_eip = temp_eip;
 
 
-       if (c->op_bytes == 4)
+       if (ctxt->op_bytes == 4)
                ctxt->eflags = ((temp_eflags & mask) | (ctxt->eflags & vm86_mask));
-       else if (c->op_bytes == 2) {
+       else if (ctxt->op_bytes == 2) {
                ctxt->eflags &= ~0xffff;
                ctxt->eflags |= temp_eflags;
        }
@@ -1553,12 +1598,11 @@ static int emulate_iret_real(struct x86_emulate_ctxt *ctxt,
        return rc;
 }
 
-static inline int emulate_iret(struct x86_emulate_ctxt *ctxt,
-                                   struct x86_emulate_ops* ops)
+static int em_iret(struct x86_emulate_ctxt *ctxt)
 {
        switch(ctxt->mode) {
        case X86EMUL_MODE_REAL:
-               return emulate_iret_real(ctxt, ops);
+               return emulate_iret_real(ctxt);
        case X86EMUL_MODE_VM86:
        case X86EMUL_MODE_PROT16:
        case X86EMUL_MODE_PROT32:
@@ -1569,74 +1613,81 @@ static inline int emulate_iret(struct x86_emulate_ctxt *ctxt,
        }
 }
 
-static inline int emulate_grp1a(struct x86_emulate_ctxt *ctxt,
-                               struct x86_emulate_ops *ops)
+static int em_jmp_far(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
+       int rc;
+       unsigned short sel;
+
+       memcpy(&sel, ctxt->src.valptr + ctxt->op_bytes, 2);
 
-       return emulate_pop(ctxt, ops, &c->dst.val, c->dst.bytes);
+       rc = load_segment_descriptor(ctxt, sel, VCPU_SREG_CS);
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
+
+       ctxt->_eip = 0;
+       memcpy(&ctxt->_eip, ctxt->src.valptr, ctxt->op_bytes);
+       return X86EMUL_CONTINUE;
 }
 
-static inline void emulate_grp2(struct x86_emulate_ctxt *ctxt)
+static int em_grp1a(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
-       switch (c->modrm_reg) {
+       return emulate_pop(ctxt, &ctxt->dst.val, ctxt->dst.bytes);
+}
+
+static int em_grp2(struct x86_emulate_ctxt *ctxt)
+{
+       switch (ctxt->modrm_reg) {
        case 0: /* rol */
-               emulate_2op_SrcB("rol", c->src, c->dst, ctxt->eflags);
+               emulate_2op_SrcB(ctxt, "rol");
                break;
        case 1: /* ror */
-               emulate_2op_SrcB("ror", c->src, c->dst, ctxt->eflags);
+               emulate_2op_SrcB(ctxt, "ror");
                break;
        case 2: /* rcl */
-               emulate_2op_SrcB("rcl", c->src, c->dst, ctxt->eflags);
+               emulate_2op_SrcB(ctxt, "rcl");
                break;
        case 3: /* rcr */
-               emulate_2op_SrcB("rcr", c->src, c->dst, ctxt->eflags);
+               emulate_2op_SrcB(ctxt, "rcr");
                break;
        case 4: /* sal/shl */
        case 6: /* sal/shl */
-               emulate_2op_SrcB("sal", c->src, c->dst, ctxt->eflags);
+               emulate_2op_SrcB(ctxt, "sal");
                break;
        case 5: /* shr */
-               emulate_2op_SrcB("shr", c->src, c->dst, ctxt->eflags);
+               emulate_2op_SrcB(ctxt, "shr");
                break;
        case 7: /* sar */
-               emulate_2op_SrcB("sar", c->src, c->dst, ctxt->eflags);
+               emulate_2op_SrcB(ctxt, "sar");
                break;
        }
+       return X86EMUL_CONTINUE;
 }
 
-static inline int emulate_grp3(struct x86_emulate_ctxt *ctxt,
-                              struct x86_emulate_ops *ops)
+static int em_grp3(struct x86_emulate_ctxt *ctxt)
 {
-       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) {
+       switch (ctxt->modrm_reg) {
        case 0 ... 1:   /* test */
-               emulate_2op_SrcV("test", c->src, c->dst, ctxt->eflags);
+               emulate_2op_SrcV(ctxt, "test");
                break;
        case 2: /* not */
-               c->dst.val = ~c->dst.val;
+               ctxt->dst.val = ~ctxt->dst.val;
                break;
        case 3: /* neg */
-               emulate_1op("neg", c->dst, ctxt->eflags);
+               emulate_1op(ctxt, "neg");
                break;
        case 4: /* mul */
-               emulate_1op_rax_rdx("mul", c->src, *rax, *rdx, ctxt->eflags);
+               emulate_1op_rax_rdx(ctxt, "mul", de);
                break;
        case 5: /* imul */
-               emulate_1op_rax_rdx("imul", c->src, *rax, *rdx, ctxt->eflags);
+               emulate_1op_rax_rdx(ctxt, "imul", de);
                break;
        case 6: /* div */
-               emulate_1op_rax_rdx_ex("div", c->src, *rax, *rdx,
-                                      ctxt->eflags, de);
+               emulate_1op_rax_rdx(ctxt, "div", de);
                break;
        case 7: /* idiv */
-               emulate_1op_rax_rdx_ex("idiv", c->src, *rax, *rdx,
-                                      ctxt->eflags, de);
+               emulate_1op_rax_rdx(ctxt, "idiv", de);
                break;
        default:
                return X86EMUL_UNHANDLEABLE;
@@ -1646,99 +1697,104 @@ static inline int emulate_grp3(struct x86_emulate_ctxt *ctxt,
        return X86EMUL_CONTINUE;
 }
 
-static inline int emulate_grp45(struct x86_emulate_ctxt *ctxt,
-                              struct x86_emulate_ops *ops)
+static int em_grp45(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
+       int rc = X86EMUL_CONTINUE;
 
-       switch (c->modrm_reg) {
+       switch (ctxt->modrm_reg) {
        case 0: /* inc */
-               emulate_1op("inc", c->dst, ctxt->eflags);
+               emulate_1op(ctxt, "inc");
                break;
        case 1: /* dec */
-               emulate_1op("dec", c->dst, ctxt->eflags);
+               emulate_1op(ctxt, "dec");
                break;
        case 2: /* call near abs */ {
                long int old_eip;
-               old_eip = c->eip;
-               c->eip = c->src.val;
-               c->src.val = old_eip;
-               emulate_push(ctxt, ops);
+               old_eip = ctxt->_eip;
+               ctxt->_eip = ctxt->src.val;
+               ctxt->src.val = old_eip;
+               rc = em_push(ctxt);
                break;
        }
        case 4: /* jmp abs */
-               c->eip = c->src.val;
+               ctxt->_eip = ctxt->src.val;
+               break;
+       case 5: /* jmp far */
+               rc = em_jmp_far(ctxt);
                break;
        case 6: /* push */
-               emulate_push(ctxt, ops);
+               rc = em_push(ctxt);
                break;
        }
-       return X86EMUL_CONTINUE;
+       return rc;
 }
 
-static inline int emulate_grp9(struct x86_emulate_ctxt *ctxt,
-                              struct x86_emulate_ops *ops)
+static int em_grp9(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
-       u64 old = c->dst.orig_val64;
+       u64 old = ctxt->dst.orig_val64;
 
-       if (((u32) (old >> 0) != (u32) c->regs[VCPU_REGS_RAX]) ||
-           ((u32) (old >> 32) != (u32) c->regs[VCPU_REGS_RDX])) {
-               c->regs[VCPU_REGS_RAX] = (u32) (old >> 0);
-               c->regs[VCPU_REGS_RDX] = (u32) (old >> 32);
+       if (((u32) (old >> 0) != (u32) ctxt->regs[VCPU_REGS_RAX]) ||
+           ((u32) (old >> 32) != (u32) ctxt->regs[VCPU_REGS_RDX])) {
+               ctxt->regs[VCPU_REGS_RAX] = (u32) (old >> 0);
+               ctxt->regs[VCPU_REGS_RDX] = (u32) (old >> 32);
                ctxt->eflags &= ~EFLG_ZF;
        } else {
-               c->dst.val64 = ((u64)c->regs[VCPU_REGS_RCX] << 32) |
-                       (u32) c->regs[VCPU_REGS_RBX];
+               ctxt->dst.val64 = ((u64)ctxt->regs[VCPU_REGS_RCX] << 32) |
+                       (u32) ctxt->regs[VCPU_REGS_RBX];
 
                ctxt->eflags |= EFLG_ZF;
        }
        return X86EMUL_CONTINUE;
 }
 
-static int emulate_ret_far(struct x86_emulate_ctxt *ctxt,
-                          struct x86_emulate_ops *ops)
+static int em_ret(struct x86_emulate_ctxt *ctxt)
+{
+       ctxt->dst.type = OP_REG;
+       ctxt->dst.addr.reg = &ctxt->_eip;
+       ctxt->dst.bytes = ctxt->op_bytes;
+       return em_pop(ctxt);
+}
+
+static int em_ret_far(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
        int rc;
        unsigned long cs;
 
-       rc = emulate_pop(ctxt, ops, &c->eip, c->op_bytes);
+       rc = emulate_pop(ctxt, &ctxt->_eip, ctxt->op_bytes);
        if (rc != X86EMUL_CONTINUE)
                return rc;
-       if (c->op_bytes == 4)
-               c->eip = (u32)c->eip;
-       rc = emulate_pop(ctxt, ops, &cs, c->op_bytes);
+       if (ctxt->op_bytes == 4)
+               ctxt->_eip = (u32)ctxt->_eip;
+       rc = emulate_pop(ctxt, &cs, ctxt->op_bytes);
        if (rc != X86EMUL_CONTINUE)
                return rc;
-       rc = load_segment_descriptor(ctxt, ops, (u16)cs, VCPU_SREG_CS);
+       rc = load_segment_descriptor(ctxt, (u16)cs, VCPU_SREG_CS);
        return rc;
 }
 
-static int emulate_load_segment(struct x86_emulate_ctxt *ctxt,
-                          struct x86_emulate_ops *ops, int seg)
+static int emulate_load_segment(struct x86_emulate_ctxt *ctxt, int seg)
 {
-       struct decode_cache *c = &ctxt->decode;
        unsigned short sel;
        int rc;
 
-       memcpy(&sel, c->src.valptr + c->op_bytes, 2);
+       memcpy(&sel, ctxt->src.valptr + ctxt->op_bytes, 2);
 
-       rc = load_segment_descriptor(ctxt, ops, sel, seg);
+       rc = load_segment_descriptor(ctxt, sel, seg);
        if (rc != X86EMUL_CONTINUE)
                return rc;
 
-       c->dst.val = c->src.val;
+       ctxt->dst.val = ctxt->src.val;
        return rc;
 }
 
-static inline void
+static void
 setup_syscalls_segments(struct x86_emulate_ctxt *ctxt,
-                       struct x86_emulate_ops *ops, struct desc_struct *cs,
-                       struct desc_struct *ss)
+                       struct desc_struct *cs, struct desc_struct *ss)
 {
+       u16 selector;
+
        memset(cs, 0, sizeof(struct desc_struct));
-       ops->get_cached_descriptor(cs, NULL, VCPU_SREG_CS, ctxt->vcpu);
+       ctxt->ops->get_segment(ctxt, &selector, cs, NULL, VCPU_SREG_CS);
        memset(ss, 0, sizeof(struct desc_struct));
 
        cs->l = 0;              /* will be adjusted later */
@@ -1761,52 +1817,51 @@ setup_syscalls_segments(struct x86_emulate_ctxt *ctxt,
        ss->p = 1;
 }
 
-static int
-emulate_syscall(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
+static int em_syscall(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
+       struct x86_emulate_ops *ops = ctxt->ops;
        struct desc_struct cs, ss;
        u64 msr_data;
        u16 cs_sel, ss_sel;
+       u64 efer = 0;
 
        /* syscall is not available in real mode */
        if (ctxt->mode == X86EMUL_MODE_REAL ||
            ctxt->mode == X86EMUL_MODE_VM86)
                return emulate_ud(ctxt);
 
-       setup_syscalls_segments(ctxt, ops, &cs, &ss);
+       ops->get_msr(ctxt, MSR_EFER, &efer);
+       setup_syscalls_segments(ctxt, &cs, &ss);
 
-       ops->get_msr(ctxt->vcpu, MSR_STAR, &msr_data);
+       ops->get_msr(ctxt, MSR_STAR, &msr_data);
        msr_data >>= 32;
        cs_sel = (u16)(msr_data & 0xfffc);
        ss_sel = (u16)(msr_data + 8);
 
-       if (is_long_mode(ctxt->vcpu)) {
+       if (efer & EFER_LMA) {
                cs.d = 0;
                cs.l = 1;
        }
-       ops->set_cached_descriptor(&cs, 0, VCPU_SREG_CS, ctxt->vcpu);
-       ops->set_segment_selector(cs_sel, VCPU_SREG_CS, ctxt->vcpu);
-       ops->set_cached_descriptor(&ss, 0, VCPU_SREG_SS, ctxt->vcpu);
-       ops->set_segment_selector(ss_sel, VCPU_SREG_SS, ctxt->vcpu);
+       ops->set_segment(ctxt, cs_sel, &cs, 0, VCPU_SREG_CS);
+       ops->set_segment(ctxt, ss_sel, &ss, 0, VCPU_SREG_SS);
 
-       c->regs[VCPU_REGS_RCX] = c->eip;
-       if (is_long_mode(ctxt->vcpu)) {
+       ctxt->regs[VCPU_REGS_RCX] = ctxt->_eip;
+       if (efer & EFER_LMA) {
 #ifdef CONFIG_X86_64
-               c->regs[VCPU_REGS_R11] = ctxt->eflags & ~EFLG_RF;
+               ctxt->regs[VCPU_REGS_R11] = ctxt->eflags & ~EFLG_RF;
 
-               ops->get_msr(ctxt->vcpu,
+               ops->get_msr(ctxt,
                             ctxt->mode == X86EMUL_MODE_PROT64 ?
                             MSR_LSTAR : MSR_CSTAR, &msr_data);
-               c->eip = msr_data;
+               ctxt->_eip = msr_data;
 
-               ops->get_msr(ctxt->vcpu, MSR_SYSCALL_MASK, &msr_data);
+               ops->get_msr(ctxt, MSR_SYSCALL_MASK, &msr_data);
                ctxt->eflags &= ~(msr_data | EFLG_RF);
 #endif
        } else {
                /* legacy mode */
-               ops->get_msr(ctxt->vcpu, MSR_STAR, &msr_data);
-               c->eip = (u32)msr_data;
+               ops->get_msr(ctxt, MSR_STAR, &msr_data);
+               ctxt->_eip = (u32)msr_data;
 
                ctxt->eflags &= ~(EFLG_VM | EFLG_IF | EFLG_RF);
        }
@@ -1814,14 +1869,15 @@ emulate_syscall(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
        return X86EMUL_CONTINUE;
 }
 
-static int
-emulate_sysenter(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
+static int em_sysenter(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
+       struct x86_emulate_ops *ops = ctxt->ops;
        struct desc_struct cs, ss;
        u64 msr_data;
        u16 cs_sel, ss_sel;
+       u64 efer = 0;
 
+       ops->get_msr(ctxt, MSR_EFER, &efer);
        /* inject #GP if in real mode */
        if (ctxt->mode == X86EMUL_MODE_REAL)
                return emulate_gp(ctxt, 0);
@@ -1832,9 +1888,9 @@ emulate_sysenter(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
        if (ctxt->mode == X86EMUL_MODE_PROT64)
                return emulate_ud(ctxt);
 
-       setup_syscalls_segments(ctxt, ops, &cs, &ss);
+       setup_syscalls_segments(ctxt, &cs, &ss);
 
-       ops->get_msr(ctxt->vcpu, MSR_IA32_SYSENTER_CS, &msr_data);
+       ops->get_msr(ctxt, MSR_IA32_SYSENTER_CS, &msr_data);
        switch (ctxt->mode) {
        case X86EMUL_MODE_PROT32:
                if ((msr_data & 0xfffc) == 0x0)
@@ -1851,50 +1907,46 @@ emulate_sysenter(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
        cs_sel &= ~SELECTOR_RPL_MASK;
        ss_sel = cs_sel + 8;
        ss_sel &= ~SELECTOR_RPL_MASK;
-       if (ctxt->mode == X86EMUL_MODE_PROT64
-               || is_long_mode(ctxt->vcpu)) {
+       if (ctxt->mode == X86EMUL_MODE_PROT64 || (efer & EFER_LMA)) {
                cs.d = 0;
                cs.l = 1;
        }
 
-       ops->set_cached_descriptor(&cs, 0, VCPU_SREG_CS, ctxt->vcpu);
-       ops->set_segment_selector(cs_sel, VCPU_SREG_CS, ctxt->vcpu);
-       ops->set_cached_descriptor(&ss, 0, VCPU_SREG_SS, ctxt->vcpu);
-       ops->set_segment_selector(ss_sel, VCPU_SREG_SS, ctxt->vcpu);
+       ops->set_segment(ctxt, cs_sel, &cs, 0, VCPU_SREG_CS);
+       ops->set_segment(ctxt, ss_sel, &ss, 0, VCPU_SREG_SS);
 
-       ops->get_msr(ctxt->vcpu, MSR_IA32_SYSENTER_EIP, &msr_data);
-       c->eip = msr_data;
+       ops->get_msr(ctxt, MSR_IA32_SYSENTER_EIP, &msr_data);
+       ctxt->_eip = msr_data;
 
-       ops->get_msr(ctxt->vcpu, MSR_IA32_SYSENTER_ESP, &msr_data);
-       c->regs[VCPU_REGS_RSP] = msr_data;
+       ops->get_msr(ctxt, MSR_IA32_SYSENTER_ESP, &msr_data);
+       ctxt->regs[VCPU_REGS_RSP] = msr_data;
 
        return X86EMUL_CONTINUE;
 }
 
-static int
-emulate_sysexit(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
+static int em_sysexit(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
+       struct x86_emulate_ops *ops = ctxt->ops;
        struct desc_struct cs, ss;
        u64 msr_data;
        int usermode;
-       u16 cs_sel, ss_sel;
+       u16 cs_sel = 0, ss_sel = 0;
 
        /* inject #GP if in real mode or Virtual 8086 mode */
        if (ctxt->mode == X86EMUL_MODE_REAL ||
            ctxt->mode == X86EMUL_MODE_VM86)
                return emulate_gp(ctxt, 0);
 
-       setup_syscalls_segments(ctxt, ops, &cs, &ss);
+       setup_syscalls_segments(ctxt, &cs, &ss);
 
-       if ((c->rex_prefix & 0x8) != 0x0)
+       if ((ctxt->rex_prefix & 0x8) != 0x0)
                usermode = X86EMUL_MODE_PROT64;
        else
                usermode = X86EMUL_MODE_PROT32;
 
        cs.dpl = 3;
        ss.dpl = 3;
-       ops->get_msr(ctxt->vcpu, MSR_IA32_SYSENTER_CS, &msr_data);
+       ops->get_msr(ctxt, MSR_IA32_SYSENTER_CS, &msr_data);
        switch (usermode) {
        case X86EMUL_MODE_PROT32:
                cs_sel = (u16)(msr_data + 16);
@@ -1914,19 +1966,16 @@ emulate_sysexit(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
        cs_sel |= SELECTOR_RPL_MASK;
        ss_sel |= SELECTOR_RPL_MASK;
 
-       ops->set_cached_descriptor(&cs, 0, VCPU_SREG_CS, ctxt->vcpu);
-       ops->set_segment_selector(cs_sel, VCPU_SREG_CS, ctxt->vcpu);
-       ops->set_cached_descriptor(&ss, 0, VCPU_SREG_SS, ctxt->vcpu);
-       ops->set_segment_selector(ss_sel, VCPU_SREG_SS, ctxt->vcpu);
+       ops->set_segment(ctxt, cs_sel, &cs, 0, VCPU_SREG_CS);
+       ops->set_segment(ctxt, ss_sel, &ss, 0, VCPU_SREG_SS);
 
-       c->eip = c->regs[VCPU_REGS_RDX];
-       c->regs[VCPU_REGS_RSP] = c->regs[VCPU_REGS_RCX];
+       ctxt->_eip = ctxt->regs[VCPU_REGS_RDX];
+       ctxt->regs[VCPU_REGS_RSP] = ctxt->regs[VCPU_REGS_RCX];
 
        return X86EMUL_CONTINUE;
 }
 
-static bool emulator_bad_iopl(struct x86_emulate_ctxt *ctxt,
-                             struct x86_emulate_ops *ops)
+static bool emulator_bad_iopl(struct x86_emulate_ctxt *ctxt)
 {
        int iopl;
        if (ctxt->mode == X86EMUL_MODE_REAL)
@@ -1934,21 +1983,21 @@ static bool emulator_bad_iopl(struct x86_emulate_ctxt *ctxt,
        if (ctxt->mode == X86EMUL_MODE_VM86)
                return true;
        iopl = (ctxt->eflags & X86_EFLAGS_IOPL) >> IOPL_SHIFT;
-       return ops->cpl(ctxt->vcpu) > iopl;
+       return ctxt->ops->cpl(ctxt) > iopl;
 }
 
 static bool emulator_io_port_access_allowed(struct x86_emulate_ctxt *ctxt,
-                                           struct x86_emulate_ops *ops,
                                            u16 port, u16 len)
 {
+       struct x86_emulate_ops *ops = ctxt->ops;
        struct desc_struct tr_seg;
        u32 base3;
        int r;
-       u16 io_bitmap_ptr, perm, bit_idx = port & 0x7;
+       u16 tr, io_bitmap_ptr, perm, bit_idx = port & 0x7;
        unsigned mask = (1 << len) - 1;
        unsigned long base;
 
-       ops->get_cached_descriptor(&tr_seg, &base3, VCPU_SREG_TR, ctxt->vcpu);
+       ops->get_segment(ctxt, &tr, &tr_seg, &base3, VCPU_SREG_TR);
        if (!tr_seg.p)
                return false;
        if (desc_limit_scaled(&tr_seg) < 103)
@@ -1957,13 +2006,12 @@ static bool emulator_io_port_access_allowed(struct x86_emulate_ctxt *ctxt,
 #ifdef CONFIG_X86_64
        base |= ((u64)base3) << 32;
 #endif
-       r = ops->read_std(base + 102, &io_bitmap_ptr, 2, ctxt->vcpu, NULL);
+       r = ops->read_std(ctxt, base + 102, &io_bitmap_ptr, 2, NULL);
        if (r != X86EMUL_CONTINUE)
                return false;
        if (io_bitmap_ptr + port/8 > desc_limit_scaled(&tr_seg))
                return false;
-       r = ops->read_std(base + io_bitmap_ptr + port/8, &perm, 2, ctxt->vcpu,
-                         NULL);
+       r = ops->read_std(ctxt, base + io_bitmap_ptr + port/8, &perm, 2, NULL);
        if (r != X86EMUL_CONTINUE)
                return false;
        if ((perm >> bit_idx) & mask)
@@ -1972,14 +2020,13 @@ static bool emulator_io_port_access_allowed(struct x86_emulate_ctxt *ctxt,
 }
 
 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))
+       if (emulator_bad_iopl(ctxt))
+               if (!emulator_io_port_access_allowed(ctxt, port, len))
                        return false;
 
        ctxt->perm_ok = true;
@@ -1988,74 +2035,69 @@ static bool emulator_io_permited(struct x86_emulate_ctxt *ctxt,
 }
 
 static void save_state_to_tss16(struct x86_emulate_ctxt *ctxt,
-                               struct x86_emulate_ops *ops,
                                struct tss_segment_16 *tss)
 {
-       struct decode_cache *c = &ctxt->decode;
-
-       tss->ip = c->eip;
+       tss->ip = ctxt->_eip;
        tss->flag = ctxt->eflags;
-       tss->ax = c->regs[VCPU_REGS_RAX];
-       tss->cx = c->regs[VCPU_REGS_RCX];
-       tss->dx = c->regs[VCPU_REGS_RDX];
-       tss->bx = c->regs[VCPU_REGS_RBX];
-       tss->sp = c->regs[VCPU_REGS_RSP];
-       tss->bp = c->regs[VCPU_REGS_RBP];
-       tss->si = c->regs[VCPU_REGS_RSI];
-       tss->di = c->regs[VCPU_REGS_RDI];
-
-       tss->es = ops->get_segment_selector(VCPU_SREG_ES, ctxt->vcpu);
-       tss->cs = ops->get_segment_selector(VCPU_SREG_CS, ctxt->vcpu);
-       tss->ss = ops->get_segment_selector(VCPU_SREG_SS, ctxt->vcpu);
-       tss->ds = ops->get_segment_selector(VCPU_SREG_DS, ctxt->vcpu);
-       tss->ldt = ops->get_segment_selector(VCPU_SREG_LDTR, ctxt->vcpu);
+       tss->ax = ctxt->regs[VCPU_REGS_RAX];
+       tss->cx = ctxt->regs[VCPU_REGS_RCX];
+       tss->dx = ctxt->regs[VCPU_REGS_RDX];
+       tss->bx = ctxt->regs[VCPU_REGS_RBX];
+       tss->sp = ctxt->regs[VCPU_REGS_RSP];
+       tss->bp = ctxt->regs[VCPU_REGS_RBP];
+       tss->si = ctxt->regs[VCPU_REGS_RSI];
+       tss->di = ctxt->regs[VCPU_REGS_RDI];
+
+       tss->es = get_segment_selector(ctxt, VCPU_SREG_ES);
+       tss->cs = get_segment_selector(ctxt, VCPU_SREG_CS);
+       tss->ss = get_segment_selector(ctxt, VCPU_SREG_SS);
+       tss->ds = get_segment_selector(ctxt, VCPU_SREG_DS);
+       tss->ldt = get_segment_selector(ctxt, VCPU_SREG_LDTR);
 }
 
 static int load_state_from_tss16(struct x86_emulate_ctxt *ctxt,
-                                struct x86_emulate_ops *ops,
                                 struct tss_segment_16 *tss)
 {
-       struct decode_cache *c = &ctxt->decode;
        int ret;
 
-       c->eip = tss->ip;
+       ctxt->_eip = tss->ip;
        ctxt->eflags = tss->flag | 2;
-       c->regs[VCPU_REGS_RAX] = tss->ax;
-       c->regs[VCPU_REGS_RCX] = tss->cx;
-       c->regs[VCPU_REGS_RDX] = tss->dx;
-       c->regs[VCPU_REGS_RBX] = tss->bx;
-       c->regs[VCPU_REGS_RSP] = tss->sp;
-       c->regs[VCPU_REGS_RBP] = tss->bp;
-       c->regs[VCPU_REGS_RSI] = tss->si;
-       c->regs[VCPU_REGS_RDI] = tss->di;
+       ctxt->regs[VCPU_REGS_RAX] = tss->ax;
+       ctxt->regs[VCPU_REGS_RCX] = tss->cx;
+       ctxt->regs[VCPU_REGS_RDX] = tss->dx;
+       ctxt->regs[VCPU_REGS_RBX] = tss->bx;
+       ctxt->regs[VCPU_REGS_RSP] = tss->sp;
+       ctxt->regs[VCPU_REGS_RBP] = tss->bp;
+       ctxt->regs[VCPU_REGS_RSI] = tss->si;
+       ctxt->regs[VCPU_REGS_RDI] = tss->di;
 
        /*
         * SDM says that segment selectors are loaded before segment
         * descriptors
         */
-       ops->set_segment_selector(tss->ldt, VCPU_SREG_LDTR, ctxt->vcpu);
-       ops->set_segment_selector(tss->es, VCPU_SREG_ES, ctxt->vcpu);
-       ops->set_segment_selector(tss->cs, VCPU_SREG_CS, ctxt->vcpu);
-       ops->set_segment_selector(tss->ss, VCPU_SREG_SS, ctxt->vcpu);
-       ops->set_segment_selector(tss->ds, VCPU_SREG_DS, ctxt->vcpu);
+       set_segment_selector(ctxt, tss->ldt, VCPU_SREG_LDTR);
+       set_segment_selector(ctxt, tss->es, VCPU_SREG_ES);
+       set_segment_selector(ctxt, tss->cs, VCPU_SREG_CS);
+       set_segment_selector(ctxt, tss->ss, VCPU_SREG_SS);
+       set_segment_selector(ctxt, tss->ds, VCPU_SREG_DS);
 
        /*
         * Now load segment descriptors. If fault happenes at this stage
         * it is handled in a context of new task
         */
-       ret = load_segment_descriptor(ctxt, ops, tss->ldt, VCPU_SREG_LDTR);
+       ret = load_segment_descriptor(ctxt, tss->ldt, VCPU_SREG_LDTR);
        if (ret != X86EMUL_CONTINUE)
                return ret;
-       ret = load_segment_descriptor(ctxt, ops, tss->es, VCPU_SREG_ES);
+       ret = load_segment_descriptor(ctxt, tss->es, VCPU_SREG_ES);
        if (ret != X86EMUL_CONTINUE)
                return ret;
-       ret = load_segment_descriptor(ctxt, ops, tss->cs, VCPU_SREG_CS);
+       ret = load_segment_descriptor(ctxt, tss->cs, VCPU_SREG_CS);
        if (ret != X86EMUL_CONTINUE)
                return ret;
-       ret = load_segment_descriptor(ctxt, ops, tss->ss, VCPU_SREG_SS);
+       ret = load_segment_descriptor(ctxt, tss->ss, VCPU_SREG_SS);
        if (ret != X86EMUL_CONTINUE)
                return ret;
-       ret = load_segment_descriptor(ctxt, ops, tss->ds, VCPU_SREG_DS);
+       ret = load_segment_descriptor(ctxt, tss->ds, VCPU_SREG_DS);
        if (ret != X86EMUL_CONTINUE)
                return ret;
 
@@ -2063,29 +2105,29 @@ static int load_state_from_tss16(struct x86_emulate_ctxt *ctxt,
 }
 
 static int task_switch_16(struct x86_emulate_ctxt *ctxt,
-                         struct x86_emulate_ops *ops,
                          u16 tss_selector, u16 old_tss_sel,
                          ulong old_tss_base, struct desc_struct *new_desc)
 {
+       struct x86_emulate_ops *ops = ctxt->ops;
        struct tss_segment_16 tss_seg;
        int ret;
        u32 new_tss_base = get_desc_base(new_desc);
 
-       ret = ops->read_std(old_tss_base, &tss_seg, sizeof tss_seg, ctxt->vcpu,
+       ret = ops->read_std(ctxt, old_tss_base, &tss_seg, sizeof tss_seg,
                            &ctxt->exception);
        if (ret != X86EMUL_CONTINUE)
                /* FIXME: need to provide precise fault address */
                return ret;
 
-       save_state_to_tss16(ctxt, ops, &tss_seg);
+       save_state_to_tss16(ctxt, &tss_seg);
 
-       ret = ops->write_std(old_tss_base, &tss_seg, sizeof tss_seg, ctxt->vcpu,
+       ret = ops->write_std(ctxt, old_tss_base, &tss_seg, sizeof tss_seg,
                             &ctxt->exception);
        if (ret != X86EMUL_CONTINUE)
                /* FIXME: need to provide precise fault address */
                return ret;
 
-       ret = ops->read_std(new_tss_base, &tss_seg, sizeof tss_seg, ctxt->vcpu,
+       ret = ops->read_std(ctxt, new_tss_base, &tss_seg, sizeof tss_seg,
                            &ctxt->exception);
        if (ret != X86EMUL_CONTINUE)
                /* FIXME: need to provide precise fault address */
@@ -2094,100 +2136,95 @@ static int task_switch_16(struct x86_emulate_ctxt *ctxt,
        if (old_tss_sel != 0xffff) {
                tss_seg.prev_task_link = old_tss_sel;
 
-               ret = ops->write_std(new_tss_base,
+               ret = ops->write_std(ctxt, new_tss_base,
                                     &tss_seg.prev_task_link,
                                     sizeof tss_seg.prev_task_link,
-                                    ctxt->vcpu, &ctxt->exception);
+                                    &ctxt->exception);
                if (ret != X86EMUL_CONTINUE)
                        /* FIXME: need to provide precise fault address */
                        return ret;
        }
 
-       return load_state_from_tss16(ctxt, ops, &tss_seg);
+       return load_state_from_tss16(ctxt, &tss_seg);
 }
 
 static void save_state_to_tss32(struct x86_emulate_ctxt *ctxt,
-                               struct x86_emulate_ops *ops,
                                struct tss_segment_32 *tss)
 {
-       struct decode_cache *c = &ctxt->decode;
-
-       tss->cr3 = ops->get_cr(3, ctxt->vcpu);
-       tss->eip = c->eip;
+       tss->cr3 = ctxt->ops->get_cr(ctxt, 3);
+       tss->eip = ctxt->_eip;
        tss->eflags = ctxt->eflags;
-       tss->eax = c->regs[VCPU_REGS_RAX];
-       tss->ecx = c->regs[VCPU_REGS_RCX];
-       tss->edx = c->regs[VCPU_REGS_RDX];
-       tss->ebx = c->regs[VCPU_REGS_RBX];
-       tss->esp = c->regs[VCPU_REGS_RSP];
-       tss->ebp = c->regs[VCPU_REGS_RBP];
-       tss->esi = c->regs[VCPU_REGS_RSI];
-       tss->edi = c->regs[VCPU_REGS_RDI];
-
-       tss->es = ops->get_segment_selector(VCPU_SREG_ES, ctxt->vcpu);
-       tss->cs = ops->get_segment_selector(VCPU_SREG_CS, ctxt->vcpu);
-       tss->ss = ops->get_segment_selector(VCPU_SREG_SS, ctxt->vcpu);
-       tss->ds = ops->get_segment_selector(VCPU_SREG_DS, ctxt->vcpu);
-       tss->fs = ops->get_segment_selector(VCPU_SREG_FS, ctxt->vcpu);
-       tss->gs = ops->get_segment_selector(VCPU_SREG_GS, ctxt->vcpu);
-       tss->ldt_selector = ops->get_segment_selector(VCPU_SREG_LDTR, ctxt->vcpu);
+       tss->eax = ctxt->regs[VCPU_REGS_RAX];
+       tss->ecx = ctxt->regs[VCPU_REGS_RCX];
+       tss->edx = ctxt->regs[VCPU_REGS_RDX];
+       tss->ebx = ctxt->regs[VCPU_REGS_RBX];
+       tss->esp = ctxt->regs[VCPU_REGS_RSP];
+       tss->ebp = ctxt->regs[VCPU_REGS_RBP];
+       tss->esi = ctxt->regs[VCPU_REGS_RSI];
+       tss->edi = ctxt->regs[VCPU_REGS_RDI];
+
+       tss->es = get_segment_selector(ctxt, VCPU_SREG_ES);
+       tss->cs = get_segment_selector(ctxt, VCPU_SREG_CS);
+       tss->ss = get_segment_selector(ctxt, VCPU_SREG_SS);
+       tss->ds = get_segment_selector(ctxt, VCPU_SREG_DS);
+       tss->fs = get_segment_selector(ctxt, VCPU_SREG_FS);
+       tss->gs = get_segment_selector(ctxt, VCPU_SREG_GS);
+       tss->ldt_selector = get_segment_selector(ctxt, VCPU_SREG_LDTR);
 }
 
 static int load_state_from_tss32(struct x86_emulate_ctxt *ctxt,
-                                struct x86_emulate_ops *ops,
                                 struct tss_segment_32 *tss)
 {
-       struct decode_cache *c = &ctxt->decode;
        int ret;
 
-       if (ops->set_cr(3, tss->cr3, ctxt->vcpu))
+       if (ctxt->ops->set_cr(ctxt, 3, tss->cr3))
                return emulate_gp(ctxt, 0);
-       c->eip = tss->eip;
+       ctxt->_eip = tss->eip;
        ctxt->eflags = tss->eflags | 2;
-       c->regs[VCPU_REGS_RAX] = tss->eax;
-       c->regs[VCPU_REGS_RCX] = tss->ecx;
-       c->regs[VCPU_REGS_RDX] = tss->edx;
-       c->regs[VCPU_REGS_RBX] = tss->ebx;
-       c->regs[VCPU_REGS_RSP] = tss->esp;
-       c->regs[VCPU_REGS_RBP] = tss->ebp;
-       c->regs[VCPU_REGS_RSI] = tss->esi;
-       c->regs[VCPU_REGS_RDI] = tss->edi;
+       ctxt->regs[VCPU_REGS_RAX] = tss->eax;
+       ctxt->regs[VCPU_REGS_RCX] = tss->ecx;
+       ctxt->regs[VCPU_REGS_RDX] = tss->edx;
+       ctxt->regs[VCPU_REGS_RBX] = tss->ebx;
+       ctxt->regs[VCPU_REGS_RSP] = tss->esp;
+       ctxt->regs[VCPU_REGS_RBP] = tss->ebp;
+       ctxt->regs[VCPU_REGS_RSI] = tss->esi;
+       ctxt->regs[VCPU_REGS_RDI] = tss->edi;
 
        /*
         * SDM says that segment selectors are loaded before segment
         * descriptors
         */
-       ops->set_segment_selector(tss->ldt_selector, VCPU_SREG_LDTR, ctxt->vcpu);
-       ops->set_segment_selector(tss->es, VCPU_SREG_ES, ctxt->vcpu);
-       ops->set_segment_selector(tss->cs, VCPU_SREG_CS, ctxt->vcpu);
-       ops->set_segment_selector(tss->ss, VCPU_SREG_SS, ctxt->vcpu);
-       ops->set_segment_selector(tss->ds, VCPU_SREG_DS, ctxt->vcpu);
-       ops->set_segment_selector(tss->fs, VCPU_SREG_FS, ctxt->vcpu);
-       ops->set_segment_selector(tss->gs, VCPU_SREG_GS, ctxt->vcpu);
+       set_segment_selector(ctxt, tss->ldt_selector, VCPU_SREG_LDTR);
+       set_segment_selector(ctxt, tss->es, VCPU_SREG_ES);
+       set_segment_selector(ctxt, tss->cs, VCPU_SREG_CS);
+       set_segment_selector(ctxt, tss->ss, VCPU_SREG_SS);
+       set_segment_selector(ctxt, tss->ds, VCPU_SREG_DS);
+       set_segment_selector(ctxt, tss->fs, VCPU_SREG_FS);
+       set_segment_selector(ctxt, tss->gs, VCPU_SREG_GS);
 
        /*
         * Now load segment descriptors. If fault happenes at this stage
         * it is handled in a context of new task
         */
-       ret = load_segment_descriptor(ctxt, ops, tss->ldt_selector, VCPU_SREG_LDTR);
+       ret = load_segment_descriptor(ctxt, tss->ldt_selector, VCPU_SREG_LDTR);
        if (ret != X86EMUL_CONTINUE)
                return ret;
-       ret = load_segment_descriptor(ctxt, ops, tss->es, VCPU_SREG_ES);
+       ret = load_segment_descriptor(ctxt, tss->es, VCPU_SREG_ES);
        if (ret != X86EMUL_CONTINUE)
                return ret;
-       ret = load_segment_descriptor(ctxt, ops, tss->cs, VCPU_SREG_CS);
+       ret = load_segment_descriptor(ctxt, tss->cs, VCPU_SREG_CS);
        if (ret != X86EMUL_CONTINUE)
                return ret;
-       ret = load_segment_descriptor(ctxt, ops, tss->ss, VCPU_SREG_SS);
+       ret = load_segment_descriptor(ctxt, tss->ss, VCPU_SREG_SS);
        if (ret != X86EMUL_CONTINUE)
                return ret;
-       ret = load_segment_descriptor(ctxt, ops, tss->ds, VCPU_SREG_DS);
+       ret = load_segment_descriptor(ctxt, tss->ds, VCPU_SREG_DS);
        if (ret != X86EMUL_CONTINUE)
                return ret;
-       ret = load_segment_descriptor(ctxt, ops, tss->fs, VCPU_SREG_FS);
+       ret = load_segment_descriptor(ctxt, tss->fs, VCPU_SREG_FS);
        if (ret != X86EMUL_CONTINUE)
                return ret;
-       ret = load_segment_descriptor(ctxt, ops, tss->gs, VCPU_SREG_GS);
+       ret = load_segment_descriptor(ctxt, tss->gs, VCPU_SREG_GS);
        if (ret != X86EMUL_CONTINUE)
                return ret;
 
@@ -2195,29 +2232,29 @@ static int load_state_from_tss32(struct x86_emulate_ctxt *ctxt,
 }
 
 static int task_switch_32(struct x86_emulate_ctxt *ctxt,
-                         struct x86_emulate_ops *ops,
                          u16 tss_selector, u16 old_tss_sel,
                          ulong old_tss_base, struct desc_struct *new_desc)
 {
+       struct x86_emulate_ops *ops = ctxt->ops;
        struct tss_segment_32 tss_seg;
        int ret;
        u32 new_tss_base = get_desc_base(new_desc);
 
-       ret = ops->read_std(old_tss_base, &tss_seg, sizeof tss_seg, ctxt->vcpu,
+       ret = ops->read_std(ctxt, old_tss_base, &tss_seg, sizeof tss_seg,
                            &ctxt->exception);
        if (ret != X86EMUL_CONTINUE)
                /* FIXME: need to provide precise fault address */
                return ret;
 
-       save_state_to_tss32(ctxt, ops, &tss_seg);
+       save_state_to_tss32(ctxt, &tss_seg);
 
-       ret = ops->write_std(old_tss_base, &tss_seg, sizeof tss_seg, ctxt->vcpu,
+       ret = ops->write_std(ctxt, old_tss_base, &tss_seg, sizeof tss_seg,
                             &ctxt->exception);
        if (ret != X86EMUL_CONTINUE)
                /* FIXME: need to provide precise fault address */
                return ret;
 
-       ret = ops->read_std(new_tss_base, &tss_seg, sizeof tss_seg, ctxt->vcpu,
+       ret = ops->read_std(ctxt, new_tss_base, &tss_seg, sizeof tss_seg,
                            &ctxt->exception);
        if (ret != X86EMUL_CONTINUE)
                /* FIXME: need to provide precise fault address */
@@ -2226,36 +2263,36 @@ static int task_switch_32(struct x86_emulate_ctxt *ctxt,
        if (old_tss_sel != 0xffff) {
                tss_seg.prev_task_link = old_tss_sel;
 
-               ret = ops->write_std(new_tss_base,
+               ret = ops->write_std(ctxt, new_tss_base,
                                     &tss_seg.prev_task_link,
                                     sizeof tss_seg.prev_task_link,
-                                    ctxt->vcpu, &ctxt->exception);
+                                    &ctxt->exception);
                if (ret != X86EMUL_CONTINUE)
                        /* FIXME: need to provide precise fault address */
                        return ret;
        }
 
-       return load_state_from_tss32(ctxt, ops, &tss_seg);
+       return load_state_from_tss32(ctxt, &tss_seg);
 }
 
 static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt,
-                                  struct x86_emulate_ops *ops,
                                   u16 tss_selector, int reason,
                                   bool has_error_code, u32 error_code)
 {
+       struct x86_emulate_ops *ops = ctxt->ops;
        struct desc_struct curr_tss_desc, next_tss_desc;
        int ret;
-       u16 old_tss_sel = ops->get_segment_selector(VCPU_SREG_TR, ctxt->vcpu);
+       u16 old_tss_sel = get_segment_selector(ctxt, VCPU_SREG_TR);
        ulong old_tss_base =
-               ops->get_cached_segment_base(VCPU_SREG_TR, ctxt->vcpu);
+               ops->get_cached_segment_base(ctxt, VCPU_SREG_TR);
        u32 desc_limit;
 
        /* FIXME: old_tss_base == ~0 ? */
 
-       ret = read_segment_descriptor(ctxt, ops, tss_selector, &next_tss_desc);
+       ret = read_segment_descriptor(ctxt, tss_selector, &next_tss_desc);
        if (ret != X86EMUL_CONTINUE)
                return ret;
-       ret = read_segment_descriptor(ctxt, ops, old_tss_sel, &curr_tss_desc);
+       ret = read_segment_descriptor(ctxt, old_tss_sel, &curr_tss_desc);
        if (ret != X86EMUL_CONTINUE)
                return ret;
 
@@ -2263,7 +2300,7 @@ static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt,
 
        if (reason != TASK_SWITCH_IRET) {
                if ((tss_selector & 3) > next_tss_desc.dpl ||
-                   ops->cpl(ctxt->vcpu) > next_tss_desc.dpl)
+                   ops->cpl(ctxt) > next_tss_desc.dpl)
                        return emulate_gp(ctxt, 0);
        }
 
@@ -2277,8 +2314,7 @@ static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt,
 
        if (reason == TASK_SWITCH_IRET || reason == TASK_SWITCH_JMP) {
                curr_tss_desc.type &= ~(1 << 1); /* clear busy flag */
-               write_segment_descriptor(ctxt, ops, old_tss_sel,
-                                        &curr_tss_desc);
+               write_segment_descriptor(ctxt, old_tss_sel, &curr_tss_desc);
        }
 
        if (reason == TASK_SWITCH_IRET)
@@ -2290,10 +2326,10 @@ static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt,
                old_tss_sel = 0xffff;
 
        if (next_tss_desc.type & 8)
-               ret = task_switch_32(ctxt, ops, tss_selector, old_tss_sel,
+               ret = task_switch_32(ctxt, tss_selector, old_tss_sel,
                                     old_tss_base, &next_tss_desc);
        else
-               ret = task_switch_16(ctxt, ops, tss_selector, old_tss_sel,
+               ret = task_switch_16(ctxt, tss_selector, old_tss_sel,
                                     old_tss_base, &next_tss_desc);
        if (ret != X86EMUL_CONTINUE)
                return ret;
@@ -2303,21 +2339,17 @@ static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt,
 
        if (reason != TASK_SWITCH_IRET) {
                next_tss_desc.type |= (1 << 1); /* set busy flag */
-               write_segment_descriptor(ctxt, ops, tss_selector,
-                                        &next_tss_desc);
+               write_segment_descriptor(ctxt, tss_selector, &next_tss_desc);
        }
 
-       ops->set_cr(0,  ops->get_cr(0, ctxt->vcpu) | X86_CR0_TS, ctxt->vcpu);
-       ops->set_cached_descriptor(&next_tss_desc, 0, VCPU_SREG_TR, ctxt->vcpu);
-       ops->set_segment_selector(tss_selector, VCPU_SREG_TR, ctxt->vcpu);
+       ops->set_cr(ctxt, 0,  ops->get_cr(ctxt, 0) | X86_CR0_TS);
+       ops->set_segment(ctxt, tss_selector, &next_tss_desc, 0, VCPU_SREG_TR);
 
        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);
+               ctxt->op_bytes = ctxt->ad_bytes = (next_tss_desc.type & 8) ? 4 : 2;
+               ctxt->lock_prefix = 0;
+               ctxt->src.val = (unsigned long) error_code;
+               ret = em_push(ctxt);
        }
 
        return ret;
@@ -2327,21 +2359,16 @@ 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;
+       ctxt->_eip = ctxt->eip;
+       ctxt->dst.type = OP_NONE;
 
-       rc = emulator_do_task_switch(ctxt, ops, tss_selector, reason,
+       rc = emulator_do_task_switch(ctxt, tss_selector, reason,
                                     has_error_code, error_code);
 
-       if (rc == X86EMUL_CONTINUE) {
-               rc = writeback(ctxt, ops);
-               if (rc == X86EMUL_CONTINUE)
-                       ctxt->eip = c->eip;
-       }
+       if (rc == X86EMUL_CONTINUE)
+               ctxt->eip = ctxt->_eip;
 
        return (rc == X86EMUL_UNHANDLEABLE) ? EMULATION_FAILED : EMULATION_OK;
 }
@@ -2349,28 +2376,20 @@ int emulator_task_switch(struct x86_emulate_ctxt *ctxt,
 static void string_addr_inc(struct x86_emulate_ctxt *ctxt, unsigned seg,
                            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.ea = register_address(c, c->regs[reg]);
+       register_address_increment(ctxt, &ctxt->regs[reg], df * op->bytes);
+       op->addr.mem.ea = register_address(ctxt, ctxt->regs[reg]);
        op->addr.mem.seg = seg;
 }
 
-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;
+       al = ctxt->dst.val;
 
        old_al = al;
        old_cf = cf;
@@ -2388,12 +2407,12 @@ static int em_das(struct x86_emulate_ctxt *ctxt)
                cf = true;
        }
 
-       c->dst.val = al;
+       ctxt->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->src.type = OP_IMM;
+       ctxt->src.val = 0;
+       ctxt->src.bytes = 1;
+       emulate_2op_SrcV(ctxt, "or");
        ctxt->eflags &= ~(X86_EFLAGS_AF | X86_EFLAGS_CF);
        if (cf)
                ctxt->eflags |= X86_EFLAGS_CF;
@@ -2404,117 +2423,312 @@ static int em_das(struct x86_emulate_ctxt *ctxt)
 
 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;
+       old_cs = get_segment_selector(ctxt, VCPU_SREG_CS);
+       old_eip = ctxt->_eip;
 
-       memcpy(&sel, c->src.valptr + c->op_bytes, 2);
-       if (load_segment_descriptor(ctxt, ctxt->ops, sel, VCPU_SREG_CS))
+       memcpy(&sel, ctxt->src.valptr + ctxt->op_bytes, 2);
+       if (load_segment_descriptor(ctxt, sel, VCPU_SREG_CS))
                return X86EMUL_CONTINUE;
 
-       c->eip = 0;
-       memcpy(&c->eip, c->src.valptr, c->op_bytes);
+       ctxt->_eip = 0;
+       memcpy(&ctxt->_eip, ctxt->src.valptr, ctxt->op_bytes);
 
-       c->src.val = old_cs;
-       emulate_push(ctxt, ctxt->ops);
-       rc = writeback(ctxt, ctxt->ops);
+       ctxt->src.val = old_cs;
+       rc = em_push(ctxt);
        if (rc != X86EMUL_CONTINUE)
                return rc;
 
-       c->src.val = old_eip;
-       emulate_push(ctxt, ctxt->ops);
-       rc = writeback(ctxt, ctxt->ops);
+       ctxt->src.val = old_eip;
+       return em_push(ctxt);
+}
+
+static int em_ret_near_imm(struct x86_emulate_ctxt *ctxt)
+{
+       int rc;
+
+       ctxt->dst.type = OP_REG;
+       ctxt->dst.addr.reg = &ctxt->_eip;
+       ctxt->dst.bytes = ctxt->op_bytes;
+       rc = emulate_pop(ctxt, &ctxt->dst.val, ctxt->op_bytes);
        if (rc != X86EMUL_CONTINUE)
                return rc;
+       register_address_increment(ctxt, &ctxt->regs[VCPU_REGS_RSP], ctxt->src.val);
+       return X86EMUL_CONTINUE;
+}
 
-       c->dst.type = OP_NONE;
+static int em_add(struct x86_emulate_ctxt *ctxt)
+{
+       emulate_2op_SrcV(ctxt, "add");
+       return X86EMUL_CONTINUE;
+}
 
+static int em_or(struct x86_emulate_ctxt *ctxt)
+{
+       emulate_2op_SrcV(ctxt, "or");
        return X86EMUL_CONTINUE;
 }
 
-static int em_ret_near_imm(struct x86_emulate_ctxt *ctxt)
+static int em_adc(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
-       int rc;
+       emulate_2op_SrcV(ctxt, "adc");
+       return X86EMUL_CONTINUE;
+}
 
-       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);
+static int em_sbb(struct x86_emulate_ctxt *ctxt)
+{
+       emulate_2op_SrcV(ctxt, "sbb");
        return X86EMUL_CONTINUE;
 }
 
-static int em_imul(struct x86_emulate_ctxt *ctxt)
+static int em_and(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
+       emulate_2op_SrcV(ctxt, "and");
+       return X86EMUL_CONTINUE;
+}
 
-       emulate_2op_SrcV_nobyte("imul", c->src, c->dst, ctxt->eflags);
+static int em_sub(struct x86_emulate_ctxt *ctxt)
+{
+       emulate_2op_SrcV(ctxt, "sub");
        return X86EMUL_CONTINUE;
 }
 
-static int em_imul_3op(struct x86_emulate_ctxt *ctxt)
+static int em_xor(struct x86_emulate_ctxt *ctxt)
+{
+       emulate_2op_SrcV(ctxt, "xor");
+       return X86EMUL_CONTINUE;
+}
+
+static int em_cmp(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
+       emulate_2op_SrcV(ctxt, "cmp");
+       /* Disable writeback. */
+       ctxt->dst.type = OP_NONE;
+       return X86EMUL_CONTINUE;
+}
+
+static int em_test(struct x86_emulate_ctxt *ctxt)
+{
+       emulate_2op_SrcV(ctxt, "test");
+       return X86EMUL_CONTINUE;
+}
 
-       c->dst.val = c->src2.val;
+static int em_xchg(struct x86_emulate_ctxt *ctxt)
+{
+       /* Write back the register source. */
+       ctxt->src.val = ctxt->dst.val;
+       write_register_operand(&ctxt->src);
+
+       /* Write back the memory destination with implicit LOCK prefix. */
+       ctxt->dst.val = ctxt->src.orig_val;
+       ctxt->lock_prefix = 1;
+       return X86EMUL_CONTINUE;
+}
+
+static int em_imul(struct x86_emulate_ctxt *ctxt)
+{
+       emulate_2op_SrcV_nobyte(ctxt, "imul");
+       return X86EMUL_CONTINUE;
+}
+
+static int em_imul_3op(struct x86_emulate_ctxt *ctxt)
+{
+       ctxt->dst.val = ctxt->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);
+       ctxt->dst.type = OP_REG;
+       ctxt->dst.bytes = ctxt->src.bytes;
+       ctxt->dst.addr.reg = &ctxt->regs[VCPU_REGS_RDX];
+       ctxt->dst.val = ~((ctxt->src.val >> (ctxt->src.bytes * 8 - 1)) - 1);
 
        return X86EMUL_CONTINUE;
 }
 
 static int em_rdtsc(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
        u64 tsc = 0;
 
-       ctxt->ops->get_msr(ctxt->vcpu, MSR_IA32_TSC, &tsc);
-       c->regs[VCPU_REGS_RAX] = (u32)tsc;
-       c->regs[VCPU_REGS_RDX] = tsc >> 32;
+       ctxt->ops->get_msr(ctxt, MSR_IA32_TSC, &tsc);
+       ctxt->regs[VCPU_REGS_RAX] = (u32)tsc;
+       ctxt->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;
+       ctxt->dst.val = ctxt->src.val;
        return X86EMUL_CONTINUE;
 }
 
+static int em_mov_rm_sreg(struct x86_emulate_ctxt *ctxt)
+{
+       if (ctxt->modrm_reg > VCPU_SREG_GS)
+               return emulate_ud(ctxt);
+
+       ctxt->dst.val = get_segment_selector(ctxt, ctxt->modrm_reg);
+       return X86EMUL_CONTINUE;
+}
+
+static int em_mov_sreg_rm(struct x86_emulate_ctxt *ctxt)
+{
+       u16 sel = ctxt->src.val;
+
+       if (ctxt->modrm_reg == VCPU_SREG_CS || ctxt->modrm_reg > VCPU_SREG_GS)
+               return emulate_ud(ctxt);
+
+       if (ctxt->modrm_reg == VCPU_SREG_SS)
+               ctxt->interruptibility = KVM_X86_SHADOW_INT_MOV_SS;
+
+       /* Disable writeback. */
+       ctxt->dst.type = OP_NONE;
+       return load_segment_descriptor(ctxt, sel, ctxt->modrm_reg);
+}
+
 static int em_movdqu(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
-       memcpy(&c->dst.vec_val, &c->src.vec_val, c->op_bytes);
+       memcpy(&ctxt->dst.vec_val, &ctxt->src.vec_val, ctxt->op_bytes);
        return X86EMUL_CONTINUE;
 }
 
 static int em_invlpg(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
        int rc;
        ulong linear;
 
-       rc = linearize(ctxt, c->src.addr.mem, 1, false, &linear);
+       rc = linearize(ctxt, ctxt->src.addr.mem, 1, false, &linear);
        if (rc == X86EMUL_CONTINUE)
-               emulate_invlpg(ctxt->vcpu, linear);
+               ctxt->ops->invlpg(ctxt, linear);
+       /* Disable writeback. */
+       ctxt->dst.type = OP_NONE;
+       return X86EMUL_CONTINUE;
+}
+
+static int em_clts(struct x86_emulate_ctxt *ctxt)
+{
+       ulong cr0;
+
+       cr0 = ctxt->ops->get_cr(ctxt, 0);
+       cr0 &= ~X86_CR0_TS;
+       ctxt->ops->set_cr(ctxt, 0, cr0);
+       return X86EMUL_CONTINUE;
+}
+
+static int em_vmcall(struct x86_emulate_ctxt *ctxt)
+{
+       int rc;
+
+       if (ctxt->modrm_mod != 3 || ctxt->modrm_rm != 1)
+               return X86EMUL_UNHANDLEABLE;
+
+       rc = ctxt->ops->fix_hypercall(ctxt);
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
+
+       /* Let the processor re-execute the fixed hypercall */
+       ctxt->_eip = ctxt->eip;
+       /* Disable writeback. */
+       ctxt->dst.type = OP_NONE;
+       return X86EMUL_CONTINUE;
+}
+
+static int em_lgdt(struct x86_emulate_ctxt *ctxt)
+{
+       struct desc_ptr desc_ptr;
+       int rc;
+
+       rc = read_descriptor(ctxt, ctxt->src.addr.mem,
+                            &desc_ptr.size, &desc_ptr.address,
+                            ctxt->op_bytes);
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
+       ctxt->ops->set_gdt(ctxt, &desc_ptr);
+       /* Disable writeback. */
+       ctxt->dst.type = OP_NONE;
+       return X86EMUL_CONTINUE;
+}
+
+static int em_vmmcall(struct x86_emulate_ctxt *ctxt)
+{
+       int rc;
+
+       rc = ctxt->ops->fix_hypercall(ctxt);
+
        /* Disable writeback. */
-       c->dst.type = OP_NONE;
+       ctxt->dst.type = OP_NONE;
+       return rc;
+}
+
+static int em_lidt(struct x86_emulate_ctxt *ctxt)
+{
+       struct desc_ptr desc_ptr;
+       int rc;
+
+       rc = read_descriptor(ctxt, ctxt->src.addr.mem,
+                            &desc_ptr.size, &desc_ptr.address,
+                            ctxt->op_bytes);
+       if (rc != X86EMUL_CONTINUE)
+               return rc;
+       ctxt->ops->set_idt(ctxt, &desc_ptr);
+       /* Disable writeback. */
+       ctxt->dst.type = OP_NONE;
+       return X86EMUL_CONTINUE;
+}
+
+static int em_smsw(struct x86_emulate_ctxt *ctxt)
+{
+       ctxt->dst.bytes = 2;
+       ctxt->dst.val = ctxt->ops->get_cr(ctxt, 0);
+       return X86EMUL_CONTINUE;
+}
+
+static int em_lmsw(struct x86_emulate_ctxt *ctxt)
+{
+       ctxt->ops->set_cr(ctxt, 0, (ctxt->ops->get_cr(ctxt, 0) & ~0x0eul)
+                         | (ctxt->src.val & 0x0f));
+       ctxt->dst.type = OP_NONE;
+       return X86EMUL_CONTINUE;
+}
+
+static int em_loop(struct x86_emulate_ctxt *ctxt)
+{
+       register_address_increment(ctxt, &ctxt->regs[VCPU_REGS_RCX], -1);
+       if ((address_mask(ctxt, ctxt->regs[VCPU_REGS_RCX]) != 0) &&
+           (ctxt->b == 0xe2 || test_cc(ctxt->b ^ 0x5, ctxt->eflags)))
+               jmp_rel(ctxt, ctxt->src.val);
+
+       return X86EMUL_CONTINUE;
+}
+
+static int em_jcxz(struct x86_emulate_ctxt *ctxt)
+{
+       if (address_mask(ctxt, ctxt->regs[VCPU_REGS_RCX]) == 0)
+               jmp_rel(ctxt, ctxt->src.val);
+
+       return X86EMUL_CONTINUE;
+}
+
+static int em_cli(struct x86_emulate_ctxt *ctxt)
+{
+       if (emulator_bad_iopl(ctxt))
+               return emulate_gp(ctxt, 0);
+
+       ctxt->eflags &= ~X86_EFLAGS_IF;
+       return X86EMUL_CONTINUE;
+}
+
+static int em_sti(struct x86_emulate_ctxt *ctxt)
+{
+       if (emulator_bad_iopl(ctxt))
+               return emulate_gp(ctxt, 0);
+
+       ctxt->interruptibility = KVM_X86_SHADOW_INT_STI;
+       ctxt->eflags |= X86_EFLAGS_IF;
        return X86EMUL_CONTINUE;
 }
 
@@ -2532,9 +2746,7 @@ static bool valid_cr(int nr)
 
 static int check_cr_read(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
-
-       if (!valid_cr(c->modrm_reg))
+       if (!valid_cr(ctxt->modrm_reg))
                return emulate_ud(ctxt);
 
        return X86EMUL_CONTINUE;
@@ -2542,9 +2754,9 @@ static int check_cr_read(struct x86_emulate_ctxt *ctxt)
 
 static int check_cr_write(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
-       u64 new_val = c->src.val64;
-       int cr = c->modrm_reg;
+       u64 new_val = ctxt->src.val64;
+       int cr = ctxt->modrm_reg;
+       u64 efer = 0;
 
        static u64 cr_reserved_bits[] = {
                0xffffffff00000000ULL,
@@ -2562,13 +2774,13 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
 
        switch (cr) {
        case 0: {
-               u64 cr4, efer;
+               u64 cr4;
                if (((new_val & X86_CR0_PG) && !(new_val & X86_CR0_PE)) ||
                    ((new_val & X86_CR0_NW) && !(new_val & X86_CR0_CD)))
                        return emulate_gp(ctxt, 0);
 
-               cr4 = ctxt->ops->get_cr(4, ctxt->vcpu);
-               ctxt->ops->get_msr(ctxt->vcpu, MSR_EFER, &efer);
+               cr4 = ctxt->ops->get_cr(ctxt, 4);
+               ctxt->ops->get_msr(ctxt, MSR_EFER, &efer);
 
                if ((new_val & X86_CR0_PG) && (efer & EFER_LME) &&
                    !(cr4 & X86_CR4_PAE))
@@ -2579,11 +2791,12 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
        case 3: {
                u64 rsvd = 0;
 
-               if (is_long_mode(ctxt->vcpu))
+               ctxt->ops->get_msr(ctxt, MSR_EFER, &efer);
+               if (efer & EFER_LMA)
                        rsvd = CR3_L_MODE_RESERVED_BITS;
-               else if (is_pae(ctxt->vcpu))
+               else if (ctxt->ops->get_cr(ctxt, 4) & X86_CR4_PAE)
                        rsvd = CR3_PAE_RESERVED_BITS;
-               else if (is_paging(ctxt->vcpu))
+               else if (ctxt->ops->get_cr(ctxt, 0) & X86_CR0_PG)
                        rsvd = CR3_NONPAE_RESERVED_BITS;
 
                if (new_val & rsvd)
@@ -2592,10 +2805,10 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
                break;
                }
        case 4: {
-               u64 cr4, efer;
+               u64 cr4;
 
-               cr4 = ctxt->ops->get_cr(4, ctxt->vcpu);
-               ctxt->ops->get_msr(ctxt->vcpu, MSR_EFER, &efer);
+               cr4 = ctxt->ops->get_cr(ctxt, 4);
+               ctxt->ops->get_msr(ctxt, MSR_EFER, &efer);
 
                if ((efer & EFER_LMA) && !(new_val & X86_CR4_PAE))
                        return emulate_gp(ctxt, 0);
@@ -2611,7 +2824,7 @@ static int check_dr7_gd(struct x86_emulate_ctxt *ctxt)
 {
        unsigned long dr7;
 
-       ctxt->ops->get_dr(7, &dr7, ctxt->vcpu);
+       ctxt->ops->get_dr(ctxt, 7, &dr7);
 
        /* Check if DR7.Global_Enable is set */
        return dr7 & (1 << 13);
@@ -2619,14 +2832,13 @@ static int check_dr7_gd(struct x86_emulate_ctxt *ctxt)
 
 static int check_dr_read(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
-       int dr = c->modrm_reg;
+       int dr = ctxt->modrm_reg;
        u64 cr4;
 
        if (dr > 7)
                return emulate_ud(ctxt);
 
-       cr4 = ctxt->ops->get_cr(4, ctxt->vcpu);
+       cr4 = ctxt->ops->get_cr(ctxt, 4);
        if ((cr4 & X86_CR4_DE) && (dr == 4 || dr == 5))
                return emulate_ud(ctxt);
 
@@ -2638,9 +2850,8 @@ static int check_dr_read(struct x86_emulate_ctxt *ctxt)
 
 static int check_dr_write(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
-       u64 new_val = c->src.val64;
-       int dr = c->modrm_reg;
+       u64 new_val = ctxt->src.val64;
+       int dr = ctxt->modrm_reg;
 
        if ((dr == 6 || dr == 7) && (new_val & 0xffffffff00000000ULL))
                return emulate_gp(ctxt, 0);
@@ -2652,7 +2863,7 @@ static int check_svme(struct x86_emulate_ctxt *ctxt)
 {
        u64 efer;
 
-       ctxt->ops->get_msr(ctxt->vcpu, MSR_EFER, &efer);
+       ctxt->ops->get_msr(ctxt, MSR_EFER, &efer);
 
        if (!(efer & EFER_SVME))
                return emulate_ud(ctxt);
@@ -2662,10 +2873,10 @@ static int check_svme(struct x86_emulate_ctxt *ctxt)
 
 static int check_svme_pa(struct x86_emulate_ctxt *ctxt)
 {
-       u64 rax = kvm_register_read(ctxt->vcpu, VCPU_REGS_RAX);
+       u64 rax = ctxt->regs[VCPU_REGS_RAX];
 
        /* Valid physical address? */
-       if (rax & 0xffff000000000000)
+       if (rax & 0xffff000000000000ULL)
                return emulate_gp(ctxt, 0);
 
        return check_svme(ctxt);
@@ -2673,9 +2884,9 @@ static int check_svme_pa(struct x86_emulate_ctxt *ctxt)
 
 static int check_rdtsc(struct x86_emulate_ctxt *ctxt)
 {
-       u64 cr4 = ctxt->ops->get_cr(4, ctxt->vcpu);
+       u64 cr4 = ctxt->ops->get_cr(ctxt, 4);
 
-       if (cr4 & X86_CR4_TSD && ctxt->ops->cpl(ctxt->vcpu))
+       if (cr4 & X86_CR4_TSD && ctxt->ops->cpl(ctxt))
                return emulate_ud(ctxt);
 
        return X86EMUL_CONTINUE;
@@ -2683,10 +2894,10 @@ static int check_rdtsc(struct x86_emulate_ctxt *ctxt)
 
 static int check_rdpmc(struct x86_emulate_ctxt *ctxt)
 {
-       u64 cr4 = ctxt->ops->get_cr(4, ctxt->vcpu);
-       u64 rcx = kvm_register_read(ctxt->vcpu, VCPU_REGS_RCX);
+       u64 cr4 = ctxt->ops->get_cr(ctxt, 4);
+       u64 rcx = ctxt->regs[VCPU_REGS_RCX];
 
-       if ((!(cr4 & X86_CR4_PCE) && ctxt->ops->cpl(ctxt->vcpu)) ||
+       if ((!(cr4 & X86_CR4_PCE) && ctxt->ops->cpl(ctxt)) ||
            (rcx > 3))
                return emulate_gp(ctxt, 0);
 
@@ -2695,10 +2906,8 @@ static int check_rdpmc(struct x86_emulate_ctxt *ctxt)
 
 static int check_perm_in(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
-
-       c->dst.bytes = min(c->dst.bytes, 4u);
-       if (!emulator_io_permited(ctxt, ctxt->ops, c->src.val, c->dst.bytes))
+       ctxt->dst.bytes = min(ctxt->dst.bytes, 4u);
+       if (!emulator_io_permited(ctxt, ctxt->src.val, ctxt->dst.bytes))
                return emulate_gp(ctxt, 0);
 
        return X86EMUL_CONTINUE;
@@ -2706,10 +2915,8 @@ static int check_perm_in(struct x86_emulate_ctxt *ctxt)
 
 static int check_perm_out(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
-
-       c->src.bytes = min(c->src.bytes, 4u);
-       if (!emulator_io_permited(ctxt, ctxt->ops, c->dst.val, c->src.bytes))
+       ctxt->src.bytes = min(ctxt->src.bytes, 4u);
+       if (!emulator_io_permited(ctxt, ctxt->dst.val, ctxt->src.bytes))
                return emulate_gp(ctxt, 0);
 
        return X86EMUL_CONTINUE;
@@ -2722,7 +2929,7 @@ static int check_perm_out(struct x86_emulate_ctxt *ctxt)
 #define N    D(0)
 #define EXT(_f, _e) { .flags = ((_f) | RMExt), .u.group = (_e) }
 #define G(_f, _g) { .flags = ((_f) | Group), .u.group = (_g) }
-#define GD(_f, _g) { .flags = ((_f) | Group | GroupDual), .u.gdual = (_g) }
+#define GD(_f, _g) { .flags = ((_f) | GroupDual), .u.gdual = (_g) }
 #define I(_f, _e) { .flags = (_f), .u.execute = (_e) }
 #define II(_f, _e, _i) \
        { .flags = (_f), .u.execute = (_e), .intercept = x86_intercept_##_i }
@@ -2735,9 +2942,9 @@ static int check_perm_out(struct x86_emulate_ctxt *ctxt)
 #define D2bvIP(_f, _i, _p) DIP((_f) | ByteOp, _i, _p), DIP(_f, _i, _p)
 #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)
+#define I6ALU(_f, _e) I2bv((_f) | DstMem | SrcReg | ModRM, _e),                \
+               I2bv(((_f) | DstReg | SrcMem | ModRM) & ~Lock, _e),     \
+               I2bv(((_f) & ~Lock) | DstAcc | SrcImm, _e)
 
 static struct opcode group7_rm1[] = {
        DI(SrcNone | ModRM | Priv, monitor),
@@ -2747,7 +2954,7 @@ static struct opcode group7_rm1[] = {
 
 static struct opcode group7_rm3[] = {
        DIP(SrcNone | ModRM | Prot | Priv, vmrun,   check_svme_pa),
-       DI(SrcNone | ModRM | Prot | VendorSpecific, vmmcall),
+       II(SrcNone | ModRM | Prot | VendorSpecific, em_vmmcall, vmmcall),
        DIP(SrcNone | ModRM | Prot | Priv, vmload,  check_svme_pa),
        DIP(SrcNone | ModRM | Prot | Priv, vmsave,  check_svme_pa),
        DIP(SrcNone | ModRM | Prot | Priv, stgi,    check_svme),
@@ -2761,8 +2968,16 @@ static struct opcode group7_rm7[] = {
        DIP(SrcNone | ModRM, rdtscp, check_rdtsc),
        N, N, N, N, N, N,
 };
+
 static struct opcode group1[] = {
-       X7(D(Lock)), N
+       I(Lock, em_add),
+       I(Lock, em_or),
+       I(Lock, em_adc),
+       I(Lock, em_sbb),
+       I(Lock, em_and),
+       I(Lock, em_sub),
+       I(Lock, em_xor),
+       I(0, em_cmp),
 };
 
 static struct opcode group1A[] = {
@@ -2799,15 +3014,17 @@ static struct opcode group6[] = {
 static struct group_dual group7 = { {
        DI(ModRM | Mov | DstMem | Priv, sgdt),
        DI(ModRM | Mov | DstMem | Priv, sidt),
-       DI(ModRM | SrcMem | Priv, lgdt), DI(ModRM | SrcMem | Priv, lidt),
-       DI(SrcNone | ModRM | DstMem | Mov, smsw), N,
-       DI(SrcMem16 | ModRM | Mov | Priv, lmsw),
-       DI(SrcMem | ModRM | ByteOp | Priv | NoAccess, invlpg),
+       II(ModRM | SrcMem | Priv, em_lgdt, lgdt),
+       II(ModRM | SrcMem | Priv, em_lidt, lidt),
+       II(SrcNone | ModRM | DstMem | Mov, em_smsw, smsw), N,
+       II(SrcMem16 | ModRM | Mov | Priv, em_lmsw, lmsw),
+       II(SrcMem | ModRM | ByteOp | Priv | NoAccess, em_invlpg, invlpg),
 }, {
-       D(SrcNone | ModRM | Priv | VendorSpecific), EXT(0, group7_rm1),
+       I(SrcNone | ModRM | Priv | VendorSpecific, em_vmcall),
+       EXT(0, group7_rm1),
        N, EXT(0, group7_rm3),
-       DI(SrcNone | ModRM | DstMem | Mov, smsw), N,
-       DI(SrcMem16 | ModRM | Mov | Priv, lmsw), EXT(0, group7_rm7),
+       II(SrcNone | ModRM | DstMem | Mov, em_smsw, smsw), N,
+       II(SrcMem16 | ModRM | Mov | Priv, em_lmsw, lmsw), EXT(0, group7_rm7),
 } };
 
 static struct opcode group8[] = {
@@ -2832,33 +3049,34 @@ static struct gprefix pfx_0f_6f_0f_7f = {
 
 static struct opcode opcode_table[256] = {
        /* 0x00 - 0x07 */
-       D6ALU(Lock),
+       I6ALU(Lock, em_add),
        D(ImplicitOps | Stack | No64), D(ImplicitOps | Stack | No64),
        /* 0x08 - 0x0F */
-       D6ALU(Lock),
+       I6ALU(Lock, em_or),
        D(ImplicitOps | Stack | No64), N,
        /* 0x10 - 0x17 */
-       D6ALU(Lock),
+       I6ALU(Lock, em_adc),
        D(ImplicitOps | Stack | No64), D(ImplicitOps | Stack | No64),
        /* 0x18 - 0x1F */
-       D6ALU(Lock),
+       I6ALU(Lock, em_sbb),
        D(ImplicitOps | Stack | No64), D(ImplicitOps | Stack | No64),
        /* 0x20 - 0x27 */
-       D6ALU(Lock), N, N,
+       I6ALU(Lock, em_and), N, N,
        /* 0x28 - 0x2F */
-       D6ALU(Lock), N, I(ByteOp | DstAcc | No64, em_das),
+       I6ALU(Lock, em_sub), N, I(ByteOp | DstAcc | No64, em_das),
        /* 0x30 - 0x37 */
-       D6ALU(Lock), N, N,
+       I6ALU(Lock, em_xor), N, N,
        /* 0x38 - 0x3F */
-       D6ALU(0), N, N,
+       I6ALU(0, em_cmp), N, N,
        /* 0x40 - 0x4F */
        X16(D(DstReg)),
        /* 0x50 - 0x57 */
        X8(I(SrcReg | Stack, em_push)),
        /* 0x58 - 0x5F */
-       X8(D(DstReg | Stack)),
+       X8(I(DstReg | Stack, em_pop)),
        /* 0x60 - 0x67 */
-       D(ImplicitOps | Stack | No64), D(ImplicitOps | Stack | No64),
+       I(ImplicitOps | Stack | No64, em_pusha),
+       I(ImplicitOps | Stack | No64, em_popa),
        N, D(DstReg | SrcMem32 | ModRM | Mov) /* movsxd (x86/64) */ ,
        N, N, N, N,
        /* 0x68 - 0x6F */
@@ -2866,8 +3084,8 @@ static struct opcode opcode_table[256] = {
        I(DstReg | SrcMem | ModRM | Src2Imm, em_imul_3op),
        I(SrcImmByte | Mov | Stack, em_push),
        I(DstReg | SrcMem | ModRM | Src2ImmByte, em_imul_3op),
-       D2bvIP(DstDI | Mov | String, ins, check_perm_in), /* insb, insw/insd */
-       D2bvIP(SrcSI | ImplicitOps | String, outs, check_perm_out), /* outsb, outsw/outsd */
+       D2bvIP(DstDI | SrcDX | Mov | String, ins, check_perm_in), /* insb, insw/insd */
+       D2bvIP(SrcSI | DstDX | String, outs, check_perm_out), /* outsb, outsw/outsd */
        /* 0x70 - 0x7F */
        X16(D(SrcImmByte)),
        /* 0x80 - 0x87 */
@@ -2875,28 +3093,32 @@ static struct opcode opcode_table[256] = {
        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),
+       I2bv(DstMem | SrcReg | ModRM, em_test),
+       I2bv(DstMem | SrcReg | ModRM | Lock, em_xchg),
        /* 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),
+       I(DstMem | SrcNone | ModRM | Mov, em_mov_rm_sreg),
+       D(ModRM | SrcMem | NoAccess | DstReg),
+       I(ImplicitOps | SrcMem16 | ModRM, em_mov_sreg_rm),
+       G(0, group1A),
        /* 0x90 - 0x97 */
        DI(SrcAcc | DstReg, pause), X7(D(SrcAcc | DstReg)),
        /* 0x98 - 0x9F */
        D(DstAcc | SrcNone), I(ImplicitOps | SrcAcc, em_cwd),
        I(SrcImmFAddr | No64, em_call_far), N,
-       DI(ImplicitOps | Stack, pushf), DI(ImplicitOps | Stack, popf), N, N,
+       II(ImplicitOps | Stack, em_pushf, pushf),
+       II(ImplicitOps | Stack, em_popf, popf), 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),
+       I2bv(SrcSI | DstDI | String, em_cmp),
        /* 0xA8 - 0xAF */
-       D2bv(DstAcc | SrcImm),
+       I2bv(DstAcc | SrcImm, em_test),
        I2bv(SrcAcc | DstDI | Mov | String, em_mov),
        I2bv(SrcSI | DstAcc | Mov | String, em_mov),
-       D2bv(SrcAcc | DstDI | String),
+       I2bv(SrcAcc | DstDI | String, em_cmp),
        /* 0xB0 - 0xB7 */
        X8(I(ByteOp | DstReg | SrcImm | Mov, em_mov)),
        /* 0xB8 - 0xBF */
@@ -2904,40 +3126,43 @@ static struct opcode opcode_table[256] = {
        /* 0xC0 - 0xC7 */
        D2bv(DstMem | SrcImmByte | ModRM),
        I(ImplicitOps | Stack | SrcImmU16, em_ret_near_imm),
-       D(ImplicitOps | Stack),
+       I(ImplicitOps | Stack, em_ret),
        D(DstReg | SrcMemFAddr | ModRM | No64), D(DstReg | SrcMemFAddr | ModRM | No64),
        G(ByteOp, group11), G(0, group11),
        /* 0xC8 - 0xCF */
-       N, N, N, D(ImplicitOps | Stack),
+       N, N, N, I(ImplicitOps | Stack, em_ret_far),
        D(ImplicitOps), DI(SrcImmByte, intn),
-       D(ImplicitOps | No64), DI(ImplicitOps, iret),
+       D(ImplicitOps | No64), II(ImplicitOps, em_iret, iret),
        /* 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)),
+       X3(I(SrcImmByte, em_loop)),
+       I(SrcImmByte, em_jcxz),
        D2bvIP(SrcImmUByte | DstAcc, in,  check_perm_in),
        D2bvIP(SrcAcc | DstImmUByte, out, check_perm_out),
        /* 0xE8 - 0xEF */
        D(SrcImm | Stack), D(SrcImm | ImplicitOps),
-       D(SrcImmFAddr | No64), D(SrcImmByte | ImplicitOps),
-       D2bvIP(SrcNone | DstAcc,     in,  check_perm_in),
-       D2bvIP(SrcAcc | ImplicitOps, out, check_perm_out),
+       I(SrcImmFAddr | No64, em_jmp_far), D(SrcImmByte | ImplicitOps),
+       D2bvIP(SrcDX | DstAcc, in,  check_perm_in),
+       D2bvIP(SrcAcc | DstDX, out, check_perm_out),
        /* 0xF0 - 0xF7 */
        N, DI(ImplicitOps, icebp), N, N,
        DI(ImplicitOps | Priv, hlt), D(ImplicitOps),
        G(ByteOp, group3), G(0, group3),
        /* 0xF8 - 0xFF */
-       D(ImplicitOps), D(ImplicitOps), D(ImplicitOps), D(ImplicitOps),
+       D(ImplicitOps), D(ImplicitOps),
+       I(ImplicitOps, em_cli), I(ImplicitOps, em_sti),
        D(ImplicitOps), D(ImplicitOps), G(0, group4), G(0, group5),
 };
 
 static struct opcode twobyte_table[256] = {
        /* 0x00 - 0x0F */
        G(0, group6), GD(0, &group7), N, N,
-       N, D(ImplicitOps | VendorSpecific), DI(ImplicitOps | Priv, clts), N,
+       N, I(ImplicitOps | VendorSpecific, em_syscall),
+       II(ImplicitOps | Priv, em_clts, clts), N,
        DI(ImplicitOps | Priv, invd), DI(ImplicitOps | Priv, wbinvd), N, N,
        N, D(ImplicitOps | ModRM), N, N,
        /* 0x10 - 0x1F */
@@ -2954,7 +3179,8 @@ static struct opcode twobyte_table[256] = {
        IIP(ImplicitOps, em_rdtsc, rdtsc, check_rdtsc),
        DI(ImplicitOps | Priv, rdmsr),
        DIP(ImplicitOps | Priv, rdpmc, check_rdpmc),
-       D(ImplicitOps | VendorSpecific), D(ImplicitOps | Priv | VendorSpecific),
+       I(ImplicitOps | VendorSpecific, em_sysenter),
+       I(ImplicitOps | Priv | VendorSpecific, em_sysexit),
        N, N,
        N, N, N, N, N, N, N, N,
        /* 0x40 - 0x4F */
@@ -3020,13 +3246,13 @@ static struct opcode twobyte_table[256] = {
 #undef D2bv
 #undef D2bvIP
 #undef I2bv
-#undef D6ALU
+#undef I6ALU
 
-static unsigned imm_size(struct decode_cache *c)
+static unsigned imm_size(struct x86_emulate_ctxt *ctxt)
 {
        unsigned size;
 
-       size = (c->d & ByteOp) ? 1 : c->op_bytes;
+       size = (ctxt->d & ByteOp) ? 1 : ctxt->op_bytes;
        if (size == 8)
                size = 4;
        return size;
@@ -3035,23 +3261,21 @@ static unsigned imm_size(struct decode_cache *c)
 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.ea = c->eip;
+       op->addr.mem.ea = ctxt->_eip;
        /* NB. Immediates are sign-extended as necessary. */
        switch (op->bytes) {
        case 1:
-               op->val = insn_fetch(s8, 1, c->eip);
+               op->val = insn_fetch(s8, ctxt);
                break;
        case 2:
-               op->val = insn_fetch(s16, 2, c->eip);
+               op->val = insn_fetch(s16, ctxt);
                break;
        case 4:
-               op->val = insn_fetch(s32, 4, c->eip);
+               op->val = insn_fetch(s32, ctxt);
                break;
        }
        if (!sign_extension) {
@@ -3071,24 +3295,20 @@ done:
        return rc;
 }
 
-int
-x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len)
+int x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len)
 {
-       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, simd_prefix;
+       int def_op_bytes, def_ad_bytes, goffset, simd_prefix;
        bool op_prefix = false;
-       struct opcode opcode, *g_mod012, *g_mod3;
-       struct operand memop = { .type = OP_NONE };
+       struct opcode opcode;
+       struct operand memop = { .type = OP_NONE }, *memopp = NULL;
 
-       c->eip = ctxt->eip;
-       c->fetch.start = c->eip;
-       c->fetch.end = c->fetch.start + insn_len;
+       ctxt->_eip = ctxt->eip;
+       ctxt->fetch.start = ctxt->_eip;
+       ctxt->fetch.end = ctxt->fetch.start + insn_len;
        if (insn_len > 0)
-               memcpy(c->fetch.data, insn, insn_len);
-       ctxt->cs_base = seg_base(ctxt, ops, VCPU_SREG_CS);
+               memcpy(ctxt->fetch.data, insn, insn_len);
 
        switch (mode) {
        case X86EMUL_MODE_REAL:
@@ -3106,49 +3326,49 @@ x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len)
                break;
 #endif
        default:
-               return -1;
+               return EMULATION_FAILED;
        }
 
-       c->op_bytes = def_op_bytes;
-       c->ad_bytes = def_ad_bytes;
+       ctxt->op_bytes = def_op_bytes;
+       ctxt->ad_bytes = def_ad_bytes;
 
        /* Legacy prefixes. */
        for (;;) {
-               switch (c->b = insn_fetch(u8, 1, c->eip)) {
+               switch (ctxt->b = insn_fetch(u8, ctxt)) {
                case 0x66:      /* operand-size override */
                        op_prefix = true;
                        /* switch between 2/4 bytes */
-                       c->op_bytes = def_op_bytes ^ 6;
+                       ctxt->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;
+                               ctxt->ad_bytes = def_ad_bytes ^ 12;
                        else
                                /* switch between 2/4 bytes */
-                               c->ad_bytes = def_ad_bytes ^ 6;
+                               ctxt->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);
+                       set_seg_override(ctxt, (ctxt->b >> 3) & 3);
                        break;
                case 0x64:      /* FS override */
                case 0x65:      /* GS override */
-                       set_seg_override(c, c->b & 7);
+                       set_seg_override(ctxt, ctxt->b & 7);
                        break;
                case 0x40 ... 0x4f: /* REX */
                        if (mode != X86EMUL_MODE_PROT64)
                                goto done_prefixes;
-                       c->rex_prefix = c->b;
+                       ctxt->rex_prefix = ctxt->b;
                        continue;
                case 0xf0:      /* LOCK */
-                       c->lock_prefix = 1;
+                       ctxt->lock_prefix = 1;
                        break;
                case 0xf2:      /* REPNE/REPNZ */
                case 0xf3:      /* REP/REPE/REPZ */
-                       c->rep_prefix = c->b;
+                       ctxt->rep_prefix = ctxt->b;
                        break;
                default:
                        goto done_prefixes;
@@ -3156,120 +3376,116 @@ x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len)
 
                /* Any legacy prefix after a REX prefix nullifies its effect. */
 
-               c->rex_prefix = 0;
+               ctxt->rex_prefix = 0;
        }
 
 done_prefixes:
 
        /* REX prefix. */
-       if (c->rex_prefix & 8)
-               c->op_bytes = 8;        /* REX.W */
+       if (ctxt->rex_prefix & 8)
+               ctxt->op_bytes = 8;     /* REX.W */
 
        /* Opcode byte(s). */
-       opcode = opcode_table[c->b];
+       opcode = opcode_table[ctxt->b];
        /* Two-byte opcode? */
-       if (c->b == 0x0f) {
-               c->twobyte = 1;
-               c->b = insn_fetch(u8, 1, c->eip);
-               opcode = twobyte_table[c->b];
+       if (ctxt->b == 0x0f) {
+               ctxt->twobyte = 1;
+               ctxt->b = insn_fetch(u8, ctxt);
+               opcode = twobyte_table[ctxt->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];
-
-               if (opcode.flags & RMExt) {
-                       goffset = c->modrm & 7;
+       ctxt->d = opcode.flags;
+
+       while (ctxt->d & GroupMask) {
+               switch (ctxt->d & GroupMask) {
+               case Group:
+                       ctxt->modrm = insn_fetch(u8, ctxt);
+                       --ctxt->_eip;
+                       goffset = (ctxt->modrm >> 3) & 7;
                        opcode = opcode.u.group[goffset];
+                       break;
+               case GroupDual:
+                       ctxt->modrm = insn_fetch(u8, ctxt);
+                       --ctxt->_eip;
+                       goffset = (ctxt->modrm >> 3) & 7;
+                       if ((ctxt->modrm >> 6) == 3)
+                               opcode = opcode.u.gdual->mod3[goffset];
+                       else
+                               opcode = opcode.u.gdual->mod012[goffset];
+                       break;
+               case RMExt:
+                       goffset = ctxt->modrm & 7;
+                       opcode = opcode.u.group[goffset];
+                       break;
+               case Prefix:
+                       if (ctxt->rep_prefix && op_prefix)
+                               return EMULATION_FAILED;
+                       simd_prefix = op_prefix ? 0x66 : ctxt->rep_prefix;
+                       switch (simd_prefix) {
+                       case 0x00: opcode = opcode.u.gprefix->pfx_no; break;
+                       case 0x66: opcode = opcode.u.gprefix->pfx_66; break;
+                       case 0xf2: opcode = opcode.u.gprefix->pfx_f2; break;
+                       case 0xf3: opcode = opcode.u.gprefix->pfx_f3; break;
+                       }
+                       break;
+               default:
+                       return EMULATION_FAILED;
                }
 
-               c->d |= opcode.flags;
-       }
-
-       if (c->d & Prefix) {
-               if (c->rep_prefix && op_prefix)
-                       return X86EMUL_UNHANDLEABLE;
-               simd_prefix = op_prefix ? 0x66 : c->rep_prefix;
-               switch (simd_prefix) {
-               case 0x00: opcode = opcode.u.gprefix->pfx_no; break;
-               case 0x66: opcode = opcode.u.gprefix->pfx_66; break;
-               case 0xf2: opcode = opcode.u.gprefix->pfx_f2; break;
-               case 0xf3: opcode = opcode.u.gprefix->pfx_f3; break;
-               }
-               c->d |= opcode.flags;
+               ctxt->d &= ~GroupMask;
+               ctxt->d |= opcode.flags;
        }
 
-       c->execute = opcode.u.execute;
-       c->check_perm = opcode.check_perm;
-       c->intercept = opcode.intercept;
+       ctxt->execute = opcode.u.execute;
+       ctxt->check_perm = opcode.check_perm;
+       ctxt->intercept = opcode.intercept;
 
        /* Unrecognised? */
-       if (c->d == 0 || (c->d & Undefined))
-               return -1;
+       if (ctxt->d == 0 || (ctxt->d & Undefined))
+               return EMULATION_FAILED;
 
-       if (!(c->d & VendorSpecific) && ctxt->only_vendor_specific_insn)
-               return -1;
+       if (!(ctxt->d & VendorSpecific) && ctxt->only_vendor_specific_insn)
+               return EMULATION_FAILED;
 
-       if (mode == X86EMUL_MODE_PROT64 && (c->d & Stack))
-               c->op_bytes = 8;
+       if (mode == X86EMUL_MODE_PROT64 && (ctxt->d & Stack))
+               ctxt->op_bytes = 8;
 
-       if (c->d & Op3264) {
+       if (ctxt->d & Op3264) {
                if (mode == X86EMUL_MODE_PROT64)
-                       c->op_bytes = 8;
+                       ctxt->op_bytes = 8;
                else
-                       c->op_bytes = 4;
+                       ctxt->op_bytes = 4;
        }
 
-       if (c->d & Sse)
-               c->op_bytes = 16;
+       if (ctxt->d & Sse)
+               ctxt->op_bytes = 16;
 
        /* 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 (ctxt->d & ModRM) {
+               rc = decode_modrm(ctxt, &memop);
+               if (!ctxt->has_seg_override)
+                       set_seg_override(ctxt, ctxt->modrm_seg);
+       } else if (ctxt->d & MemAbs)
+               rc = decode_abs(ctxt, &memop);
        if (rc != X86EMUL_CONTINUE)
                goto done;
 
-       if (!c->has_seg_override)
-               set_seg_override(c, VCPU_SREG_DS);
+       if (!ctxt->has_seg_override)
+               set_seg_override(ctxt, VCPU_SREG_DS);
 
-       memop.addr.mem.seg = seg_override(ctxt, ops, c);
+       memop.addr.mem.seg = seg_override(ctxt);
 
-       if (memop.type == OP_MEM && c->ad_bytes != 8)
+       if (memop.type == OP_MEM && ctxt->ad_bytes != 8)
                memop.addr.mem.ea = (u32)memop.addr.mem.ea;
 
-       if (memop.type == OP_MEM && c->rip_relative)
-               memop.addr.mem.ea += c->eip;
-
        /*
         * Decode and fetch the source operand: register, memory
         * or immediate.
         */
-       switch (c->d & SrcMask) {
+       switch (ctxt->d & SrcMask) {
        case SrcNone:
                break;
        case SrcReg:
-               decode_register_operand(ctxt, &c->src, c, 0);
+               decode_register_operand(ctxt, &ctxt->src, 0);
                break;
        case SrcMem16:
                memop.bytes = 2;
@@ -3278,54 +3494,61 @@ done_prefixes:
                memop.bytes = 4;
                goto srcmem_common;
        case SrcMem:
-               memop.bytes = (c->d & ByteOp) ? 1 :
-                                                          c->op_bytes;
+               memop.bytes = (ctxt->d & ByteOp) ? 1 :
+                                                          ctxt->op_bytes;
        srcmem_common:
-               c->src = memop;
+               ctxt->src = memop;
+               memopp = &ctxt->src;
                break;
        case SrcImmU16:
-               rc = decode_imm(ctxt, &c->src, 2, false);
+               rc = decode_imm(ctxt, &ctxt->src, 2, false);
                break;
        case SrcImm:
-               rc = decode_imm(ctxt, &c->src, imm_size(c), true);
+               rc = decode_imm(ctxt, &ctxt->src, imm_size(ctxt), true);
                break;
        case SrcImmU:
-               rc = decode_imm(ctxt, &c->src, imm_size(c), false);
+               rc = decode_imm(ctxt, &ctxt->src, imm_size(ctxt), false);
                break;
        case SrcImmByte:
-               rc = decode_imm(ctxt, &c->src, 1, true);
+               rc = decode_imm(ctxt, &ctxt->src, 1, true);
                break;
        case SrcImmUByte:
-               rc = decode_imm(ctxt, &c->src, 1, false);
+               rc = decode_imm(ctxt, &ctxt->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);
+               ctxt->src.type = OP_REG;
+               ctxt->src.bytes = (ctxt->d & ByteOp) ? 1 : ctxt->op_bytes;
+               ctxt->src.addr.reg = &ctxt->regs[VCPU_REGS_RAX];
+               fetch_register_operand(&ctxt->src);
                break;
        case SrcOne:
-               c->src.bytes = 1;
-               c->src.val = 1;
+               ctxt->src.bytes = 1;
+               ctxt->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.ea =
-                       register_address(c, c->regs[VCPU_REGS_RSI]);
-               c->src.addr.mem.seg = seg_override(ctxt, ops, c),
-               c->src.val = 0;
+               ctxt->src.type = OP_MEM;
+               ctxt->src.bytes = (ctxt->d & ByteOp) ? 1 : ctxt->op_bytes;
+               ctxt->src.addr.mem.ea =
+                       register_address(ctxt, ctxt->regs[VCPU_REGS_RSI]);
+               ctxt->src.addr.mem.seg = seg_override(ctxt);
+               ctxt->src.val = 0;
                break;
        case SrcImmFAddr:
-               c->src.type = OP_IMM;
-               c->src.addr.mem.ea = c->eip;
-               c->src.bytes = c->op_bytes + 2;
-               insn_fetch_arr(c->src.valptr, c->src.bytes, c->eip);
+               ctxt->src.type = OP_IMM;
+               ctxt->src.addr.mem.ea = ctxt->_eip;
+               ctxt->src.bytes = ctxt->op_bytes + 2;
+               insn_fetch_arr(ctxt->src.valptr, ctxt->src.bytes, ctxt);
                break;
        case SrcMemFAddr:
-               memop.bytes = c->op_bytes + 2;
+               memop.bytes = ctxt->op_bytes + 2;
                goto srcmem_common;
                break;
+       case SrcDX:
+               ctxt->src.type = OP_REG;
+               ctxt->src.bytes = 2;
+               ctxt->src.addr.reg = &ctxt->regs[VCPU_REGS_RDX];
+               fetch_register_operand(&ctxt->src);
+               break;
        }
 
        if (rc != X86EMUL_CONTINUE)
@@ -3335,22 +3558,22 @@ done_prefixes:
         * Decode and fetch the second source operand: register, memory
         * or immediate.
         */
-       switch (c->d & Src2Mask) {
+       switch (ctxt->d & Src2Mask) {
        case Src2None:
                break;
        case Src2CL:
-               c->src2.bytes = 1;
-               c->src2.val = c->regs[VCPU_REGS_RCX] & 0x8;
+               ctxt->src2.bytes = 1;
+               ctxt->src2.val = ctxt->regs[VCPU_REGS_RCX] & 0xff;
                break;
        case Src2ImmByte:
-               rc = decode_imm(ctxt, &c->src2, 1, true);
+               rc = decode_imm(ctxt, &ctxt->src2, 1, true);
                break;
        case Src2One:
-               c->src2.bytes = 1;
-               c->src2.val = 1;
+               ctxt->src2.bytes = 1;
+               ctxt->src2.val = 1;
                break;
        case Src2Imm:
-               rc = decode_imm(ctxt, &c->src2, imm_size(c), true);
+               rc = decode_imm(ctxt, &ctxt->src2, imm_size(ctxt), true);
                break;
        }
 
@@ -3358,58 +3581,66 @@ done_prefixes:
                goto done;
 
        /* Decode and fetch the destination operand: register or memory. */
-       switch (c->d & DstMask) {
+       switch (ctxt->d & DstMask) {
        case DstReg:
-               decode_register_operand(ctxt, &c->dst, c,
-                        c->twobyte && (c->b == 0xb6 || c->b == 0xb7));
+               decode_register_operand(ctxt, &ctxt->dst,
+                        ctxt->twobyte && (ctxt->b == 0xb6 || ctxt->b == 0xb7));
                break;
        case DstImmUByte:
-               c->dst.type = OP_IMM;
-               c->dst.addr.mem.ea = c->eip;
-               c->dst.bytes = 1;
-               c->dst.val = insn_fetch(u8, 1, c->eip);
+               ctxt->dst.type = OP_IMM;
+               ctxt->dst.addr.mem.ea = ctxt->_eip;
+               ctxt->dst.bytes = 1;
+               ctxt->dst.val = insn_fetch(u8, ctxt);
                break;
        case DstMem:
        case DstMem64:
-               c->dst = memop;
-               if ((c->d & DstMask) == DstMem64)
-                       c->dst.bytes = 8;
+               ctxt->dst = memop;
+               memopp = &ctxt->dst;
+               if ((ctxt->d & DstMask) == DstMem64)
+                       ctxt->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;
+                       ctxt->dst.bytes = (ctxt->d & ByteOp) ? 1 : ctxt->op_bytes;
+               if (ctxt->d & BitOp)
+                       fetch_bit_operand(ctxt);
+               ctxt->dst.orig_val = ctxt->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;
+               ctxt->dst.type = OP_REG;
+               ctxt->dst.bytes = (ctxt->d & ByteOp) ? 1 : ctxt->op_bytes;
+               ctxt->dst.addr.reg = &ctxt->regs[VCPU_REGS_RAX];
+               fetch_register_operand(&ctxt->dst);
+               ctxt->dst.orig_val = ctxt->dst.val;
                break;
        case DstDI:
-               c->dst.type = OP_MEM;
-               c->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
-               c->dst.addr.mem.ea =
-                       register_address(c, c->regs[VCPU_REGS_RDI]);
-               c->dst.addr.mem.seg = VCPU_SREG_ES;
-               c->dst.val = 0;
+               ctxt->dst.type = OP_MEM;
+               ctxt->dst.bytes = (ctxt->d & ByteOp) ? 1 : ctxt->op_bytes;
+               ctxt->dst.addr.mem.ea =
+                       register_address(ctxt, ctxt->regs[VCPU_REGS_RDI]);
+               ctxt->dst.addr.mem.seg = VCPU_SREG_ES;
+               ctxt->dst.val = 0;
+               break;
+       case DstDX:
+               ctxt->dst.type = OP_REG;
+               ctxt->dst.bytes = 2;
+               ctxt->dst.addr.reg = &ctxt->regs[VCPU_REGS_RDX];
+               fetch_register_operand(&ctxt->dst);
                break;
        case ImplicitOps:
                /* Special instructions do their own operand decoding. */
        default:
-               c->dst.type = OP_NONE; /* Disable writeback. */
-               return 0;
+               ctxt->dst.type = OP_NONE; /* Disable writeback. */
+               break;
        }
 
 done:
-       return (rc == X86EMUL_UNHANDLEABLE) ? EMULATION_FAILED : EMULATION_OK;
+       if (memopp && memopp->type == OP_MEM && ctxt->rip_relative)
+               memopp->addr.mem.ea += ctxt->_eip;
+
+       return (rc != X86EMUL_CONTINUE) ? EMULATION_FAILED : EMULATION_OK;
 }
 
 static bool string_insn_completed(struct x86_emulate_ctxt *ctxt)
 {
-       struct decode_cache *c = &ctxt->decode;
-
        /* 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
@@ -3417,379 +3648,231 @@ static bool string_insn_completed(struct x86_emulate_ctxt *ctxt)
         *      - 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) &&
+       if (((ctxt->b == 0xa6) || (ctxt->b == 0xa7) ||
+            (ctxt->b == 0xae) || (ctxt->b == 0xaf))
+           && (((ctxt->rep_prefix == REPE_PREFIX) &&
                 ((ctxt->eflags & EFLG_ZF) == 0))
-               || ((c->rep_prefix == REPNE_PREFIX) &&
+               || ((ctxt->rep_prefix == REPNE_PREFIX) &&
                    ((ctxt->eflags & EFLG_ZF) == EFLG_ZF))))
                return true;
 
        return false;
 }
 
-int
-x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
+int 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 */
+       int saved_dst_type = ctxt->dst.type;
 
-       ctxt->decode.mem_read.pos = 0;
+       ctxt->mem_read.pos = 0;
 
-       if (ctxt->mode == X86EMUL_MODE_PROT64 && (c->d & No64)) {
+       if (ctxt->mode == X86EMUL_MODE_PROT64 && (ctxt->d & No64)) {
                rc = emulate_ud(ctxt);
                goto done;
        }
 
        /* LOCK prefix is allowed only with some instructions */
-       if (c->lock_prefix && (!(c->d & Lock) || c->dst.type != OP_MEM)) {
+       if (ctxt->lock_prefix && (!(ctxt->d & Lock) || ctxt->dst.type != OP_MEM)) {
                rc = emulate_ud(ctxt);
                goto done;
        }
 
-       if ((c->d & SrcMask) == SrcMemFAddr && c->src.type != OP_MEM) {
+       if ((ctxt->d & SrcMask) == SrcMemFAddr && ctxt->src.type != OP_MEM) {
                rc = emulate_ud(ctxt);
                goto done;
        }
 
-       if ((c->d & Sse)
-           && ((ops->get_cr(0, ctxt->vcpu) & X86_CR0_EM)
-               || !(ops->get_cr(4, ctxt->vcpu) & X86_CR4_OSFXSR))) {
+       if ((ctxt->d & Sse)
+           && ((ops->get_cr(ctxt, 0) & X86_CR0_EM)
+               || !(ops->get_cr(ctxt, 4) & X86_CR4_OSFXSR))) {
                rc = emulate_ud(ctxt);
                goto done;
        }
 
-       if ((c->d & Sse) && (ops->get_cr(0, ctxt->vcpu) & X86_CR0_TS)) {
+       if ((ctxt->d & Sse) && (ops->get_cr(ctxt, 0) & X86_CR0_TS)) {
                rc = emulate_nm(ctxt);
                goto done;
        }
 
-       if (unlikely(ctxt->guest_mode) && c->intercept) {
-               rc = emulator_check_intercept(ctxt, c->intercept,
+       if (unlikely(ctxt->guest_mode) && ctxt->intercept) {
+               rc = emulator_check_intercept(ctxt, ctxt->intercept,
                                              X86_ICPT_PRE_EXCEPT);
                if (rc != X86EMUL_CONTINUE)
                        goto done;
        }
 
        /* Privileged instruction can be executed only in CPL=0 */
-       if ((c->d & Priv) && ops->cpl(ctxt->vcpu)) {
+       if ((ctxt->d & Priv) && ops->cpl(ctxt)) {
                rc = emulate_gp(ctxt, 0);
                goto done;
        }
 
        /* Instruction can only be executed in protected mode */
-       if ((c->d & Prot) && !(ctxt->mode & X86EMUL_MODE_PROT)) {
+       if ((ctxt->d & Prot) && !(ctxt->mode & X86EMUL_MODE_PROT)) {
                rc = emulate_ud(ctxt);
                goto done;
        }
 
        /* Do instruction specific permission checks */
-       if (c->check_perm) {
-               rc = c->check_perm(ctxt);
+       if (ctxt->check_perm) {
+               rc = ctxt->check_perm(ctxt);
                if (rc != X86EMUL_CONTINUE)
                        goto done;
        }
 
-       if (unlikely(ctxt->guest_mode) && c->intercept) {
-               rc = emulator_check_intercept(ctxt, c->intercept,
+       if (unlikely(ctxt->guest_mode) && ctxt->intercept) {
+               rc = emulator_check_intercept(ctxt, ctxt->intercept,
                                              X86_ICPT_POST_EXCEPT);
                if (rc != X86EMUL_CONTINUE)
                        goto done;
        }
 
-       if (c->rep_prefix && (c->d & String)) {
+       if (ctxt->rep_prefix && (ctxt->d & String)) {
                /* All REP prefixes have the same first termination condition */
-               if (address_mask(c, c->regs[VCPU_REGS_RCX]) == 0) {
-                       ctxt->eip = c->eip;
+               if (address_mask(ctxt, ctxt->regs[VCPU_REGS_RCX]) == 0) {
+                       ctxt->eip = ctxt->_eip;
                        goto done;
                }
        }
 
-       if ((c->src.type == OP_MEM) && !(c->d & NoAccess)) {
-               rc = segmented_read(ctxt, c->src.addr.mem,
-                                   c->src.valptr, c->src.bytes);
+       if ((ctxt->src.type == OP_MEM) && !(ctxt->d & NoAccess)) {
+               rc = segmented_read(ctxt, ctxt->src.addr.mem,
+                                   ctxt->src.valptr, ctxt->src.bytes);
                if (rc != X86EMUL_CONTINUE)
                        goto done;
-               c->src.orig_val64 = c->src.val64;
+               ctxt->src.orig_val64 = ctxt->src.val64;
        }
 
-       if (c->src2.type == OP_MEM) {
-               rc = segmented_read(ctxt, c->src2.addr.mem,
-                                   &c->src2.val, c->src2.bytes);
+       if (ctxt->src2.type == OP_MEM) {
+               rc = segmented_read(ctxt, ctxt->src2.addr.mem,
+                                   &ctxt->src2.val, ctxt->src2.bytes);
                if (rc != X86EMUL_CONTINUE)
                        goto done;
        }
 
-       if ((c->d & DstMask) == ImplicitOps)
+       if ((ctxt->d & DstMask) == ImplicitOps)
                goto special_insn;
 
 
-       if ((c->dst.type == OP_MEM) && !(c->d & Mov)) {
+       if ((ctxt->dst.type == OP_MEM) && !(ctxt->d & Mov)) {
                /* optimisation - avoid slow emulated read if Mov */
-               rc = segmented_read(ctxt, c->dst.addr.mem,
-                                  &c->dst.val, c->dst.bytes);
+               rc = segmented_read(ctxt, ctxt->dst.addr.mem,
+                                  &ctxt->dst.val, ctxt->dst.bytes);
                if (rc != X86EMUL_CONTINUE)
                        goto done;
        }
-       c->dst.orig_val = c->dst.val;
+       ctxt->dst.orig_val = ctxt->dst.val;
 
 special_insn:
 
-       if (unlikely(ctxt->guest_mode) && c->intercept) {
-               rc = emulator_check_intercept(ctxt, c->intercept,
+       if (unlikely(ctxt->guest_mode) && ctxt->intercept) {
+               rc = emulator_check_intercept(ctxt, ctxt->intercept,
                                              X86_ICPT_POST_MEMACCESS);
                if (rc != X86EMUL_CONTINUE)
                        goto done;
        }
 
-       if (c->execute) {
-               rc = c->execute(ctxt);
+       if (ctxt->execute) {
+               rc = ctxt->execute(ctxt);
                if (rc != X86EMUL_CONTINUE)
                        goto done;
                goto writeback;
        }
 
-       if (c->twobyte)
+       if (ctxt->twobyte)
                goto twobyte_insn;
 
-       switch (c->b) {
-       case 0x00 ... 0x05:
-             add:              /* add */
-               emulate_2op_SrcV("add", c->src, c->dst, ctxt->eflags);
-               break;
+       switch (ctxt->b) {
        case 0x06:              /* push es */
-               emulate_push_sreg(ctxt, ops, VCPU_SREG_ES);
+               rc = emulate_push_sreg(ctxt, VCPU_SREG_ES);
                break;
        case 0x07:              /* pop es */
-               rc = emulate_pop_sreg(ctxt, ops, VCPU_SREG_ES);
-               break;
-       case 0x08 ... 0x0d:
-             or:               /* or */
-               emulate_2op_SrcV("or", c->src, c->dst, ctxt->eflags);
+               rc = emulate_pop_sreg(ctxt, VCPU_SREG_ES);
                break;
        case 0x0e:              /* push cs */
-               emulate_push_sreg(ctxt, ops, VCPU_SREG_CS);
-               break;
-       case 0x10 ... 0x15:
-             adc:              /* adc */
-               emulate_2op_SrcV("adc", c->src, c->dst, ctxt->eflags);
+               rc = emulate_push_sreg(ctxt, VCPU_SREG_CS);
                break;
        case 0x16:              /* push ss */
-               emulate_push_sreg(ctxt, ops, VCPU_SREG_SS);
+               rc = emulate_push_sreg(ctxt, VCPU_SREG_SS);
                break;
        case 0x17:              /* pop ss */
-               rc = emulate_pop_sreg(ctxt, ops, VCPU_SREG_SS);
-               break;
-       case 0x18 ... 0x1d:
-             sbb:              /* sbb */
-               emulate_2op_SrcV("sbb", c->src, c->dst, ctxt->eflags);
+               rc = emulate_pop_sreg(ctxt, VCPU_SREG_SS);
                break;
        case 0x1e:              /* push ds */
-               emulate_push_sreg(ctxt, ops, VCPU_SREG_DS);
+               rc = emulate_push_sreg(ctxt, VCPU_SREG_DS);
                break;
        case 0x1f:              /* pop ds */
-               rc = emulate_pop_sreg(ctxt, ops, VCPU_SREG_DS);
-               break;
-       case 0x20 ... 0x25:
-             and:              /* and */
-               emulate_2op_SrcV("and", c->src, c->dst, ctxt->eflags);
-               break;
-       case 0x28 ... 0x2d:
-             sub:              /* sub */
-               emulate_2op_SrcV("sub", c->src, c->dst, ctxt->eflags);
-               break;
-       case 0x30 ... 0x35:
-             xor:              /* xor */
-               emulate_2op_SrcV("xor", c->src, c->dst, ctxt->eflags);
-               break;
-       case 0x38 ... 0x3d:
-             cmp:              /* cmp */
-               emulate_2op_SrcV("cmp", c->src, c->dst, ctxt->eflags);
+               rc = emulate_pop_sreg(ctxt, VCPU_SREG_DS);
                break;
        case 0x40 ... 0x47: /* inc r16/r32 */
-               emulate_1op("inc", c->dst, ctxt->eflags);
+               emulate_1op(ctxt, "inc");
                break;
        case 0x48 ... 0x4f: /* dec r16/r32 */
-               emulate_1op("dec", c->dst, ctxt->eflags);
-               break;
-       case 0x58 ... 0x5f: /* pop reg */
-       pop_instruction:
-               rc = emulate_pop(ctxt, ops, &c->dst.val, c->op_bytes);
-               break;
-       case 0x60:      /* pusha */
-               rc = emulate_pusha(ctxt, ops);
-               break;
-       case 0x61:      /* popa */
-               rc = emulate_popa(ctxt, ops);
+               emulate_1op(ctxt, "dec");
                break;
        case 0x63:              /* movsxd */
                if (ctxt->mode != X86EMUL_MODE_PROT64)
                        goto cannot_emulate;
-               c->dst.val = (s32) c->src.val;
+               ctxt->dst.val = (s32) ctxt->src.val;
                break;
        case 0x6c:              /* insb */
        case 0x6d:              /* insw/insd */
-               c->src.val = c->regs[VCPU_REGS_RDX];
+               ctxt->src.val = ctxt->regs[VCPU_REGS_RDX];
                goto do_io_in;
        case 0x6e:              /* outsb */
        case 0x6f:              /* outsw/outsd */
-               c->dst.val = c->regs[VCPU_REGS_RDX];
+               ctxt->dst.val = ctxt->regs[VCPU_REGS_RDX];
                goto do_io_out;
                break;
        case 0x70 ... 0x7f: /* jcc (short) */
-               if (test_cc(c->b, ctxt->eflags))
-                       jmp_rel(c, c->src.val);
-               break;
-       case 0x80 ... 0x83:     /* Grp1 */
-               switch (c->modrm_reg) {
-               case 0:
-                       goto add;
-               case 1:
-                       goto or;
-               case 2:
-                       goto adc;
-               case 3:
-                       goto sbb;
-               case 4:
-                       goto and;
-               case 5:
-                       goto sub;
-               case 6:
-                       goto xor;
-               case 7:
-                       goto cmp;
-               }
-               break;
-       case 0x84 ... 0x85:
-       test:
-               emulate_2op_SrcV("test", c->src, c->dst, ctxt->eflags);
-               break;
-       case 0x86 ... 0x87:     /* xchg */
-       xchg:
-               /* Write back the register source. */
-               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.orig_val;
-               c->lock_prefix = 1;
-               break;
-       case 0x8c:  /* mov r/m, sreg */
-               if (c->modrm_reg > VCPU_SREG_GS) {
-                       rc = emulate_ud(ctxt);
-                       goto done;
-               }
-               c->dst.val = ops->get_segment_selector(c->modrm_reg, ctxt->vcpu);
+               if (test_cc(ctxt->b, ctxt->eflags))
+                       jmp_rel(ctxt, ctxt->src.val);
                break;
        case 0x8d: /* lea r16/r32, m */
-               c->dst.val = c->src.addr.mem.ea;
+               ctxt->dst.val = ctxt->src.addr.mem.ea;
                break;
-       case 0x8e: { /* mov seg, r/m16 */
-               uint16_t sel;
-
-               sel = c->src.val;
-
-               if (c->modrm_reg == VCPU_SREG_CS ||
-                   c->modrm_reg > VCPU_SREG_GS) {
-                       rc = emulate_ud(ctxt);
-                       goto done;
-               }
-
-               if (c->modrm_reg == VCPU_SREG_SS)
-                       ctxt->interruptibility = KVM_X86_SHADOW_INT_MOV_SS;
-
-               rc = load_segment_descriptor(ctxt, ops, sel, c->modrm_reg);
-
-               c->dst.type = OP_NONE;  /* Disable writeback. */
-               break;
-       }
        case 0x8f:              /* pop (sole member of Grp1a) */
-               rc = emulate_grp1a(ctxt, ops);
+               rc = em_grp1a(ctxt);
                break;
        case 0x90 ... 0x97: /* nop / xchg reg, rax */
-               if (c->dst.addr.reg == &c->regs[VCPU_REGS_RAX])
+               if (ctxt->dst.addr.reg == &ctxt->regs[VCPU_REGS_RAX])
                        break;
-               goto xchg;
+               rc = em_xchg(ctxt);
+               break;
        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;
+               switch (ctxt->op_bytes) {
+               case 2: ctxt->dst.val = (s8)ctxt->dst.val; break;
+               case 4: ctxt->dst.val = (s16)ctxt->dst.val; break;
+               case 8: ctxt->dst.val = (s32)ctxt->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.addr.reg = &ctxt->eflags;
-               c->dst.bytes = c->op_bytes;
-               rc = emulate_popf(ctxt, ops, &c->dst.val, c->op_bytes);
-               break;
-       case 0xa6 ... 0xa7:     /* cmps */
-               c->dst.type = OP_NONE; /* Disable writeback. */
-               goto cmp;
-       case 0xa8 ... 0xa9:     /* test ax, imm */
-               goto test;
-       case 0xae ... 0xaf:     /* scas */
-               goto cmp;
        case 0xc0 ... 0xc1:
-               emulate_grp2(ctxt);
+               rc = em_grp2(ctxt);
                break;
-       case 0xc3: /* ret */
-               c->dst.type = OP_REG;
-               c->dst.addr.reg = &c->eip;
-               c->dst.bytes = c->op_bytes;
-               goto pop_instruction;
        case 0xc4:              /* les */
-               rc = emulate_load_segment(ctxt, ops, VCPU_SREG_ES);
+               rc = emulate_load_segment(ctxt, 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);
+               rc = emulate_load_segment(ctxt, VCPU_SREG_DS);
                break;
        case 0xcc:              /* int3 */
-               irq = 3;
-               goto do_interrupt;
+               rc = emulate_int(ctxt, 3);
+               break;
        case 0xcd:              /* int n */
-               irq = c->src.val;
-       do_interrupt:
-               rc = emulate_int(ctxt, ops, irq);
+               rc = emulate_int(ctxt, ctxt->src.val);
                break;
        case 0xce:              /* into */
-               if (ctxt->eflags & EFLG_OF) {
-                       irq = 4;
-                       goto do_interrupt;
-               }
-               break;
-       case 0xcf:              /* iret */
-               rc = emulate_iret(ctxt, ops);
+               if (ctxt->eflags & EFLG_OF)
+                       rc = emulate_int(ctxt, 4);
                break;
        case 0xd0 ... 0xd1:     /* Grp2 */
-               emulate_grp2(ctxt);
+               rc = em_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);
+               ctxt->src.val = ctxt->regs[VCPU_REGS_RCX];
+               rc = em_grp2(ctxt);
                break;
        case 0xe4:      /* inb */
        case 0xe5:      /* in */
@@ -3798,56 +3881,40 @@ special_insn:
        case 0xe7: /* out */
                goto do_io_out;
        case 0xe8: /* call (near) */ {
-               long int rel = c->src.val;
-               c->src.val = (unsigned long) c->eip;
-               jmp_rel(c, rel);
-               emulate_push(ctxt, ops);
+               long int rel = ctxt->src.val;
+               ctxt->src.val = (unsigned long) ctxt->_eip;
+               jmp_rel(ctxt, rel);
+               rc = em_push(ctxt);
                break;
        }
        case 0xe9: /* jmp rel */
-               goto jmp;
-       case 0xea: { /* jmp far */
-               unsigned short sel;
-       jump_far:
-               memcpy(&sel, c->src.valptr + c->op_bytes, 2);
-
-               if (load_segment_descriptor(ctxt, ops, sel, VCPU_SREG_CS))
-                       goto done;
-
-               c->eip = 0;
-               memcpy(&c->eip, c->src.valptr, c->op_bytes);
-               break;
-       }
-       case 0xeb:
-             jmp:              /* jmp rel short */
-               jmp_rel(c, c->src.val);
-               c->dst.type = OP_NONE; /* Disable writeback. */
+       case 0xeb: /* jmp rel short */
+               jmp_rel(ctxt, ctxt->src.val);
+               ctxt->dst.type = OP_NONE; /* Disable writeback. */
                break;
        case 0xec: /* in al,dx */
        case 0xed: /* in (e/r)ax,dx */
-               c->src.val = c->regs[VCPU_REGS_RDX];
        do_io_in:
-               if (!pio_in_emulated(ctxt, ops, c->dst.bytes, c->src.val,
-                                    &c->dst.val))
+               if (!pio_in_emulated(ctxt, ctxt->dst.bytes, ctxt->src.val,
+                                    &ctxt->dst.val))
                        goto done; /* IO is needed */
                break;
        case 0xee: /* out dx,al */
        case 0xef: /* out dx,(e/r)ax */
-               c->dst.val = c->regs[VCPU_REGS_RDX];
        do_io_out:
-               ops->pio_out_emulated(c->src.bytes, c->dst.val,
-                                     &c->src.val, 1, ctxt->vcpu);
-               c->dst.type = OP_NONE;  /* Disable writeback. */
+               ops->pio_out_emulated(ctxt, ctxt->src.bytes, ctxt->dst.val,
+                                     &ctxt->src.val, 1);
+               ctxt->dst.type = OP_NONE;       /* Disable writeback. */
                break;
        case 0xf4:              /* hlt */
-               ctxt->vcpu->arch.halt_request = 1;
+               ctxt->ops->halt(ctxt);
                break;
        case 0xf5:      /* cmc */
                /* complement carry flag from eflags reg */
                ctxt->eflags ^= EFLG_CF;
                break;
        case 0xf6 ... 0xf7:     /* Grp3 */
-               rc = emulate_grp3(ctxt, ops);
+               rc = em_grp3(ctxt);
                break;
        case 0xf8: /* clc */
                ctxt->eflags &= ~EFLG_CF;
@@ -3855,22 +3922,6 @@ special_insn:
        case 0xf9: /* stc */
                ctxt->eflags |= EFLG_CF;
                break;
-       case 0xfa: /* cli */
-               if (emulator_bad_iopl(ctxt, ops)) {
-                       rc = emulate_gp(ctxt, 0);
-                       goto done;
-               } else
-                       ctxt->eflags &= ~X86_EFLAGS_IF;
-               break;
-       case 0xfb: /* sti */
-               if (emulator_bad_iopl(ctxt, ops)) {
-                       rc = emulate_gp(ctxt, 0);
-                       goto done;
-               } else {
-                       ctxt->interruptibility = KVM_X86_SHADOW_INT_STI;
-                       ctxt->eflags |= X86_EFLAGS_IF;
-               }
-               break;
        case 0xfc: /* cld */
                ctxt->eflags &= ~EFLG_DF;
                break;
@@ -3878,13 +3929,11 @@ special_insn:
                ctxt->eflags |= EFLG_DF;
                break;
        case 0xfe: /* Grp4 */
-       grp45:
-               rc = emulate_grp45(ctxt, ops);
+               rc = em_grp45(ctxt);
                break;
        case 0xff: /* Grp5 */
-               if (c->modrm_reg == 5)
-                       goto jump_far;
-               goto grp45;
+               rc = em_grp45(ctxt);
+               break;
        default:
                goto cannot_emulate;
        }
@@ -3893,7 +3942,7 @@ special_insn:
                goto done;
 
 writeback:
-       rc = writeback(ctxt, ops);
+       rc = writeback(ctxt);
        if (rc != X86EMUL_CONTINUE)
                goto done;
 
@@ -3901,40 +3950,40 @@ writeback:
         * restore dst type in case the decoding will be reused
         * (happens for string instruction )
         */
-       c->dst.type = saved_dst_type;
+       ctxt->dst.type = saved_dst_type;
 
-       if ((c->d & SrcMask) == SrcSI)
-               string_addr_inc(ctxt, seg_override(ctxt, ops, c),
-                               VCPU_REGS_RSI, &c->src);
+       if ((ctxt->d & SrcMask) == SrcSI)
+               string_addr_inc(ctxt, seg_override(ctxt),
+                               VCPU_REGS_RSI, &ctxt->src);
 
-       if ((c->d & DstMask) == DstDI)
+       if ((ctxt->d & DstMask) == DstDI)
                string_addr_inc(ctxt, VCPU_SREG_ES, VCPU_REGS_RDI,
-                               &c->dst);
+                               &ctxt->dst);
 
-       if (c->rep_prefix && (c->d & String)) {
-               struct read_cache *r = &ctxt->decode.io_read;
-               register_address_increment(c, &c->regs[VCPU_REGS_RCX], -1);
+       if (ctxt->rep_prefix && (ctxt->d & String)) {
+               struct read_cache *r = &ctxt->io_read;
+               register_address_increment(ctxt, &ctxt->regs[VCPU_REGS_RCX], -1);
 
                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) &&
+                       if ((r->end != 0 || ctxt->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;
+                               ctxt->mem_read.end = 0;
                                return EMULATION_RESTART;
                        }
                        goto done; /* skip rip writeback */
                }
        }
 
-       ctxt->eip = c->eip;
+       ctxt->eip = ctxt->_eip;
 
 done:
        if (rc == X86EMUL_PROPAGATE_FAULT)
@@ -3945,118 +3994,45 @@ done:
        return (rc == X86EMUL_UNHANDLEABLE) ? EMULATION_FAILED : EMULATION_OK;
 
 twobyte_insn:
-       switch (c->b) {
-       case 0x01: /* lgdt, lidt, lmsw */
-               switch (c->modrm_reg) {
-                       u16 size;
-                       unsigned long address;
-
-               case 0: /* vmcall */
-                       if (c->modrm_mod != 3 || c->modrm_rm != 1)
-                               goto cannot_emulate;
-
-                       rc = kvm_fix_hypercall(ctxt->vcpu);
-                       if (rc != X86EMUL_CONTINUE)
-                               goto done;
-
-                       /* Let the processor re-execute the fixed hypercall */
-                       c->eip = ctxt->eip;
-                       /* Disable writeback. */
-                       c->dst.type = OP_NONE;
-                       break;
-               case 2: /* lgdt */
-                       rc = read_descriptor(ctxt, ops, c->src.addr.mem,
-                                            &size, &address, c->op_bytes);
-                       if (rc != X86EMUL_CONTINUE)
-                               goto done;
-                       realmode_lgdt(ctxt->vcpu, size, address);
-                       /* Disable writeback. */
-                       c->dst.type = OP_NONE;
-                       break;
-               case 3: /* lidt/vmmcall */
-                       if (c->modrm_mod == 3) {
-                               switch (c->modrm_rm) {
-                               case 1:
-                                       rc = kvm_fix_hypercall(ctxt->vcpu);
-                                       break;
-                               default:
-                                       goto cannot_emulate;
-                               }
-                       } else {
-                               rc = read_descriptor(ctxt, ops, c->src.addr.mem,
-                                                    &size, &address,
-                                                    c->op_bytes);
-                               if (rc != X86EMUL_CONTINUE)
-                                       goto done;
-                               realmode_lidt(ctxt->vcpu, size, address);
-                       }
-                       /* Disable writeback. */
-                       c->dst.type = OP_NONE;
-                       break;
-               case 4: /* smsw */
-                       c->dst.bytes = 2;
-                       c->dst.val = ops->get_cr(0, ctxt->vcpu);
-                       break;
-               case 6: /* lmsw */
-                       ops->set_cr(0, (ops->get_cr(0, ctxt->vcpu) & ~0x0eul) |
-                                   (c->src.val & 0x0f), ctxt->vcpu);
-                       c->dst.type = OP_NONE;
-                       break;
-               case 5: /* not defined */
-                       emulate_ud(ctxt);
-                       rc = X86EMUL_PROPAGATE_FAULT;
-                       goto done;
-               case 7: /* invlpg*/
-                       rc = em_invlpg(ctxt);
-                       break;
-               default:
-                       goto cannot_emulate;
-               }
-               break;
-       case 0x05:              /* syscall */
-               rc = emulate_syscall(ctxt, ops);
-               break;
-       case 0x06:
-               emulate_clts(ctxt->vcpu);
-               break;
+       switch (ctxt->b) {
        case 0x09:              /* wbinvd */
-               kvm_emulate_wbinvd(ctxt->vcpu);
+               (ctxt->ops->wbinvd)(ctxt);
                break;
        case 0x08:              /* invd */
        case 0x0d:              /* GrpP (prefetch) */
        case 0x18:              /* Grp16 (prefetch/nop) */
                break;
        case 0x20: /* mov cr, reg */
-               c->dst.val = ops->get_cr(c->modrm_reg, ctxt->vcpu);
+               ctxt->dst.val = ops->get_cr(ctxt, ctxt->modrm_reg);
                break;
        case 0x21: /* mov from dr to reg */
-               ops->get_dr(c->modrm_reg, &c->dst.val, ctxt->vcpu);
+               ops->get_dr(ctxt, ctxt->modrm_reg, &ctxt->dst.val);
                break;
        case 0x22: /* mov reg, cr */
-               if (ops->set_cr(c->modrm_reg, c->src.val, ctxt->vcpu)) {
+               if (ops->set_cr(ctxt, ctxt->modrm_reg, ctxt->src.val)) {
                        emulate_gp(ctxt, 0);
                        rc = X86EMUL_PROPAGATE_FAULT;
                        goto done;
                }
-               c->dst.type = OP_NONE;
+               ctxt->dst.type = OP_NONE;
                break;
        case 0x23: /* mov from reg to dr */
-               if (ops->set_dr(c->modrm_reg, c->src.val &
+               if (ops->set_dr(ctxt, ctxt->modrm_reg, ctxt->src.val &
                                ((ctxt->mode == X86EMUL_MODE_PROT64) ?
-                                ~0ULL : ~0U), ctxt->vcpu) < 0) {
+                                ~0ULL : ~0U)) < 0) {
                        /* #UD condition is already handled by the code above */
                        emulate_gp(ctxt, 0);
                        rc = X86EMUL_PROPAGATE_FAULT;
                        goto done;
                }
 
-               c->dst.type = OP_NONE;  /* no writeback */
+               ctxt->dst.type = OP_NONE;       /* no writeback */
                break;
        case 0x30:
                /* wrmsr */
-               msr_data = (u32)c->regs[VCPU_REGS_RAX]
-                       | ((u64)c->regs[VCPU_REGS_RDX] << 32);
-               if (ops->set_msr(ctxt->vcpu, c->regs[VCPU_REGS_RCX], msr_data)) {
+               msr_data = (u32)ctxt->regs[VCPU_REGS_RAX]
+                       | ((u64)ctxt->regs[VCPU_REGS_RDX] << 32);
+               if (ops->set_msr(ctxt, ctxt->regs[VCPU_REGS_RCX], msr_data)) {
                        emulate_gp(ctxt, 0);
                        rc = X86EMUL_PROPAGATE_FAULT;
                        goto done;
@@ -4065,64 +4041,58 @@ twobyte_insn:
                break;
        case 0x32:
                /* rdmsr */
-               if (ops->get_msr(ctxt->vcpu, c->regs[VCPU_REGS_RCX], &msr_data)) {
+               if (ops->get_msr(ctxt, ctxt->regs[VCPU_REGS_RCX], &msr_data)) {
                        emulate_gp(ctxt, 0);
                        rc = X86EMUL_PROPAGATE_FAULT;
                        goto done;
                } else {
-                       c->regs[VCPU_REGS_RAX] = (u32)msr_data;
-                       c->regs[VCPU_REGS_RDX] = msr_data >> 32;
+                       ctxt->regs[VCPU_REGS_RAX] = (u32)msr_data;
+                       ctxt->regs[VCPU_REGS_RDX] = msr_data >> 32;
                }
                rc = X86EMUL_CONTINUE;
                break;
-       case 0x34:              /* sysenter */
-               rc = emulate_sysenter(ctxt, ops);
-               break;
-       case 0x35:              /* sysexit */
-               rc = emulate_sysexit(ctxt, ops);
-               break;
        case 0x40 ... 0x4f:     /* cmov */
-               c->dst.val = c->dst.orig_val = c->src.val;
-               if (!test_cc(c->b, ctxt->eflags))
-                       c->dst.type = OP_NONE; /* no writeback */
+               ctxt->dst.val = ctxt->dst.orig_val = ctxt->src.val;
+               if (!test_cc(ctxt->b, ctxt->eflags))
+                       ctxt->dst.type = OP_NONE; /* no writeback */
                break;
        case 0x80 ... 0x8f: /* jnz rel, etc*/
-               if (test_cc(c->b, ctxt->eflags))
-                       jmp_rel(c, c->src.val);
+               if (test_cc(ctxt->b, ctxt->eflags))
+                       jmp_rel(ctxt, ctxt->src.val);
                break;
        case 0x90 ... 0x9f:     /* setcc r/m8 */
-               c->dst.val = test_cc(c->b, ctxt->eflags);
+               ctxt->dst.val = test_cc(ctxt->b, ctxt->eflags);
                break;
        case 0xa0:        /* push fs */
-               emulate_push_sreg(ctxt, ops, VCPU_SREG_FS);
+               rc = emulate_push_sreg(ctxt, VCPU_SREG_FS);
                break;
        case 0xa1:       /* pop fs */
-               rc = emulate_pop_sreg(ctxt, ops, VCPU_SREG_FS);
+               rc = emulate_pop_sreg(ctxt, VCPU_SREG_FS);
                break;
        case 0xa3:
              bt:               /* bt */
-               c->dst.type = OP_NONE;
+               ctxt->dst.type = OP_NONE;
                /* only subword offset */
-               c->src.val &= (c->dst.bytes << 3) - 1;
-               emulate_2op_SrcV_nobyte("bt", c->src, c->dst, ctxt->eflags);
+               ctxt->src.val &= (ctxt->dst.bytes << 3) - 1;
+               emulate_2op_SrcV_nobyte(ctxt, "bt");
                break;
        case 0xa4: /* shld imm8, r, r/m */
        case 0xa5: /* shld cl, r, r/m */
-               emulate_2op_cl("shld", c->src2, c->src, c->dst, ctxt->eflags);
+               emulate_2op_cl(ctxt, "shld");
                break;
        case 0xa8:      /* push gs */
-               emulate_push_sreg(ctxt, ops, VCPU_SREG_GS);
+               rc = emulate_push_sreg(ctxt, VCPU_SREG_GS);
                break;
        case 0xa9:      /* pop gs */
-               rc = emulate_pop_sreg(ctxt, ops, VCPU_SREG_GS);
+               rc = emulate_pop_sreg(ctxt, VCPU_SREG_GS);
                break;
        case 0xab:
              bts:              /* bts */
-               emulate_2op_SrcV_nobyte("bts", c->src, c->dst, ctxt->eflags);
+               emulate_2op_SrcV_nobyte(ctxt, "bts");
                break;
        case 0xac: /* shrd imm8, r, r/m */
        case 0xad: /* shrd cl, r, r/m */
-               emulate_2op_cl("shrd", c->src2, c->src, c->dst, ctxt->eflags);
+               emulate_2op_cl(ctxt, "shrd");
                break;
        case 0xae:              /* clflush */
                break;
@@ -4131,38 +4101,38 @@ twobyte_insn:
                 * Save real source value, then compare EAX against
                 * destination.
                 */
-               c->src.orig_val = c->src.val;
-               c->src.val = c->regs[VCPU_REGS_RAX];
-               emulate_2op_SrcV("cmp", c->src, c->dst, ctxt->eflags);
+               ctxt->src.orig_val = ctxt->src.val;
+               ctxt->src.val = ctxt->regs[VCPU_REGS_RAX];
+               emulate_2op_SrcV(ctxt, "cmp");
                if (ctxt->eflags & EFLG_ZF) {
                        /* Success: write back to memory. */
-                       c->dst.val = c->src.orig_val;
+                       ctxt->dst.val = ctxt->src.orig_val;
                } else {
                        /* Failure: write the value we saw to EAX. */
-                       c->dst.type = OP_REG;
-                       c->dst.addr.reg = (unsigned long *)&c->regs[VCPU_REGS_RAX];
+                       ctxt->dst.type = OP_REG;
+                       ctxt->dst.addr.reg = (unsigned long *)&ctxt->regs[VCPU_REGS_RAX];
                }
                break;
        case 0xb2:              /* lss */
-               rc = emulate_load_segment(ctxt, ops, VCPU_SREG_SS);
+               rc = emulate_load_segment(ctxt, VCPU_SREG_SS);
                break;
        case 0xb3:
              btr:              /* btr */
-               emulate_2op_SrcV_nobyte("btr", c->src, c->dst, ctxt->eflags);
+               emulate_2op_SrcV_nobyte(ctxt, "btr");
                break;
        case 0xb4:              /* lfs */
-               rc = emulate_load_segment(ctxt, ops, VCPU_SREG_FS);
+               rc = emulate_load_segment(ctxt, VCPU_SREG_FS);
                break;
        case 0xb5:              /* lgs */
-               rc = emulate_load_segment(ctxt, ops, VCPU_SREG_GS);
+               rc = emulate_load_segment(ctxt, VCPU_SREG_GS);
                break;
        case 0xb6 ... 0xb7:     /* movzx */
-               c->dst.bytes = c->op_bytes;
-               c->dst.val = (c->d & ByteOp) ? (u8) c->src.val
-                                                      : (u16) c->src.val;
+               ctxt->dst.bytes = ctxt->op_bytes;
+               ctxt->dst.val = (ctxt->d & ByteOp) ? (u8) ctxt->src.val
+                                                      : (u16) ctxt->src.val;
                break;
        case 0xba:              /* Grp8 */
-               switch (c->modrm_reg & 3) {
+               switch (ctxt->modrm_reg & 3) {
                case 0:
                        goto bt;
                case 1:
@@ -4175,50 +4145,50 @@ twobyte_insn:
                break;
        case 0xbb:
              btc:              /* btc */
-               emulate_2op_SrcV_nobyte("btc", c->src, c->dst, ctxt->eflags);
+               emulate_2op_SrcV_nobyte(ctxt, "btc");
                break;
        case 0xbc: {            /* bsf */
                u8 zf;
                __asm__ ("bsf %2, %0; setz %1"
-                        : "=r"(c->dst.val), "=q"(zf)
-                        : "r"(c->src.val));
+                        : "=r"(ctxt->dst.val), "=q"(zf)
+                        : "r"(ctxt->src.val));
                ctxt->eflags &= ~X86_EFLAGS_ZF;
                if (zf) {
                        ctxt->eflags |= X86_EFLAGS_ZF;
-                       c->dst.type = OP_NONE;  /* Disable writeback. */
+                       ctxt->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));
+                        : "=r"(ctxt->dst.val), "=q"(zf)
+                        : "r"(ctxt->src.val));
                ctxt->eflags &= ~X86_EFLAGS_ZF;
                if (zf) {
                        ctxt->eflags |= X86_EFLAGS_ZF;
-                       c->dst.type = OP_NONE;  /* Disable writeback. */
+                       ctxt->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;
+               ctxt->dst.bytes = ctxt->op_bytes;
+               ctxt->dst.val = (ctxt->d & ByteOp) ? (s8) ctxt->src.val :
+                                                       (s16) ctxt->src.val;
                break;
        case 0xc0 ... 0xc1:     /* xadd */
-               emulate_2op_SrcV("add", c->src, c->dst, ctxt->eflags);
+               emulate_2op_SrcV(ctxt, "add");
                /* Write back the register source. */
-               c->src.val = c->dst.orig_val;
-               write_register_operand(&c->src);
+               ctxt->src.val = ctxt->dst.orig_val;
+               write_register_operand(&ctxt->src);
                break;
        case 0xc3:              /* movnti */
-               c->dst.bytes = c->op_bytes;
-               c->dst.val = (c->op_bytes == 4) ? (u32) c->src.val :
-                                                       (u64) c->src.val;
+               ctxt->dst.bytes = ctxt->op_bytes;
+               ctxt->dst.val = (ctxt->op_bytes == 4) ? (u32) ctxt->src.val :
+                                                       (u64) ctxt->src.val;
                break;
        case 0xc7:              /* Grp9 (cmpxchg8b) */
-               rc = emulate_grp9(ctxt, ops);
+               rc = em_grp9(ctxt);
                break;
        default:
                goto cannot_emulate;