AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

KVM: x86 emulator: Use opcode::execute for 0F 01 opcode

Browse Source 
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2011-04-21 12:21:50 +03:00
parent 68152d8812
commit 5ef39c71d8
1 changed files with 13 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
arch/x86/kvm/emulate.c
View File

@ -2625,18 +2625,13 @@ static int em_lgdt(struct x86_emulate_ctxt *ctxt)
return X86EMUL_CONTINUE; return X86EMUL_CONTINUE;
} }
static int em_svm(struct x86_emulate_ctxt *ctxt) static int em_vmmcall(struct x86_emulate_ctxt *ctxt)
{ {
struct decode_cache *c = &ctxt->decode; struct decode_cache *c = &ctxt->decode;
int rc; int rc;
switch (c->modrm_rm) { rc = ctxt->ops->fix_hypercall(ctxt);
case 1:
rc = ctxt->ops->fix_hypercall(ctxt);
break;
default:
return X86EMUL_UNHANDLEABLE;
}
/* Disable writeback. */ /* Disable writeback. */
c->dst.type = OP_NONE; c->dst.type = OP_NONE;
return rc; return rc;
@ -2909,7 +2904,7 @@ static struct opcode group7_rm1[] = {
static struct opcode group7_rm3[] = { static struct opcode group7_rm3[] = {
DIP(SrcNone | ModRM | Prot | Priv, vmrun, check_svme_pa), DIP(SrcNone | ModRM | Prot | Priv, vmrun, check_svme_pa),
DI(SrcNone | ModRM | Prot | VendorSpecific, vmmcall), II(SrcNone | ModRM | Prot | VendorSpecific, em_vmmcall, vmmcall),
DIP(SrcNone | ModRM | Prot | Priv, vmload, check_svme_pa), DIP(SrcNone | ModRM | Prot | Priv, vmload, check_svme_pa),
DIP(SrcNone | ModRM | Prot | Priv, vmsave, check_svme_pa), DIP(SrcNone | ModRM | Prot | Priv, vmsave, check_svme_pa),
DIP(SrcNone | ModRM | Prot | Priv, stgi, check_svme), DIP(SrcNone | ModRM | Prot | Priv, stgi, check_svme),
@ -2961,15 +2956,17 @@ static struct opcode group6[] = {
static struct group_dual group7 = { { static struct group_dual group7 = { {
DI(ModRM | Mov | DstMem | Priv, sgdt), DI(ModRM | Mov | DstMem | Priv, sgdt),
DI(ModRM | Mov | DstMem | Priv, sidt), DI(ModRM | Mov | DstMem | Priv, sidt),
DI(ModRM | SrcMem | Priv, lgdt), DI(ModRM | SrcMem | Priv, lidt), II(ModRM | SrcMem | Priv, em_lgdt, lgdt),
DI(SrcNone | ModRM | DstMem | Mov, smsw), N, II(ModRM | SrcMem | Priv, em_lidt, lidt),
DI(SrcMem16 | ModRM | Mov | Priv, lmsw), II(SrcNone | ModRM | DstMem | Mov, em_smsw, smsw), N,
DI(SrcMem | ModRM | ByteOp | Priv | NoAccess, invlpg), II(SrcMem16 | ModRM | Mov | Priv, em_lmsw, lmsw),
II(SrcMem | ModRM | ByteOp | Priv | NoAccess, em_invlpg, invlpg),
}, { }, {
D(SrcNone | ModRM | Priv | VendorSpecific), EXT(0, group7_rm1), I(SrcNone | ModRM | Priv | VendorSpecific, em_vmcall),
EXT(0, group7_rm1),
N, EXT(0, group7_rm3), N, EXT(0, group7_rm3),
DI(SrcNone | ModRM | DstMem | Mov, smsw), N, II(SrcNone | ModRM | DstMem | Mov, em_smsw, smsw), N,
DI(SrcMem16 | ModRM | Mov | Priv, lmsw), EXT(0, group7_rm7), II(SrcMem16 | ModRM | Mov | Priv, em_lmsw, lmsw), EXT(0, group7_rm7),
} }; } };
static struct opcode group8[] = { static struct opcode group8[] = {
@ -4107,33 +4104,6 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
twobyte_insn: twobyte_insn:
switch (c->b) { switch (c->b) {
case 0x01: /* lgdt, lidt, lmsw */
switch (c->modrm_reg) {
case 0: /* vmcall */
rc = em_vmcall(ctxt);
break;
case 2: /* lgdt */
rc = em_lgdt(ctxt);
break;
case 3: /* lidt/vmmcall */
if (c->modrm_mod == 3)
return em_svm(ctxt);
else
return em_lidt(ctxt);
break;
case 4: /* smsw */
rc = em_smsw(ctxt);
break;
case 6: /* lmsw */
rc = em_lmsw(ctxt);
break;
case 7: /* invlpg*/
rc = em_invlpg(ctxt);
break;
default:
goto cannot_emulate;
}
break;
case 0x05: /* syscall */ case 0x05: /* syscall */
rc = emulate_syscall(ctxt, ops); rc = emulate_syscall(ctxt, ops);
break; break;