diff options
| author | Gleb Natapov <gleb@redhat.com> | 2013-02-13 16:50:39 +0100 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2013-02-13 17:01:00 +0100 |
| commit | f583c29b7913fa32b0b1b7f43038d6a7d9f71b6f (patch) | |
| tree | da7f1f7df5c9465bee2afff734fd3637219317bc /arch/x86/kvm/emulate.c | |
| parent | KVM: Remove user_alloc from struct kvm_memory_slot (diff) | |
| download | linux-f583c29b7913fa32b0b1b7f43038d6a7d9f71b6f.tar.xz linux-f583c29b7913fa32b0b1b7f43038d6a7d9f71b6f.zip | |
x86 emulator: fix parity calculation for AAD instruction
Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Diffstat (limited to 'arch/x86/kvm/emulate.c')
| -rw-r--r-- | arch/x86/kvm/emulate.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 2b11318151a4..a335cc6cde72 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -2995,14 +2995,11 @@ static int em_aad(struct x86_emulate_ctxt *ctxt) ctxt->dst.val = (ctxt->dst.val & 0xffff0000) | al; - ctxt->eflags &= ~(X86_EFLAGS_PF | X86_EFLAGS_SF | X86_EFLAGS_ZF); - - if (!al) - ctxt->eflags |= X86_EFLAGS_ZF; - if (!(al & 1)) - ctxt->eflags |= X86_EFLAGS_PF; - if (al & 0x80) - ctxt->eflags |= X86_EFLAGS_SF; + /* Set PF, ZF, SF */ + ctxt->src.type = OP_IMM; + ctxt->src.val = 0; + ctxt->src.bytes = 1; + fastop(ctxt, em_or); return X86EMUL_CONTINUE; } |