diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-02-09 11:44:35 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-02-09 15:46:55 +0100 |
| commit | 388ee48a88e684e719660a2cae9c21897b94fa37 (patch) | |
| tree | d712aba1022344ba7aa1165184d8e835d3898522 /target-i386/helper.c | |
| parent | 5056c0c3de73c4d804a62d473039bc439718777d (diff) | |
| download | qemu-388ee48a88e684e719660a2cae9c21897b94fa37.tar.gz qemu-388ee48a88e684e719660a2cae9c21897b94fa37.tar.bz2 qemu-388ee48a88e684e719660a2cae9c21897b94fa37.zip | |
target-i386: fix PSE36 mode
(pde & 0x1fe000) is a 32-bit integer; when shifting it
into bits 39-32 the result is zero. Fix it by making the
mask (and thus the result of the AND) a 64-bit integer.
Reported by Coverity.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'target-i386/helper.c')
| -rw-r--r-- | target-i386/helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target-i386/helper.c b/target-i386/helper.c index 81568c8b2b..3802ed9359 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -861,7 +861,7 @@ int x86_cpu_handle_mmu_fault(CPUState *cs, vaddr addr, /* Bits 20-13 provide bits 39-32 of the address, bit 21 is reserved. * Leave bits 20-13 in place for setting accessed/dirty bits below. */ - pte = pde | ((pde & 0x1fe000) << (32 - 13)); + pte = pde | ((pde & 0x1fe000LL) << (32 - 13)); rsvd_mask = 0x200000; goto do_check_protect_pse36; } @@ -1056,7 +1056,7 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) if (!(pde & PG_PRESENT_MASK)) return -1; if ((pde & PG_PSE_MASK) && (env->cr[4] & CR4_PSE_MASK)) { - pte = pde | ((pde & 0x1fe000) << (32 - 13)); + pte = pde | ((pde & 0x1fe000LL) << (32 - 13)); page_size = 4096 * 1024; } else { /* page directory entry */ |