mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target-i386: tweak handling of PG_NX_MASK

Browse Source 
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>
This commit is contained in:
Paolo Bonzini 2014-04-04 08:04:18 +02:00
parent 7c82256006
commit 870a706735
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target-i386/helper.c
View File

@ -657,8 +657,6 @@ int x86_cpu_handle_mmu_fault(CPUState *cs, vaddr addr,
ptep &= pte ^ PG_NX_MASK; ptep &= pte ^ PG_NX_MASK;
page_size = 4096; page_size = 4096;
} }
ptep ^= PG_NX_MASK;
} else { } else {
uint32_t pde; uint32_t pde;
@ -670,10 +668,11 @@ int x86_cpu_handle_mmu_fault(CPUState *cs, vaddr addr,
error_code = 0; error_code = 0;
goto do_fault; goto do_fault;
} }
ptep = pde | PG_NX_MASK;
/* if PSE bit is set, then we use a 4MB page */ /* if PSE bit is set, then we use a 4MB page */
if ((pde & PG_PSE_MASK) && (env->cr[4] & CR4_PSE_MASK)) { if ((pde & PG_PSE_MASK) && (env->cr[4] & CR4_PSE_MASK)) {
page_size = 4096 * 1024; page_size = 4096 * 1024;
ptep = pde;
pte_addr = pde_addr; pte_addr = pde_addr;
pte = pde; pte = pde;
} else { } else {
@ -691,11 +690,12 @@ int x86_cpu_handle_mmu_fault(CPUState *cs, vaddr addr,
goto do_fault; goto do_fault;
} }
/* combine pde and pte user and rw protections */ /* combine pde and pte user and rw protections */
ptep = pte & pde; ptep &= pte | PG_NX_MASK;
page_size = 4096; page_size = 4096;
} }
} }
ptep ^= PG_NX_MASK;
if ((ptep & PG_NX_MASK) && is_write1 == 2) { if ((ptep & PG_NX_MASK) && is_write1 == 2) {
goto do_fault_protect; goto do_fault_protect;
} }