Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-02 02:01:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

KVM: x86 emulator: allow storing emulator execution function in decode tables

Browse Source 
Instead of looking up the opcode twice (once for decode flags, once for
the big execution switch) look up both flags and function in the decode tables.

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Avi Kivity 2010-07-29 15:11:51 +03:00
parent 9aabc88fc8
commit ef65c88912
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/include/asm/kvm_emulate.h
View File

@ -190,6 +190,7 @@ struct decode_cache {
bool has_seg_override; bool has_seg_override;
u8 seg_override; u8 seg_override;
unsigned int d; unsigned int d;
int (*execute)(struct x86_emulate_ctxt *ctxt);
unsigned long regs[NR_VCPU_REGS]; unsigned long regs[NR_VCPU_REGS];
unsigned long eip; unsigned long eip;
/* modrm */ /* modrm */

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

@ -106,6 +106,7 @@
struct opcode { struct opcode {
u32 flags; u32 flags;
union { union {
int (*execute)(struct x86_emulate_ctxt *ctxt);
struct opcode *group; struct opcode *group;
struct group_dual *gdual; struct group_dual *gdual;
} u; } u;
@ -120,6 +121,7 @@ struct group_dual {
#define N D(0) #define N D(0)
#define G(_f, _g) { .flags = ((_f) | Group), .u.group = (_g) } #define G(_f, _g) { .flags = ((_f) | Group), .u.group = (_g) }
#define GD(_f, _g) { .flags = ((_f) | Group | GroupDual), .u.gdual = (_g) } #define GD(_f, _g) { .flags = ((_f) | Group | GroupDual), .u.gdual = (_g) }
#define I(_f, _e) { .flags = (_f), .u.execute = (_e) }
static struct opcode group1[] = { static struct opcode group1[] = {
X7(D(Lock)), N X7(D(Lock)), N
@ -349,6 +351,7 @@ static struct opcode twobyte_table[256] = {
#undef N #undef N
#undef G #undef G
#undef GD #undef GD
#undef I
/* EFLAGS bit definitions. */ /* EFLAGS bit definitions. */
#define EFLG_ID (1<<21) #define EFLG_ID (1<<21)
@ -1070,6 +1073,8 @@ done_prefixes:
c->d |= opcode.flags; c->d |= opcode.flags;
} }
c->execute = opcode.u.execute;
/* Unrecognised? */ /* Unrecognised? */
if (c->d == 0 || (c->d & Undefined)) { if (c->d == 0 || (c->d & Undefined)) {
DPRINTF("Cannot emulate %02x\n", c->b); DPRINTF("Cannot emulate %02x\n", c->b);
@ -2705,6 +2710,13 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
special_insn: special_insn:
if (c->execute) {
rc = c->execute(ctxt);
if (rc != X86EMUL_CONTINUE)
goto done;
goto writeback;
}
if (c->twobyte) if (c->twobyte)
goto twobyte_insn; goto twobyte_insn;