summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2010-07-29 15:11:49 +0300
committerAvi Kivity <avi@redhat.com>2010-10-24 10:50:20 +0200
commitab85b12b1a7fd125588f9447653a71ec8e1b5024 (patch)
tree7577a67c4579d4ca9e68e17cc73f842b42a62c79
parent3885d530b0eb26c82b6f085c181442b0aa6f8fed (diff)
KVM: x86 emulator: move ByteOp and Dst back to bits 0:3
Now that the group index no longer exists, the space is free. Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r--arch/x86/kvm/emulate.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 20a7a167df1..d7e3ea4797f 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -46,15 +46,15 @@
*/
/* Operand sizes: 8-bit operands or specified/overridden size. */
-#define ByteOp (1<<16) /* 8-bit operands. */
+#define ByteOp (1<<0) /* 8-bit operands. */
/* Destination operand type. */
-#define ImplicitOps (1<<17) /* Implicit in opcode. No generic decode. */
-#define DstReg (2<<17) /* Register operand. */
-#define DstMem (3<<17) /* Memory operand. */
-#define DstAcc (4<<17) /* Destination Accumulator */
-#define DstDI (5<<17) /* Destination is in ES:(E)DI */
-#define DstMem64 (6<<17) /* 64bit memory operand */
-#define DstMask (7<<17)
+#define ImplicitOps (1<<1) /* Implicit in opcode. No generic decode. */
+#define DstReg (2<<1) /* Register operand. */
+#define DstMem (3<<1) /* Memory operand. */
+#define DstAcc (4<<1) /* Destination Accumulator */
+#define DstDI (5<<1) /* Destination is in ES:(E)DI */
+#define DstMem64 (6<<1) /* 64bit memory operand */
+#define DstMask (7<<1)
/* Source operand type. */
#define SrcNone (0<<4) /* No source operand. */
#define SrcImplicit (0<<4) /* Source operand is implicit in the opcode. */