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

KVM: x86 emulator: use SrcAcc to simplify xchg decoding

Browse Source 
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2010-08-01 12:41:59 +03:00
parent 4515453964
commit 3d9e77dff8
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2147,7 +2147,7 @@ static struct opcode opcode_table[256] = {
D(DstMem | SrcNone | ModRM | Mov), D(ModRM | DstReg), D(DstMem | SrcNone | ModRM | Mov), D(ModRM | DstReg),
D(ImplicitOps | SrcMem16 | ModRM), G(0, group1A), D(ImplicitOps | SrcMem16 | ModRM), G(0, group1A),
/* 0x90 - 0x97 */ /* 0x90 - 0x97 */
X8(D(DstReg)), X8(D(SrcAcc | DstReg)),
/* 0x98 - 0x9F */ /* 0x98 - 0x9F */
N, N, D(SrcImmFAddr | No64), N, N, N, D(SrcImmFAddr | No64), N,
D(ImplicitOps | Stack), D(ImplicitOps | Stack), N, N, D(ImplicitOps | Stack), D(ImplicitOps | Stack), N, N,
@ -2932,16 +2932,9 @@ special_insn:
if (rc != X86EMUL_CONTINUE) if (rc != X86EMUL_CONTINUE)
goto done; goto done;
break; break;
case 0x90: /* nop / xchg r8,rax */ case 0x90 ... 0x97: /* nop / xchg reg, rax */
if (c->dst.addr.reg == &c->regs[VCPU_REGS_RAX]) { if (c->dst.addr.reg == &c->regs[VCPU_REGS_RAX])
c->dst.type = OP_NONE; /* nop */ goto done;
break;
}
case 0x91 ... 0x97: /* xchg reg,rax */
c->src.type = OP_REG;
c->src.bytes = c->op_bytes;
c->src.addr.reg = &c->regs[VCPU_REGS_RAX];
c->src.val = *(c->src.addr.reg);
goto xchg; goto xchg;
case 0x9c: /* pushf */ case 0x9c: /* pushf */
c->src.val = (unsigned long) ctxt->eflags; c->src.val = (unsigned long) ctxt->eflags;