Commit 3009afc6 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini

KVM: x86: Use a typedef for fastop functions

Add a typedef to for the fastop function prototype to make the code more
readable.

No functional change intended.
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Reviewed-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 52db3698
...@@ -311,7 +311,9 @@ static void invalidate_registers(struct x86_emulate_ctxt *ctxt) ...@@ -311,7 +311,9 @@ static void invalidate_registers(struct x86_emulate_ctxt *ctxt)
#define ON64(x) #define ON64(x)
#endif #endif
static int fastop(struct x86_emulate_ctxt *ctxt, void (*fop)(struct fastop *)); typedef void (*fastop_t)(struct fastop *);
static int fastop(struct x86_emulate_ctxt *ctxt, fastop_t fop);
#define __FOP_FUNC(name) \ #define __FOP_FUNC(name) \
".align " __stringify(FASTOP_SIZE) " \n\t" \ ".align " __stringify(FASTOP_SIZE) " \n\t" \
...@@ -5502,7 +5504,7 @@ static void fetch_possible_mmx_operand(struct operand *op) ...@@ -5502,7 +5504,7 @@ static void fetch_possible_mmx_operand(struct operand *op)
read_mmx_reg(&op->mm_val, op->addr.mm); read_mmx_reg(&op->mm_val, op->addr.mm);
} }
static int fastop(struct x86_emulate_ctxt *ctxt, void (*fop)(struct fastop *)) static int fastop(struct x86_emulate_ctxt *ctxt, fastop_t fop)
{ {
ulong flags = (ctxt->eflags & EFLAGS_MASK) | X86_EFLAGS_IF; ulong flags = (ctxt->eflags & EFLAGS_MASK) | X86_EFLAGS_IF;
...@@ -5680,12 +5682,10 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt) ...@@ -5680,12 +5682,10 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
ctxt->eflags &= ~X86_EFLAGS_RF; ctxt->eflags &= ~X86_EFLAGS_RF;
if (ctxt->execute) { if (ctxt->execute) {
if (ctxt->d & Fastop) { if (ctxt->d & Fastop)
void (*fop)(struct fastop *) = (void *)ctxt->execute; rc = fastop(ctxt, (fastop_t)ctxt->execute);
rc = fastop(ctxt, fop); else
} else {
rc = ctxt->execute(ctxt); rc = ctxt->execute(ctxt);
}
if (rc != X86EMUL_CONTINUE) if (rc != X86EMUL_CONTINUE)
goto done; goto done;
goto writeback; goto writeback;
......
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