diff options
author | Avi Kivity <avi@redhat.com> | 2010-07-29 08:11:49 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2010-10-24 04:50:20 -0400 |
commit | ab85b12b1a7fd125588f9447653a71ec8e1b5024 (patch) | |
tree | 7577a67c4579d4ca9e68e17cc73f842b42a62c79 | |
parent | 3885d530b0eb26c82b6f085c181442b0aa6f8fed (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.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 20a7a167df1d..d7e3ea4797f1 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c | |||
@@ -46,15 +46,15 @@ | |||
46 | */ | 46 | */ |
47 | 47 | ||
48 | /* Operand sizes: 8-bit operands or specified/overridden size. */ | 48 | /* Operand sizes: 8-bit operands or specified/overridden size. */ |
49 | #define ByteOp (1<<16) /* 8-bit operands. */ | 49 | #define ByteOp (1<<0) /* 8-bit operands. */ |
50 | /* Destination operand type. */ | 50 | /* Destination operand type. */ |
51 | #define ImplicitOps (1<<17) /* Implicit in opcode. No generic decode. */ | 51 | #define ImplicitOps (1<<1) /* Implicit in opcode. No generic decode. */ |
52 | #define DstReg (2<<17) /* Register operand. */ | 52 | #define DstReg (2<<1) /* Register operand. */ |
53 | #define DstMem (3<<17) /* Memory operand. */ | 53 | #define DstMem (3<<1) /* Memory operand. */ |
54 | #define DstAcc (4<<17) /* Destination Accumulator */ | 54 | #define DstAcc (4<<1) /* Destination Accumulator */ |
55 | #define DstDI (5<<17) /* Destination is in ES:(E)DI */ | 55 | #define DstDI (5<<1) /* Destination is in ES:(E)DI */ |
56 | #define DstMem64 (6<<17) /* 64bit memory operand */ | 56 | #define DstMem64 (6<<1) /* 64bit memory operand */ |
57 | #define DstMask (7<<17) | 57 | #define DstMask (7<<1) |
58 | /* Source operand type. */ | 58 | /* Source operand type. */ |
59 | #define SrcNone (0<<4) /* No source operand. */ | 59 | #define SrcNone (0<<4) /* No source operand. */ |
60 | #define SrcImplicit (0<<4) /* Source operand is implicit in the opcode. */ | 60 | #define SrcImplicit (0<<4) /* Source operand is implicit in the opcode. */ |