KVM: x86 emulator: simplify instruction decode flags for opcodes A0-AF

Use the new byte/word dual opcode decode.

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 661013fdb3b6d8a74731c27af3d815e765862b5d..d59e54bb58902dc4f0414ec6ea59e12c430e537b 100644 (file)
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -2451,11 +2451,11 @@ static struct opcode opcode_table[256] = {
        I(SrcImmFAddr | No64, em_call_far), N,
        D(ImplicitOps | Stack), D(ImplicitOps | Stack), N, N,
        /* 0xA0 - 0xA7 */
-       D(ByteOp | DstAcc | SrcMem | Mov | MemAbs), D(DstAcc | SrcMem | Mov | MemAbs),
-       D(ByteOp | DstMem | SrcAcc | Mov | MemAbs), D(DstMem | SrcAcc | Mov | MemAbs),
+       D2bv(DstAcc | SrcMem | Mov | MemAbs),
+       D2bv(DstMem | SrcAcc | Mov | MemAbs),
        D2bv(SrcSI | DstDI | Mov | String), D2bv(SrcSI | DstDI | String),
        /* 0xA8 - 0xAF */
-       D(DstAcc | SrcImmByte | ByteOp), D(DstAcc | SrcImm),
+       D2bv(DstAcc | SrcImm),
        D2bv(SrcAcc | DstDI | Mov | String),
        D2bv(SrcSI | DstAcc | Mov | String),
        D2bv(SrcAcc | DstDI | String),