Commit 1a0c7d44 authored by Avi Kivity's avatar Avi Kivity

KVM: x86 emulator: use struct operand for mov reg,cr and mov cr,reg for reg op

This is an ordinary modrm source or destination; use the standard structure
representing it.
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent cecc9e39
...@@ -2210,8 +2210,8 @@ static struct opcode twobyte_table[256] = { ...@@ -2210,8 +2210,8 @@ static struct opcode twobyte_table[256] = {
/* 0x10 - 0x1F */ /* 0x10 - 0x1F */
N, N, N, N, N, N, N, N, D(ImplicitOps | ModRM), N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, D(ImplicitOps | ModRM), N, N, N, N, N, N, N,
/* 0x20 - 0x2F */ /* 0x20 - 0x2F */
D(ModRM | ImplicitOps | Priv | Op3264), D(ModRM | Priv | Op3264), D(ModRM | DstMem | Priv | Op3264), D(ModRM | Priv | Op3264),
D(ModRM | ImplicitOps | Priv | Op3264), D(ModRM | Priv | Op3264), D(ModRM | SrcMem | Priv | Op3264), D(ModRM | Priv | Op3264),
N, N, N, N, N, N, N, N,
N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, N,
/* 0x30 - 0x3F */ /* 0x30 - 0x3F */
...@@ -3240,8 +3240,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt) ...@@ -3240,8 +3240,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
emulate_ud(ctxt); emulate_ud(ctxt);
goto done; goto done;
} }
c->regs[c->modrm_rm] = ops->get_cr(c->modrm_reg, ctxt->vcpu); c->dst.val = ops->get_cr(c->modrm_reg, ctxt->vcpu);
c->dst.type = OP_NONE; /* no writeback */
break; break;
case 0x21: /* mov from dr to reg */ case 0x21: /* mov from dr to reg */
if ((ops->get_cr(4, ctxt->vcpu) & X86_CR4_DE) && if ((ops->get_cr(4, ctxt->vcpu) & X86_CR4_DE) &&
...@@ -3253,7 +3252,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt) ...@@ -3253,7 +3252,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
c->dst.type = OP_NONE; /* no writeback */ c->dst.type = OP_NONE; /* no writeback */
break; break;
case 0x22: /* mov reg, cr */ case 0x22: /* mov reg, cr */
if (ops->set_cr(c->modrm_reg, c->modrm_val, ctxt->vcpu)) { if (ops->set_cr(c->modrm_reg, c->src.val, ctxt->vcpu)) {
emulate_gp(ctxt, 0); emulate_gp(ctxt, 0);
goto done; goto done;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment