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

Add debug prints for NX bit feature

Browse Source
This commit is contained in:
Stanislav Shwartsman 2006-10-28 12:31:23 +00:00
parent 598c34ed0a
commit 905de565a9
1 changed files with 25 additions and 9 deletions

34
bochs/cpu/paging.cc

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: paging.cc,v 1.79 2006-10-04 19:47:24 sshwarts Exp $ // $Id: paging.cc,v 1.80 2006-10-28 12:31:23 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001 MandrakeSoft S.A. // Copyright (C) 2001 MandrakeSoft S.A.
@ -646,11 +646,15 @@ BX_CPU_C::translate_linear(bx_address laddr, unsigned pl, unsigned rw, unsigned
goto page_fault_not_present; // PML4 Entry NOT present goto page_fault_not_present; // PML4 Entry NOT present
} }
if (pml4 & PAGE_DIRECTORY_NX_BIT) { if (pml4 & PAGE_DIRECTORY_NX_BIT) {
if (! BX_CPU_THIS_PTR msr.nxe) if (! BX_CPU_THIS_PTR msr.nxe) {
BX_DEBUG(("PML4: NX bit set when EFER.NXE is disabled"));
goto page_fault_reserved; goto page_fault_reserved;
else if (access_type == CODE_ACCESS) }
if (access_type == CODE_ACCESS) {
BX_DEBUG(("PML4: non-executable page fault occured"));
goto page_fault_access; goto page_fault_access;
} }
}
if (!(pml4 & 0x20)) if (!(pml4 & 0x20))
{ {
pml4 |= 0x20; pml4 |= 0x20;
@ -680,12 +684,16 @@ BX_CPU_C::translate_linear(bx_address laddr, unsigned pl, unsigned rw, unsigned
if (BX_CPU_THIS_PTR msr.lma) if (BX_CPU_THIS_PTR msr.lma)
{ {
if (pdp & PAGE_DIRECTORY_NX_BIT) { if (pdp & PAGE_DIRECTORY_NX_BIT) {
if (! BX_CPU_THIS_PTR msr.nxe) if (! BX_CPU_THIS_PTR msr.nxe) {
BX_DEBUG(("PAE PDP: NX bit set when EFER.NXE is disabled"));
goto page_fault_reserved; goto page_fault_reserved;
else if (access_type == CODE_ACCESS) }
if (access_type == CODE_ACCESS) {
BX_DEBUG(("PAE PDP: non-executable page fault occured"));
goto page_fault_access; goto page_fault_access;
} }
} }
}
#endif #endif
if (!(pdp & 0x20)) { if (!(pdp & 0x20)) {
pdp |= 0x20; pdp |= 0x20;
@ -707,11 +715,15 @@ BX_CPU_C::translate_linear(bx_address laddr, unsigned pl, unsigned rw, unsigned
#if BX_SUPPORT_X86_64 #if BX_SUPPORT_X86_64
if (pde & PAGE_DIRECTORY_NX_BIT) { if (pde & PAGE_DIRECTORY_NX_BIT) {
if (! BX_CPU_THIS_PTR msr.nxe) if (! BX_CPU_THIS_PTR msr.nxe) {
BX_DEBUG(("PAE PDE: NX bit set when EFER.NXE is disabled"));
goto page_fault_reserved; goto page_fault_reserved;
else if (access_type == CODE_ACCESS) }
if (access_type == CODE_ACCESS) {
BX_DEBUG(("PAE PDE: non-executable page fault occured"));
goto page_fault_access; goto page_fault_access;
} }
}
#endif #endif
if (pde & BX_CONST64(0x7fffffff00000000)) { if (pde & BX_CONST64(0x7fffffff00000000)) {
@ -764,11 +776,15 @@ BX_CPU_C::translate_linear(bx_address laddr, unsigned pl, unsigned rw, unsigned
#if BX_SUPPORT_X86_64 #if BX_SUPPORT_X86_64
if (pte & PAGE_DIRECTORY_NX_BIT) { if (pte & PAGE_DIRECTORY_NX_BIT) {
if (! BX_CPU_THIS_PTR msr.nxe) if (! BX_CPU_THIS_PTR msr.nxe) {
BX_DEBUG(("PAE PTE: NX bit set when EFER.NXE is disabled"));
goto page_fault_reserved; goto page_fault_reserved;
else if (access_type == CODE_ACCESS) }
if (access_type == CODE_ACCESS) {
BX_DEBUG(("PAE PTE: non-executable page fault occured"));
goto page_fault_access; goto page_fault_access;
} }
}
#endif #endif
if (pte & BX_CONST64(0x7fffffff00000000)) { if (pte & BX_CONST64(0x7fffffff00000000)) {