Commit 2ce49536 authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: x86 emulator: Make group storage bits separate from operand bits 



Currently group bits are stored in bits 0:7, where operand bits are stored.

Make group bits be 0:3, and move the existing bits 0:3 to 16:19, so we can
mix group and operand bits.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 880a1883

arch/x86/kvm/emulate.c

+9 −9
Original line number Diff line number Diff line
@@ -46,15 +46,15 @@ 
 */



/* Operand sizes: 8-bit operands or specified/overridden size. */

#define ByteOp      (1<<0)	/* 8-bit operands. */

#define ByteOp      (1<<16)	/* 8-bit operands. */

/* Destination operand type. */

#define ImplicitOps (1<<1)	/* Implicit in opcode. No generic decode. */

#define DstReg      (2<<1)	/* Register operand. */

#define DstMem      (3<<1)	/* Memory operand. */

#define DstAcc      (4<<1)      /* Destination Accumulator */

#define DstDI       (5<<1)	/* Destination is in ES:(E)DI */

#define DstMem64    (6<<1)	/* 64bit memory operand */

#define DstMask     (7<<1)

#define ImplicitOps (1<<17)	/* Implicit in opcode. No generic decode. */

#define DstReg      (2<<17)	/* Register operand. */

#define DstMem      (3<<17)	/* Memory operand. */

#define DstAcc      (4<<17)	/* Destination Accumulator */

#define DstDI       (5<<17)	/* Destination is in ES:(E)DI */

#define DstMem64    (6<<17)	/* 64bit memory operand */

#define DstMask     (7<<17)

/* Source operand type. */

#define SrcNone     (0<<4)	/* No source operand. */

#define SrcImplicit (0<<4)	/* Source operand is implicit in the opcode. */
@@ -82,7 +82,7 @@ 
#define Stack       (1<<13)     /* Stack instruction (push/pop) */

#define Group       (1<<14)     /* Bits 3:5 of modrm byte extend opcode */

#define GroupDual   (1<<15)     /* Alternate decoding of mod == 3 */

#define GroupMask   0xff        /* Group number stored in bits 0:7 */

#define GroupMask   0x0f        /* Group number stored in bits 0:3 */

/* Misc flags */

#define Lock        (1<<26) /* lock prefix is allowed for the instruction */

#define Priv        (1<<27) /* instruction generates #GP if current CPL != 0 */