korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 00:04:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

KVM: emulate: cleanup decode_modrm

Browse Source 
Remove the if conditional - that will help us avoid
an "else initialize to 0" Also, rearrange operators
for slightly better code.

Signed-off-by: Bandan Das <bsd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Bandan Das 2014-04-16 12:46:11 -04:00 committed by Paolo Bonzini
parent 685bbf4ac4
commit 02357bdc8c
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1066,19 +1066,17 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
struct operand *op) struct operand *op)
{ {
u8 sib; u8 sib;
int index_reg = 0, base_reg = 0, scale; int index_reg, base_reg, scale;
int rc = X86EMUL_CONTINUE; int rc = X86EMUL_CONTINUE;
ulong modrm_ea = 0; ulong modrm_ea = 0;
if (ctxt->rex_prefix) { ctxt->modrm_reg = ((ctxt->rex_prefix << 1) & 8); /* REX.R */
ctxt->modrm_reg = (ctxt->rex_prefix & 4) << 1; /* REX.R */ index_reg = (ctxt->rex_prefix << 2) & 8; /* REX.X */
index_reg = (ctxt->rex_prefix & 2) << 2; /* REX.X */ base_reg = (ctxt->rex_prefix << 3) & 8; /* REX.B */
ctxt->modrm_rm = base_reg = (ctxt->rex_prefix & 1) << 3; /* REG.B */
}
ctxt->modrm_mod |= (ctxt->modrm & 0xc0) >> 6; ctxt->modrm_mod = (ctxt->modrm & 0xc0) >> 6;
ctxt->modrm_reg |= (ctxt->modrm & 0x38) >> 3; ctxt->modrm_reg |= (ctxt->modrm & 0x38) >> 3;
ctxt->modrm_rm |= (ctxt->modrm & 0x07); ctxt->modrm_rm = base_reg | (ctxt->modrm & 0x07);
ctxt->modrm_seg = VCPU_SREG_DS; ctxt->modrm_seg = VCPU_SREG_DS;
if (ctxt->modrm_mod == 3 || (ctxt->d & NoMod)) { if (ctxt->modrm_mod == 3 || (ctxt->d & NoMod)) {