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

continue NX fix

Browse Source
This commit is contained in:
Stanislav Shwartsman 2010-03-30 16:56:41 +00:00
parent 845af0dc24
commit 2614b3ca2f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/cpu/paging.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: paging.cc,v 1.197 2010-03-25 22:04:31 sshwarts Exp $ // $Id: paging.cc,v 1.198 2010-03-30 16:56:41 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001-2010 The Bochs Project // Copyright (C) 2001-2010 The Bochs Project
@ -1125,8 +1125,8 @@ bx_phy_address BX_CPU_C::translate_linear(bx_address laddr, unsigned curr_pl, un
{ {
paddress = tlbEntry->ppf | poffset; paddress = tlbEntry->ppf | poffset;
// bx_bool isExecute = (rw == BX_EXECUTE); bx_bool isExecute = (rw == BX_EXECUTE);
if (! (tlbEntry->accessBits & (/* (isExecute<<2) |*/ (isWrite<<1) | pl))) if (! (tlbEntry->accessBits & ((isExecute<<2) | (isWrite<<1) | pl)))
return paddress; return paddress;
// The current access does not have permission according to the info // The current access does not have permission according to the info