Commit d867162c authored by Avi Kivity's avatar Avi Kivity Committed by Marcelo Tosatti

KVM: x86 emulator: vendor specific instructions

Mark some instructions as vendor specific, and allow the caller to request
emulation only of vendor specific instructions.  This is useful in some
circumstances (responding to a #UD fault).
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 3e909439
...@@ -239,6 +239,7 @@ struct x86_emulate_ctxt { ...@@ -239,6 +239,7 @@ struct x86_emulate_ctxt {
int interruptibility; int interruptibility;
bool perm_ok; /* do not check permissions if true */ bool perm_ok; /* do not check permissions if true */
bool only_vendor_specific_insn;
bool have_exception; bool have_exception;
struct x86_exception exception; struct x86_exception exception;
......
...@@ -76,6 +76,7 @@ ...@@ -76,6 +76,7 @@
#define Group (1<<14) /* Bits 3:5 of modrm byte extend opcode */ #define Group (1<<14) /* Bits 3:5 of modrm byte extend opcode */
#define GroupDual (1<<15) /* Alternate decoding of mod == 3 */ #define GroupDual (1<<15) /* Alternate decoding of mod == 3 */
/* Misc flags */ /* Misc flags */
#define VendorSpecific (1<<22) /* Vendor specific instruction */
#define NoAccess (1<<23) /* Don't access memory (lea/invlpg/verr etc) */ #define NoAccess (1<<23) /* Don't access memory (lea/invlpg/verr etc) */
#define Op3264 (1<<24) /* Operand is 64b in long mode, 32b otherwise */ #define Op3264 (1<<24) /* Operand is 64b in long mode, 32b otherwise */
#define Undefined (1<<25) /* No Such Instruction */ #define Undefined (1<<25) /* No Such Instruction */
...@@ -2365,7 +2366,8 @@ static struct group_dual group7 = { { ...@@ -2365,7 +2366,8 @@ static struct group_dual group7 = { {
D(SrcMem16 | ModRM | Mov | Priv), D(SrcMem16 | ModRM | Mov | Priv),
D(SrcMem | ModRM | ByteOp | Priv | NoAccess), D(SrcMem | ModRM | ByteOp | Priv | NoAccess),
}, { }, {
D(SrcNone | ModRM | Priv), N, N, D(SrcNone | ModRM | Priv), D(SrcNone | ModRM | Priv | VendorSpecific), N,
N, D(SrcNone | ModRM | Priv | VendorSpecific),
D(SrcNone | ModRM | DstMem | Mov), N, D(SrcNone | ModRM | DstMem | Mov), N,
D(SrcMem16 | ModRM | Mov | Priv), N, D(SrcMem16 | ModRM | Mov | Priv), N,
} }; } };
...@@ -2489,7 +2491,7 @@ static struct opcode opcode_table[256] = { ...@@ -2489,7 +2491,7 @@ static struct opcode opcode_table[256] = {
static struct opcode twobyte_table[256] = { static struct opcode twobyte_table[256] = {
/* 0x00 - 0x0F */ /* 0x00 - 0x0F */
N, GD(0, &group7), N, N, N, GD(0, &group7), N, N,
N, D(ImplicitOps), D(ImplicitOps | Priv), N, N, D(ImplicitOps | VendorSpecific), D(ImplicitOps | Priv), N,
D(ImplicitOps | Priv), D(ImplicitOps | Priv), N, N, D(ImplicitOps | Priv), D(ImplicitOps | Priv), N, N,
N, D(ImplicitOps | ModRM), N, N, N, D(ImplicitOps | ModRM), N, N,
/* 0x10 - 0x1F */ /* 0x10 - 0x1F */
...@@ -2502,7 +2504,8 @@ static struct opcode twobyte_table[256] = { ...@@ -2502,7 +2504,8 @@ static struct opcode twobyte_table[256] = {
/* 0x30 - 0x3F */ /* 0x30 - 0x3F */
D(ImplicitOps | Priv), I(ImplicitOps, em_rdtsc), D(ImplicitOps | Priv), I(ImplicitOps, em_rdtsc),
D(ImplicitOps | Priv), N, D(ImplicitOps | Priv), N,
D(ImplicitOps), D(ImplicitOps | Priv), N, N, D(ImplicitOps | VendorSpecific), D(ImplicitOps | Priv | VendorSpecific),
N, N,
N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, N,
/* 0x40 - 0x4F */ /* 0x40 - 0x4F */
X16(D(DstReg | SrcMem | ModRM | Mov)), X16(D(DstReg | SrcMem | ModRM | Mov)),
...@@ -2741,6 +2744,9 @@ x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len) ...@@ -2741,6 +2744,9 @@ x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len)
if (c->d == 0 || (c->d & Undefined)) if (c->d == 0 || (c->d & Undefined))
return -1; return -1;
if (!(c->d & VendorSpecific) && ctxt->only_vendor_specific_insn)
return -1;
if (mode == X86EMUL_MODE_PROT64 && (c->d & Stack)) if (mode == X86EMUL_MODE_PROT64 && (c->d & Stack))
c->op_bytes = 8; c->op_bytes = 8;
......
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