mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 10:19:47 +00:00
KVM: x86 emulator: unify two switches
The rep prefix cleanup left two switch () statements next to each other. Unify them. Signed-off-by: Avi Kivity <avi@qumranet.com>
This commit is contained in:
parent
b9fa9d6bc6
commit
111de5d60c
1 changed files with 23 additions and 27 deletions
|
@ -1541,31 +1541,6 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
|
|||
case 0x9d: /* popf */
|
||||
c->dst.ptr = (unsigned long *) &ctxt->eflags;
|
||||
goto pop_instruction;
|
||||
case 0xc3: /* ret */
|
||||
c->dst.ptr = &c->eip;
|
||||
goto pop_instruction;
|
||||
case 0xf4: /* hlt */
|
||||
ctxt->vcpu->halt_request = 1;
|
||||
goto done;
|
||||
case 0xf5: /* cmc */
|
||||
/* complement carry flag from eflags reg */
|
||||
ctxt->eflags ^= EFLG_CF;
|
||||
c->dst.type = OP_NONE; /* Disable writeback. */
|
||||
break;
|
||||
case 0xf8: /* clc */
|
||||
ctxt->eflags &= ~EFLG_CF;
|
||||
c->dst.type = OP_NONE; /* Disable writeback. */
|
||||
break;
|
||||
case 0xfa: /* cli */
|
||||
ctxt->eflags &= ~X86_EFLAGS_IF;
|
||||
c->dst.type = OP_NONE; /* Disable writeback. */
|
||||
break;
|
||||
case 0xfb: /* sti */
|
||||
ctxt->eflags |= X86_EFLAGS_IF;
|
||||
c->dst.type = OP_NONE; /* Disable writeback. */
|
||||
break;
|
||||
}
|
||||
switch (c->b) {
|
||||
case 0xa4 ... 0xa5: /* movs */
|
||||
c->dst.type = OP_MEM;
|
||||
c->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
|
||||
|
@ -1652,6 +1627,9 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
|
|||
case 0xae ... 0xaf: /* scas */
|
||||
DPRINTF("Urk! I don't handle SCAS.\n");
|
||||
goto cannot_emulate;
|
||||
case 0xc3: /* ret */
|
||||
c->dst.ptr = &c->eip;
|
||||
goto pop_instruction;
|
||||
case 0xe8: /* call (near) */ {
|
||||
long int rel;
|
||||
switch (c->op_bytes) {
|
||||
|
@ -1676,8 +1654,26 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
|
|||
JMP_REL(c->src.val);
|
||||
c->dst.type = OP_NONE; /* Disable writeback. */
|
||||
break;
|
||||
|
||||
|
||||
case 0xf4: /* hlt */
|
||||
ctxt->vcpu->halt_request = 1;
|
||||
goto done;
|
||||
case 0xf5: /* cmc */
|
||||
/* complement carry flag from eflags reg */
|
||||
ctxt->eflags ^= EFLG_CF;
|
||||
c->dst.type = OP_NONE; /* Disable writeback. */
|
||||
break;
|
||||
case 0xf8: /* clc */
|
||||
ctxt->eflags &= ~EFLG_CF;
|
||||
c->dst.type = OP_NONE; /* Disable writeback. */
|
||||
break;
|
||||
case 0xfa: /* cli */
|
||||
ctxt->eflags &= ~X86_EFLAGS_IF;
|
||||
c->dst.type = OP_NONE; /* Disable writeback. */
|
||||
break;
|
||||
case 0xfb: /* sti */
|
||||
ctxt->eflags |= X86_EFLAGS_IF;
|
||||
c->dst.type = OP_NONE; /* Disable writeback. */
|
||||
break;
|
||||
}
|
||||
goto writeback;
|
||||
|
||||
|
|
Loading…
Reference in a new issue