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

added ifdefs around 1G paging implementation

Browse Source
This commit is contained in:
Stanislav Shwartsman 2008-12-11 21:30:37 +00:00
parent a2e07ff971
commit 2682738968
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bochs/cpu/paging.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: paging.cc,v 1.163 2008-12-11 21:19:38 sshwarts Exp $
// $Id: paging.cc,v 1.164 2008-12-11 21:30:37 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -763,10 +763,10 @@ bx_phy_address BX_CPU_C::translate_linear_PAE(bx_address laddr, bx_address &lpf_
nx_fault = 1;
}
}
#if BX_SUPPORT_1G_PAGES
// 1G pages support
if (pdpe & 0x80) {
if (pdpe & PAGING_PAE_PDPE_RESERVED_BITS) {
if (pdpe & PAGING_PAE_PDPE1G_RESERVED_BITS) {
BX_DEBUG(("PAE 1G PDPE: reserved bit is set: PDPE=%08x:%08x", GET32H(pdpe), GET32L(pdpe)));
page_fault(ERROR_RESERVED | ERROR_PROTECTION, laddr, pl, rw);
}
@ -808,9 +808,10 @@ bx_phy_address BX_CPU_C::translate_linear_PAE(bx_address laddr, bx_address &lpf_
return ppf;
}
#endif
#endif
if (pdpe & PAGING_PAE_PDPE1G_RESERVED_BITS) {
if (pdpe & PAGING_PAE_PDPE_RESERVED_BITS) {
BX_DEBUG(("PAE PDPE: reserved bit is set: PDPE=%08x:%08x", GET32H(pdpe), GET32L(pdpe)));
page_fault(ERROR_RESERVED | ERROR_PROTECTION, laddr, pl, rw);
}