Commit e01991e7 authored by Takuya Yoshikawa's avatar Takuya Yoshikawa Committed by Avi Kivity

KVM: x86 emulator: Rename emulate_xxx() to em_xxx()

The next patch will change these to be called by opcode::execute.
Signed-off-by: default avatarTakuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 9d74191a
...@@ -1656,7 +1656,7 @@ static int emulate_iret_real(struct x86_emulate_ctxt *ctxt) ...@@ -1656,7 +1656,7 @@ static int emulate_iret_real(struct x86_emulate_ctxt *ctxt)
return rc; return rc;
} }
static int emulate_iret(struct x86_emulate_ctxt *ctxt) static int em_iret(struct x86_emulate_ctxt *ctxt)
{ {
switch(ctxt->mode) { switch(ctxt->mode) {
case X86EMUL_MODE_REAL: case X86EMUL_MODE_REAL:
...@@ -1816,7 +1816,7 @@ static int em_grp9(struct x86_emulate_ctxt *ctxt) ...@@ -1816,7 +1816,7 @@ static int em_grp9(struct x86_emulate_ctxt *ctxt)
return X86EMUL_CONTINUE; return X86EMUL_CONTINUE;
} }
static int emulate_ret_far(struct x86_emulate_ctxt *ctxt) static int em_ret_far(struct x86_emulate_ctxt *ctxt)
{ {
struct decode_cache *c = &ctxt->decode; struct decode_cache *c = &ctxt->decode;
int rc; int rc;
...@@ -1880,7 +1880,7 @@ setup_syscalls_segments(struct x86_emulate_ctxt *ctxt, ...@@ -1880,7 +1880,7 @@ setup_syscalls_segments(struct x86_emulate_ctxt *ctxt,
ss->p = 1; ss->p = 1;
} }
static int emulate_syscall(struct x86_emulate_ctxt *ctxt) static int em_syscall(struct x86_emulate_ctxt *ctxt)
{ {
struct decode_cache *c = &ctxt->decode; struct decode_cache *c = &ctxt->decode;
struct x86_emulate_ops *ops = ctxt->ops; struct x86_emulate_ops *ops = ctxt->ops;
...@@ -1933,7 +1933,7 @@ static int emulate_syscall(struct x86_emulate_ctxt *ctxt) ...@@ -1933,7 +1933,7 @@ static int emulate_syscall(struct x86_emulate_ctxt *ctxt)
return X86EMUL_CONTINUE; return X86EMUL_CONTINUE;
} }
static int emulate_sysenter(struct x86_emulate_ctxt *ctxt) static int em_sysenter(struct x86_emulate_ctxt *ctxt)
{ {
struct decode_cache *c = &ctxt->decode; struct decode_cache *c = &ctxt->decode;
struct x86_emulate_ops *ops = ctxt->ops; struct x86_emulate_ops *ops = ctxt->ops;
...@@ -1989,7 +1989,7 @@ static int emulate_sysenter(struct x86_emulate_ctxt *ctxt) ...@@ -1989,7 +1989,7 @@ static int emulate_sysenter(struct x86_emulate_ctxt *ctxt)
return X86EMUL_CONTINUE; return X86EMUL_CONTINUE;
} }
static int emulate_sysexit(struct x86_emulate_ctxt *ctxt) static int em_sysexit(struct x86_emulate_ctxt *ctxt)
{ {
struct decode_cache *c = &ctxt->decode; struct decode_cache *c = &ctxt->decode;
struct x86_emulate_ops *ops = ctxt->ops; struct x86_emulate_ops *ops = ctxt->ops;
...@@ -3948,7 +3948,7 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt) ...@@ -3948,7 +3948,7 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
rc = emulate_load_segment(ctxt, VCPU_SREG_DS); rc = emulate_load_segment(ctxt, VCPU_SREG_DS);
break; break;
case 0xcb: /* ret far */ case 0xcb: /* ret far */
rc = emulate_ret_far(ctxt); rc = em_ret_far(ctxt);
break; break;
case 0xcc: /* int3 */ case 0xcc: /* int3 */
irq = 3; irq = 3;
...@@ -3965,7 +3965,7 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt) ...@@ -3965,7 +3965,7 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
} }
break; break;
case 0xcf: /* iret */ case 0xcf: /* iret */
rc = emulate_iret(ctxt); rc = em_iret(ctxt);
break; break;
case 0xd0 ... 0xd1: /* Grp2 */ case 0xd0 ... 0xd1: /* Grp2 */
rc = em_grp2(ctxt); rc = em_grp2(ctxt);
...@@ -4127,7 +4127,7 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt) ...@@ -4127,7 +4127,7 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
twobyte_insn: twobyte_insn:
switch (c->b) { switch (c->b) {
case 0x05: /* syscall */ case 0x05: /* syscall */
rc = emulate_syscall(ctxt); rc = em_syscall(ctxt);
break; break;
case 0x06: case 0x06:
rc = em_clts(ctxt); rc = em_clts(ctxt);
...@@ -4189,10 +4189,10 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt) ...@@ -4189,10 +4189,10 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
rc = X86EMUL_CONTINUE; rc = X86EMUL_CONTINUE;
break; break;
case 0x34: /* sysenter */ case 0x34: /* sysenter */
rc = emulate_sysenter(ctxt); rc = em_sysenter(ctxt);
break; break;
case 0x35: /* sysexit */ case 0x35: /* sysexit */
rc = emulate_sysexit(ctxt); rc = em_sysexit(ctxt);
break; break;
case 0x40 ... 0x4f: /* cmov */ case 0x40 ... 0x4f: /* cmov */
c->dst.val = c->dst.orig_val = c->src.val; c->dst.val = c->dst.orig_val = c->src.val;
......
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