diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-04-04 08:04:18 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-06-05 16:10:34 +0200 |
| commit | 870a706735e8dc18c331bce0cdad2fe71c21ef2e (patch) | |
| tree | e2ce54cb41381706b2c91f6dd5613c03a2503584 /target-i386/helper.c | |
| parent | 7c8225600648fa0b56135547844f1e529350510a (diff) | |
| download | qemu-870a706735e8dc18c331bce0cdad2fe71c21ef2e.tar.gz qemu-870a706735e8dc18c331bce0cdad2fe71c21ef2e.tar.bz2 qemu-870a706735e8dc18c331bce0cdad2fe71c21ef2e.zip | |
target-i386: tweak handling of PG_NX_MASK
Remove the tail of the PAE case, so that we can use "goto" in the
next patch to jump to the protection checks.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'target-i386/helper.c')
| -rw-r--r-- | target-i386/helper.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target-i386/helper.c b/target-i386/helper.c index eae3e7ee94..1460a234d7 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -657,8 +657,6 @@ int x86_cpu_handle_mmu_fault(CPUState *cs, vaddr addr, ptep &= pte ^ PG_NX_MASK; page_size = 4096; } - - ptep ^= PG_NX_MASK; } else { uint32_t pde; @@ -670,10 +668,11 @@ int x86_cpu_handle_mmu_fault(CPUState *cs, vaddr addr, error_code = 0; goto do_fault; } + ptep = pde | PG_NX_MASK; + /* if PSE bit is set, then we use a 4MB page */ if ((pde & PG_PSE_MASK) && (env->cr[4] & CR4_PSE_MASK)) { page_size = 4096 * 1024; - ptep = pde; pte_addr = pde_addr; pte = pde; } else { @@ -691,11 +690,12 @@ int x86_cpu_handle_mmu_fault(CPUState *cs, vaddr addr, goto do_fault; } /* combine pde and pte user and rw protections */ - ptep = pte & pde; + ptep &= pte | PG_NX_MASK; page_size = 4096; } } + ptep ^= PG_NX_MASK; if ((ptep & PG_NX_MASK) && is_write1 == 2) { goto do_fault_protect; } |