Re: [PATCH v2 6/8] KVM: x86 emulator: simplify instruction decode flags for opcodes C0-DF

Wei Yongjun
2010-08-26T08:48:45Z

> Use the new byte/word dual opcode decode.
>
> Signed-off-by: Avi Kivity <avi@redhat.com>
> ---
> arch/x86/kvm/emulate.c | 7 +++----
> 1 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
> index 935f98e..2610fc5 100644
> --- a/arch/x86/kvm/emulate.c
> +++ b/arch/x86/kvm/emulate.c
> @@ -2466,17 +2466,16 @@ static struct opcode opcode_table[256] = {
> /* 0xB8 - 0xBF */
> X8(D(DstReg | SrcImm | Mov)),
> /* 0xC0 - 0xC7 */
> - D(ByteOp | DstMem | SrcImm | ModRM), D(DstMem | SrcImmByte | ModRM),
> + D2bv(DstMem | SrcImm | ModRM),
>

0xC1 takes imm8 as the source operand. So D2bv can not be used here.

> I(ImplicitOps | Stack | SrcImmU16, em_ret_near_imm),
> D(ImplicitOps | Stack),
> D(DstReg | SrcMemFAddr | ModRM | No64), D(DstReg | SrcMemFAddr | ModRM | No64),
> - D(ByteOp | DstMem | SrcImm | ModRM | Mov), D(DstMem | SrcImm | ModRM | Mov),
> + D2bv(DstMem | SrcImm | ModRM | Mov),
> /* 0xC8 - 0xCF */
> N, N, N, D(ImplicitOps | Stack),
> D(ImplicitOps), D(SrcImmByte), D(ImplicitOps | No64), D(ImplicitOps),
> /* 0xD0 - 0xD7 */
> - D(ByteOp | DstMem | SrcOne | ModRM), D(DstMem | SrcOne | ModRM),
> - D(ByteOp | DstMem | ModRM), D(DstMem | ModRM),
> + D2bv(DstMem | SrcOne | ModRM), D2bv(DstMem | ModRM),
> N, N, N, N,
> /* 0xD8 - 0xDF */
> N, N, N, N, N, N, N, N,
>