KVM: x86 emulator: fix smsw and lmsw with a memory operand
lmsw and smsw were implemented only with a register operand. Extend them to support a memory operand as well. Fixes Windows running some display compatibility test on AMD hosts. Signed-off-by: Avi Kivity <avi@qumranet.com>
This commit is contained in:
Родитель
66b8550573
Коммит
16286d082d
|
@ -275,12 +275,15 @@ static u16 group_table[] = {
|
||||||
SrcMem | ModRM, 0, SrcMem | ModRM | Stack, 0,
|
SrcMem | ModRM, 0, SrcMem | ModRM | Stack, 0,
|
||||||
[Group7*8] =
|
[Group7*8] =
|
||||||
0, 0, ModRM | SrcMem, ModRM | SrcMem,
|
0, 0, ModRM | SrcMem, ModRM | SrcMem,
|
||||||
SrcNone | ModRM | DstMem, 0, SrcMem | ModRM, SrcMem | ModRM | ByteOp,
|
SrcNone | ModRM | DstMem | Mov, 0,
|
||||||
|
SrcMem16 | ModRM | Mov, SrcMem | ModRM | ByteOp,
|
||||||
};
|
};
|
||||||
|
|
||||||
static u16 group2_table[] = {
|
static u16 group2_table[] = {
|
||||||
[Group7*8] =
|
[Group7*8] =
|
||||||
SrcNone | ModRM, 0, 0, 0, SrcNone | ModRM | DstMem, 0, SrcMem | ModRM, 0,
|
SrcNone | ModRM, 0, 0, 0,
|
||||||
|
SrcNone | ModRM | DstMem | Mov, 0,
|
||||||
|
SrcMem16 | ModRM | Mov, 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
/* EFLAGS bit definitions. */
|
/* EFLAGS bit definitions. */
|
||||||
|
@ -1722,6 +1725,8 @@ twobyte_insn:
|
||||||
goto done;
|
goto done;
|
||||||
|
|
||||||
kvm_emulate_hypercall(ctxt->vcpu);
|
kvm_emulate_hypercall(ctxt->vcpu);
|
||||||
|
/* Disable writeback. */
|
||||||
|
c->dst.type = OP_NONE;
|
||||||
break;
|
break;
|
||||||
case 2: /* lgdt */
|
case 2: /* lgdt */
|
||||||
rc = read_descriptor(ctxt, ops, c->src.ptr,
|
rc = read_descriptor(ctxt, ops, c->src.ptr,
|
||||||
|
@ -1729,6 +1734,8 @@ twobyte_insn:
|
||||||
if (rc)
|
if (rc)
|
||||||
goto done;
|
goto done;
|
||||||
realmode_lgdt(ctxt->vcpu, size, address);
|
realmode_lgdt(ctxt->vcpu, size, address);
|
||||||
|
/* Disable writeback. */
|
||||||
|
c->dst.type = OP_NONE;
|
||||||
break;
|
break;
|
||||||
case 3: /* lidt/vmmcall */
|
case 3: /* lidt/vmmcall */
|
||||||
if (c->modrm_mod == 3 && c->modrm_rm == 1) {
|
if (c->modrm_mod == 3 && c->modrm_rm == 1) {
|
||||||
|
@ -1744,27 +1751,25 @@ twobyte_insn:
|
||||||
goto done;
|
goto done;
|
||||||
realmode_lidt(ctxt->vcpu, size, address);
|
realmode_lidt(ctxt->vcpu, size, address);
|
||||||
}
|
}
|
||||||
|
/* Disable writeback. */
|
||||||
|
c->dst.type = OP_NONE;
|
||||||
break;
|
break;
|
||||||
case 4: /* smsw */
|
case 4: /* smsw */
|
||||||
if (c->modrm_mod != 3)
|
c->dst.bytes = 2;
|
||||||
goto cannot_emulate;
|
c->dst.val = realmode_get_cr(ctxt->vcpu, 0);
|
||||||
*(u16 *)&c->regs[c->modrm_rm]
|
|
||||||
= realmode_get_cr(ctxt->vcpu, 0);
|
|
||||||
break;
|
break;
|
||||||
case 6: /* lmsw */
|
case 6: /* lmsw */
|
||||||
if (c->modrm_mod != 3)
|
realmode_lmsw(ctxt->vcpu, (u16)c->src.val,
|
||||||
goto cannot_emulate;
|
|
||||||
realmode_lmsw(ctxt->vcpu, (u16)c->modrm_val,
|
|
||||||
&ctxt->eflags);
|
&ctxt->eflags);
|
||||||
break;
|
break;
|
||||||
case 7: /* invlpg*/
|
case 7: /* invlpg*/
|
||||||
emulate_invlpg(ctxt->vcpu, memop);
|
emulate_invlpg(ctxt->vcpu, memop);
|
||||||
|
/* Disable writeback. */
|
||||||
|
c->dst.type = OP_NONE;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
goto cannot_emulate;
|
goto cannot_emulate;
|
||||||
}
|
}
|
||||||
/* Disable writeback. */
|
|
||||||
c->dst.type = OP_NONE;
|
|
||||||
break;
|
break;
|
||||||
case 0x06:
|
case 0x06:
|
||||||
emulate_clts(ctxt->vcpu);
|
emulate_clts(ctxt->vcpu);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче