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

Fixed data type for cr3_masked

Browse Source
This commit is contained in:
Stanislav Shwartsman 2008-05-11 19:58:41 +00:00
parent 4a76bd2169
commit d934190370
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bochs/cpu/cpu.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: cpu.h,v 1.476 2008-05-11 19:36:06 sshwarts Exp $ // $Id: cpu.h,v 1.477 2008-05-11 19:58:41 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001 MandrakeSoft S.A. // Copyright (C) 2001 MandrakeSoft S.A.
@ -805,7 +805,8 @@ public: // for now...
bx_cr0_t cr0; bx_cr0_t cr0;
Bit32u cr1; Bit32u cr1;
bx_address cr2; bx_address cr2;
bx_address cr3, cr3_masked; bx_address cr3;
bx_phy_address cr3_masked;
#if BX_CPU_LEVEL >= 4 #if BX_CPU_LEVEL >= 4
bx_cr4_t cr4; bx_cr4_t cr4;
#endif #endif

7
bochs/cpu/paging.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: paging.cc,v 1.129 2008-05-11 19:36:06 sshwarts Exp $ // $Id: paging.cc,v 1.130 2008-05-11 19:58:41 sshwarts Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001 MandrakeSoft S.A. // Copyright (C) 2001 MandrakeSoft S.A.
@ -462,8 +462,8 @@ BX_CPU_C::SetCR3(bx_address val)
#if BX_SUPPORT_PAE #if BX_SUPPORT_PAE
if (BX_CPU_THIS_PTR cr4.get_PAE() && !long_mode()) { if (BX_CPU_THIS_PTR cr4.get_PAE() && !long_mode()) {
// when not in long mode cr3 could be only 32-bit
BX_CPU_THIS_PTR cr3_masked = val & 0xffffffe0; BX_CPU_THIS_PTR cr3_masked = val & 0xffffffe0;
BX_CPU_THIS_PTR cr3 = val & 0xffffffff;
} }
else else
#endif #endif
@ -478,8 +478,9 @@ BX_CPU_C::SetCR3(bx_address val)
exception(BX_GP_EXCEPTION, 0, 0); exception(BX_GP_EXCEPTION, 0, 0);
} }
BX_CPU_THIS_PTR cr3_masked = val & BX_CONST64(0x000ffffffffff000); BX_CPU_THIS_PTR cr3_masked = val & BX_CONST64(0x000ffffffffff000);
BX_CPU_THIS_PTR cr3 = val;
} }
BX_CPU_THIS_PTR cr3 = val;
} }
// Called to initialize the TLB upon startup. // Called to initialize the TLB upon startup.