Index: /trunk/src/VBox/VMM/PGM.cpp =================================================================== --- /trunk/src/VBox/VMM/PGM.cpp (revision 17214) +++ /trunk/src/VBox/VMM/PGM.cpp (revision 17215) @@ -687,4 +687,5 @@ #define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_32BIT_PD_PHYS #include "PGMBth.h" +#include "PGMGstDefs.h" #include "PGMGst.h" #undef BTH_PGMPOOLKIND_PT_FOR_PT @@ -709,4 +710,5 @@ #define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_32BIT_PD_PHYS #include "PGMBth.h" +#include "PGMGstDefs.h" #include "PGMGst.h" #undef BTH_PGMPOOLKIND_PT_FOR_PT @@ -732,4 +734,5 @@ #define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_32BIT_PD #include "PGMBth.h" +#include "PGMGstDefs.h" #include "PGMGst.h" #undef BTH_PGMPOOLKIND_PT_FOR_BIG @@ -770,4 +773,5 @@ #define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_PAE_PT_FOR_PHYS #define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_PAE_PDPT_PHYS +#include "PGMGstDefs.h" #include "PGMBth.h" #undef BTH_PGMPOOLKIND_PT_FOR_PT @@ -791,4 +795,5 @@ #define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_PAE_PT_FOR_PHYS #define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_PAE_PDPT_PHYS +#include "PGMGstDefs.h" #include "PGMBth.h" #undef BTH_PGMPOOLKIND_PT_FOR_PT @@ -813,4 +818,5 @@ #define BTH_PGMPOOLKIND_PT_FOR_BIG PGMPOOLKIND_PAE_PT_FOR_32BIT_4MB #define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_PAE_PDPT_FOR_32BIT +#include "PGMGstDefs.h" #include "PGMBth.h" #undef BTH_PGMPOOLKIND_PT_FOR_BIG @@ -837,4 +843,5 @@ #define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_PAE_PDPT #include "PGMBth.h" +#include "PGMGstDefs.h" #include "PGMGst.h" #undef BTH_PGMPOOLKIND_PT_FOR_BIG @@ -877,4 +884,5 @@ # define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_64BIT_PML4 # include "PGMBth.h" +# include "PGMGstDefs.h" # include "PGMGst.h" # undef BTH_PGMPOOLKIND_PT_FOR_BIG @@ -914,4 +922,5 @@ #define PGM_BTH_NAME_R0_STR(name) PGM_BTH_NAME_R0_NESTED_REAL_STR(name) #define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_PAE_PT_FOR_PHYS +#include "PGMGstDefs.h" #include "PGMBth.h" #undef BTH_PGMPOOLKIND_PT_FOR_PT @@ -933,4 +942,5 @@ #define PGM_BTH_NAME_R0_STR(name) PGM_BTH_NAME_R0_NESTED_PROT_STR(name) #define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_PAE_PT_FOR_PHYS +#include "PGMGstDefs.h" #include "PGMBth.h" #undef BTH_PGMPOOLKIND_PT_FOR_PT @@ -953,4 +963,5 @@ #define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_PAE_PT_FOR_32BIT_PT #define BTH_PGMPOOLKIND_PT_FOR_BIG PGMPOOLKIND_PAE_PT_FOR_32BIT_4MB +#include "PGMGstDefs.h" #include "PGMBth.h" #undef BTH_PGMPOOLKIND_PT_FOR_BIG @@ -974,4 +985,5 @@ #define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_PAE_PT_FOR_PAE_PT #define BTH_PGMPOOLKIND_PT_FOR_BIG PGMPOOLKIND_PAE_PT_FOR_PAE_2MB +#include "PGMGstDefs.h" #include "PGMBth.h" #undef BTH_PGMPOOLKIND_PT_FOR_BIG @@ -996,4 +1008,5 @@ # define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_PAE_PT_FOR_PAE_PT # define BTH_PGMPOOLKIND_PT_FOR_BIG PGMPOOLKIND_PAE_PT_FOR_PAE_2MB +# include "PGMGstDefs.h" # include "PGMBth.h" # undef BTH_PGMPOOLKIND_PT_FOR_BIG @@ -1032,4 +1045,5 @@ #define PGM_BTH_NAME_R0_STR(name) PGM_BTH_NAME_R0_EPT_REAL_STR(name) #define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_PAE_PT_FOR_PHYS +#include "PGMGstDefs.h" #include "PGMBth.h" #undef BTH_PGMPOOLKIND_PT_FOR_PT @@ -1051,4 +1065,5 @@ #define PGM_BTH_NAME_R0_STR(name) PGM_BTH_NAME_R0_EPT_PROT_STR(name) #define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_PAE_PT_FOR_PHYS +#include "PGMGstDefs.h" #include "PGMBth.h" #undef BTH_PGMPOOLKIND_PT_FOR_PT @@ -1071,4 +1086,5 @@ #define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_PAE_PT_FOR_32BIT_PT #define BTH_PGMPOOLKIND_PT_FOR_BIG PGMPOOLKIND_PAE_PT_FOR_32BIT_4MB +#include "PGMGstDefs.h" #include "PGMBth.h" #undef BTH_PGMPOOLKIND_PT_FOR_BIG @@ -1092,4 +1108,5 @@ #define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_PAE_PT_FOR_PAE_PT #define BTH_PGMPOOLKIND_PT_FOR_BIG PGMPOOLKIND_PAE_PT_FOR_PAE_2MB +#include "PGMGstDefs.h" #include "PGMBth.h" #undef BTH_PGMPOOLKIND_PT_FOR_BIG @@ -1114,4 +1131,5 @@ # define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_PAE_PT_FOR_PAE_PT # define BTH_PGMPOOLKIND_PT_FOR_BIG PGMPOOLKIND_PAE_PT_FOR_PAE_2MB +# include "PGMGstDefs.h" # include "PGMBth.h" # undef BTH_PGMPOOLKIND_PT_FOR_BIG Index: /trunk/src/VBox/VMM/PGMGst.h =================================================================== --- /trunk/src/VBox/VMM/PGMGst.h (revision 17214) +++ /trunk/src/VBox/VMM/PGMGst.h (revision 17215) @@ -19,83 +19,4 @@ * additional information or have any questions. */ - -/******************************************************************************* -* Defined Constants And Macros * -*******************************************************************************/ -#undef GSTPT -#undef PGSTPT -#undef GSTPTE -#undef PGSTPTE -#undef GSTPD -#undef PGSTPD -#undef GSTPDE -#undef PGSTPDE -#undef GST_BIG_PAGE_SIZE -#undef GST_BIG_PAGE_OFFSET_MASK -#undef GST_PDE_PG_MASK -#undef GST_PDE_BIG_PG_MASK -#undef GST_PD_SHIFT -#undef GST_PD_MASK -#undef GST_PTE_PG_MASK -#undef GST_PT_SHIFT -#undef GST_PT_MASK -#undef GST_TOTAL_PD_ENTRIES -#undef GST_CR3_PAGE_MASK -#undef GST_PDPE_ENTRIES -#undef GST_GET_PDE_BIG_PG_GCPHYS - -#if PGM_GST_TYPE == PGM_TYPE_32BIT \ - || PGM_GST_TYPE == PGM_TYPE_REAL \ - || PGM_GST_TYPE == PGM_TYPE_PROT -# define GSTPT X86PT -# define PGSTPT PX86PT -# define GSTPTE X86PTE -# define PGSTPTE PX86PTE -# define GSTPD X86PD -# define PGSTPD PX86PD -# define GSTPDE X86PDE -# define PGSTPDE PX86PDE -# define GST_BIG_PAGE_SIZE X86_PAGE_4M_SIZE -# define GST_BIG_PAGE_OFFSET_MASK X86_PAGE_4M_OFFSET_MASK -# define GST_PDE_PG_MASK X86_PDE_PG_MASK -# define GST_PDE_BIG_PG_MASK X86_PDE4M_PG_MASK -# define GST_GET_PDE_BIG_PG_GCPHYS(PdeGst) pgmGstGet4MBPhysPage(&pVM->pgm.s, PdeGst) -# define GST_PD_SHIFT X86_PD_SHIFT -# define GST_PD_MASK X86_PD_MASK -# define GST_TOTAL_PD_ENTRIES X86_PG_ENTRIES -# define GST_PTE_PG_MASK X86_PTE_PG_MASK -# define GST_PT_SHIFT X86_PT_SHIFT -# define GST_PT_MASK X86_PT_MASK -# define GST_CR3_PAGE_MASK X86_CR3_PAGE_MASK - -#elif PGM_GST_TYPE == PGM_TYPE_PAE \ - || PGM_GST_TYPE == PGM_TYPE_AMD64 -# define GSTPT X86PTPAE -# define PGSTPT PX86PTPAE -# define GSTPTE X86PTEPAE -# define PGSTPTE PX86PTEPAE -# define GSTPD X86PDPAE -# define PGSTPD PX86PDPAE -# define GSTPDE X86PDEPAE -# define PGSTPDE PX86PDEPAE -# define GST_BIG_PAGE_SIZE X86_PAGE_2M_SIZE -# define GST_BIG_PAGE_OFFSET_MASK X86_PAGE_2M_OFFSET_MASK -# define GST_PDE_PG_MASK X86_PDE_PAE_PG_MASK -# define GST_PDE_BIG_PG_MASK X86_PDE2M_PAE_PG_MASK -# define GST_GET_PDE_BIG_PG_GCPHYS(PdeGst) (PdeGst.u & GST_PDE_BIG_PG_MASK) -# define GST_PD_SHIFT X86_PD_PAE_SHIFT -# define GST_PD_MASK X86_PD_PAE_MASK -# if PGM_GST_TYPE == PGM_TYPE_PAE -# define GST_TOTAL_PD_ENTRIES (X86_PG_PAE_ENTRIES * X86_PG_PAE_PDPE_ENTRIES) -# define GST_PDPE_ENTRIES X86_PG_PAE_PDPE_ENTRIES -# else -# define GST_TOTAL_PD_ENTRIES (X86_PG_AMD64_ENTRIES * X86_PG_AMD64_PDPE_ENTRIES) -# define GST_PDPE_ENTRIES X86_PG_AMD64_PDPE_ENTRIES -# endif -# define GST_PTE_PG_MASK X86_PTE_PAE_PG_MASK -# define GST_PT_SHIFT X86_PT_PAE_SHIFT -# define GST_PT_MASK X86_PT_PAE_MASK -# define GST_CR3_PAGE_MASK X86_CR3_PAE_PAGE_MASK -#endif Index: /trunk/src/VBox/VMM/PGMGstDefs.h =================================================================== --- /trunk/src/VBox/VMM/PGMGstDefs.h (revision 17215) +++ /trunk/src/VBox/VMM/PGMGstDefs.h (revision 17215) @@ -0,0 +1,135 @@ +/* $Id$ */ +/** @file + * VBox - Page Manager, Guest Paging Template - All context code. + */ + +/* + * Copyright (C) 2006-2007 Sun Microsystems, Inc. + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa + * Clara, CA 95054 USA or visit http://www.sun.com if you need + * additional information or have any questions. + */ + + +/******************************************************************************* +* Defined Constants And Macros * +*******************************************************************************/ +#undef GSTPT +#undef PGSTPT +#undef GSTPTE +#undef PGSTPTE +#undef GSTPD +#undef PGSTPD +#undef GSTPDE +#undef PGSTPDE +#undef GST_BIG_PAGE_SIZE +#undef GST_BIG_PAGE_OFFSET_MASK +#undef GST_PDE_PG_MASK +#undef GST_PDE_BIG_PG_MASK +#undef GST_PD_SHIFT +#undef GST_PD_MASK +#undef GST_PTE_PG_MASK +#undef GST_PT_SHIFT +#undef GST_PT_MASK +#undef GST_TOTAL_PD_ENTRIES +#undef GST_CR3_PAGE_MASK +#undef GST_PDPE_ENTRIES +#undef GST_PDPT_SHIFT +#undef GST_PDPT_MASK +#undef GST_PDPE_PG_MASK +#undef GST_GET_PDE_BIG_PG_GCPHYS + +#if PGM_GST_TYPE == PGM_TYPE_REAL \ + || PGM_GST_TYPE == PGM_TYPE_PROT + +# if PGM_SHW_TYPE == PGM_TYPE_EPT +# define GSTPT X86PTPAE +# define PGSTPT PX86PTPAE +# define GSTPTE X86PTEPAE +# define PGSTPTE PX86PTEPAE +# define GSTPD X86PDPAE +# define PGSTPD PX86PDPAE +# define GSTPDE X86PDEPAE +# define PGSTPDE PX86PDEPAE +# define GST_PTE_PG_MASK X86_PTE_PAE_PG_MASK +# else +# define GSTPT SHWPT +# define PGSTPT PSHWPT +# define GSTPTE SHWPTE +# define PGSTPTE PSHWPTE +# define GSTPD SHWPD +# define PGSTPD PSHWPD +# define GSTPDE SHWPDE +# define PGSTPDE PSHWPDE +# define GST_PTE_PG_MASK SHW_PTE_PG_MASK +# endif +#elif PGM_GST_TYPE == PGM_TYPE_32BIT +# define GSTPT X86PT +# define PGSTPT PX86PT +# define GSTPTE X86PTE +# define PGSTPTE PX86PTE +# define GSTPD X86PD +# define PGSTPD PX86PD +# define GSTPDE X86PDE +# define PGSTPDE PX86PDE +# define GST_BIG_PAGE_SIZE X86_PAGE_4M_SIZE +# define GST_BIG_PAGE_OFFSET_MASK X86_PAGE_4M_OFFSET_MASK +# define GST_PDE_PG_MASK X86_PDE_PG_MASK +# define GST_PDE_BIG_PG_MASK X86_PDE4M_PG_MASK +# define GST_GET_PDE_BIG_PG_GCPHYS(PdeGst) pgmGstGet4MBPhysPage(&pVM->pgm.s, PdeGst) +# define GST_PD_SHIFT X86_PD_SHIFT +# define GST_PD_MASK X86_PD_MASK +# define GST_TOTAL_PD_ENTRIES X86_PG_ENTRIES +# define GST_PTE_PG_MASK X86_PTE_PG_MASK +# define GST_PT_SHIFT X86_PT_SHIFT +# define GST_PT_MASK X86_PT_MASK +# define GST_CR3_PAGE_MASK X86_CR3_PAGE_MASK + +#elif PGM_GST_TYPE == PGM_TYPE_PAE \ + || PGM_GST_TYPE == PGM_TYPE_AMD64 +# define GSTPT X86PTPAE +# define PGSTPT PX86PTPAE +# define GSTPTE X86PTEPAE +# define PGSTPTE PX86PTEPAE +# define GSTPD X86PDPAE +# define PGSTPD PX86PDPAE +# define GSTPDE X86PDEPAE +# define PGSTPDE PX86PDEPAE +# define GST_BIG_PAGE_SIZE X86_PAGE_2M_SIZE +# define GST_BIG_PAGE_OFFSET_MASK X86_PAGE_2M_OFFSET_MASK +# define GST_PDE_PG_MASK X86_PDE_PAE_PG_MASK_FULL +# define GST_PDE_BIG_PG_MASK X86_PDE2M_PAE_PG_MASK +# define GST_GET_PDE_BIG_PG_GCPHYS(PdeGst) (PdeGst.u & GST_PDE_BIG_PG_MASK) +# define GST_PD_SHIFT X86_PD_PAE_SHIFT +# define GST_PD_MASK X86_PD_PAE_MASK +# if PGM_GST_TYPE == PGM_TYPE_PAE +# define GST_TOTAL_PD_ENTRIES (X86_PG_PAE_ENTRIES * X86_PG_PAE_PDPE_ENTRIES) +# define GST_PDPE_ENTRIES X86_PG_PAE_PDPE_ENTRIES +# define GST_PDPE_PG_MASK X86_PDPE_PG_MASK_FULL +# define GST_PDPT_SHIFT X86_PDPT_SHIFT +# define GST_PDPT_MASK X86_PDPT_MASK_PAE +# define GST_PTE_PG_MASK X86_PTE_PAE_PG_MASK +# define GST_CR3_PAGE_MASK X86_CR3_PAE_PAGE_MASK +# else +# define GST_TOTAL_PD_ENTRIES (X86_PG_AMD64_ENTRIES * X86_PG_AMD64_PDPE_ENTRIES) +# define GST_PDPE_ENTRIES X86_PG_AMD64_PDPE_ENTRIES +# define GST_PDPT_SHIFT X86_PDPT_SHIFT +# define GST_PDPE_PG_MASK X86_PDPE_PG_MASK_FULL +# define GST_PDPT_MASK X86_PDPT_MASK_AMD64 +# define GST_PTE_PG_MASK X86_PTE_PAE_PG_MASK_FULL +# define GST_CR3_PAGE_MASK X86_CR3_AMD64_PAGE_MASK +# endif +# define GST_PT_SHIFT X86_PT_PAE_SHIFT +# define GST_PT_MASK X86_PT_PAE_MASK +#endif + + Index: /trunk/src/VBox/VMM/VMMAll/PGMAll.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMAll/PGMAll.cpp (revision 17214) +++ /trunk/src/VBox/VMM/VMMAll/PGMAll.cpp (revision 17215) @@ -88,4 +88,5 @@ #define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_32BIT_PT_FOR_PHYS #define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_32BIT_PD_PHYS +#include "PGMGstDefs.h" #include "PGMAllGst.h" #include "PGMAllBth.h" @@ -102,4 +103,5 @@ #define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_32BIT_PT_FOR_PHYS #define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_32BIT_PD_PHYS +#include "PGMGstDefs.h" #include "PGMAllGst.h" #include "PGMAllBth.h" @@ -117,4 +119,5 @@ #define BTH_PGMPOOLKIND_PT_FOR_BIG PGMPOOLKIND_32BIT_PT_FOR_32BIT_4MB #define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_32BIT_PD +#include "PGMGstDefs.h" #include "PGMAllGst.h" #include "PGMAllBth.h" @@ -144,4 +147,5 @@ #define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_PAE_PT_FOR_PHYS #define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_PAE_PDPT_PHYS +#include "PGMGstDefs.h" #include "PGMAllBth.h" #undef BTH_PGMPOOLKIND_PT_FOR_PT @@ -157,4 +161,5 @@ #define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_PAE_PT_FOR_PHYS #define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_PAE_PDPT_PHYS +#include "PGMGstDefs.h" #include "PGMAllBth.h" #undef BTH_PGMPOOLKIND_PT_FOR_PT @@ -171,4 +176,5 @@ #define BTH_PGMPOOLKIND_PT_FOR_BIG PGMPOOLKIND_PAE_PT_FOR_32BIT_4MB #define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_PAE_PDPT_FOR_32BIT +#include "PGMGstDefs.h" #include "PGMAllBth.h" #undef BTH_PGMPOOLKIND_PT_FOR_BIG @@ -187,4 +193,5 @@ #define BTH_PGMPOOLKIND_PT_FOR_BIG PGMPOOLKIND_PAE_PT_FOR_PAE_2MB #define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_PAE_PDPT +#include "PGMGstDefs.h" #include "PGMAllGst.h" #include "PGMAllBth.h" @@ -214,4 +221,5 @@ # define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_PAE_PT_FOR_PHYS # define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_PAE_PD_PHYS +# include "PGMGstDefs.h" # include "PGMAllBth.h" # undef BTH_PGMPOOLKIND_PT_FOR_PT @@ -229,4 +237,5 @@ # define BTH_PGMPOOLKIND_PT_FOR_BIG PGMPOOLKIND_PAE_PT_FOR_PAE_2MB # define BTH_PGMPOOLKIND_ROOT PGMPOOLKIND_64BIT_PML4 +# include "PGMGstDefs.h" # include "PGMAllGst.h" # include "PGMAllBth.h" @@ -254,4 +263,5 @@ # define PGM_GST_NAME(name) PGM_GST_NAME_REAL(name) # define PGM_BTH_NAME(name) PGM_BTH_NAME_NESTED_REAL(name) +# include "PGMGstDefs.h" # include "PGMAllBth.h" # undef PGM_BTH_NAME @@ -263,4 +273,5 @@ # define PGM_GST_NAME(name) PGM_GST_NAME_PROT(name) # define PGM_BTH_NAME(name) PGM_BTH_NAME_NESTED_PROT(name) +# include "PGMGstDefs.h" # include "PGMAllBth.h" # undef PGM_BTH_NAME @@ -272,4 +283,5 @@ # define PGM_GST_NAME(name) PGM_GST_NAME_32BIT(name) # define PGM_BTH_NAME(name) PGM_BTH_NAME_NESTED_32BIT(name) +# include "PGMGstDefs.h" # include "PGMAllBth.h" # undef PGM_BTH_NAME @@ -281,4 +293,5 @@ # define PGM_GST_NAME(name) PGM_GST_NAME_PAE(name) # define PGM_BTH_NAME(name) PGM_BTH_NAME_NESTED_PAE(name) +# include "PGMGstDefs.h" # include "PGMAllBth.h" # undef PGM_BTH_NAME @@ -291,4 +304,5 @@ # define PGM_GST_NAME(name) PGM_GST_NAME_AMD64(name) # define PGM_BTH_NAME(name) PGM_BTH_NAME_NESTED_AMD64(name) +# include "PGMGstDefs.h" # include "PGMAllBth.h" # undef PGM_BTH_NAME @@ -313,4 +327,5 @@ # define PGM_BTH_NAME(name) PGM_BTH_NAME_EPT_REAL(name) # define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_EPT_PT_FOR_PHYS +# include "PGMGstDefs.h" # include "PGMAllBth.h" # undef BTH_PGMPOOLKIND_PT_FOR_PT @@ -324,4 +339,5 @@ # define PGM_BTH_NAME(name) PGM_BTH_NAME_EPT_PROT(name) # define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_EPT_PT_FOR_PHYS +# include "PGMGstDefs.h" # include "PGMAllBth.h" # undef BTH_PGMPOOLKIND_PT_FOR_PT @@ -335,4 +351,5 @@ # define PGM_BTH_NAME(name) PGM_BTH_NAME_EPT_32BIT(name) # define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_EPT_PT_FOR_PHYS +# include "PGMGstDefs.h" # include "PGMAllBth.h" # undef BTH_PGMPOOLKIND_PT_FOR_PT @@ -346,4 +363,5 @@ # define PGM_BTH_NAME(name) PGM_BTH_NAME_EPT_PAE(name) # define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_EPT_PT_FOR_PHYS +# include "PGMGstDefs.h" # include "PGMAllBth.h" # undef BTH_PGMPOOLKIND_PT_FOR_PT @@ -358,4 +376,5 @@ # define PGM_BTH_NAME(name) PGM_BTH_NAME_EPT_AMD64(name) # define BTH_PGMPOOLKIND_PT_FOR_PT PGMPOOLKIND_EPT_PT_FOR_PHYS +# include "PGMGstDefs.h" # include "PGMAllBth.h" # undef BTH_PGMPOOLKIND_PT_FOR_PT Index: /trunk/src/VBox/VMM/VMMAll/PGMAllBth.h =================================================================== --- /trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (revision 17214) +++ /trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (revision 17215) @@ -1572,6 +1572,8 @@ * Update statistics and commit the entry. */ +#if PGM_WITH_PAGING(PGM_GST_TYPE, PGM_SHW_TYPE) if (!PteSrc.n.u1Global) pShwPage->fSeenNonGlobal = true; +#endif *pPteDst = PteDst; } Index: /trunk/src/VBox/VMM/VMMAll/PGMAllGst.h =================================================================== --- /trunk/src/VBox/VMM/VMMAll/PGMAllGst.h (revision 17214) +++ /trunk/src/VBox/VMM/VMMAll/PGMAllGst.h (revision 17215) @@ -19,105 +19,4 @@ * additional information or have any questions. */ - - -/******************************************************************************* -* Defined Constants And Macros * -*******************************************************************************/ -#undef GSTPT -#undef PGSTPT -#undef GSTPTE -#undef PGSTPTE -#undef GSTPD -#undef PGSTPD -#undef GSTPDE -#undef PGSTPDE -#undef GST_BIG_PAGE_SIZE -#undef GST_BIG_PAGE_OFFSET_MASK -#undef GST_PDE_PG_MASK -#undef GST_PDE_BIG_PG_MASK -#undef GST_PD_SHIFT -#undef GST_PD_MASK -#undef GST_PTE_PG_MASK -#undef GST_PT_SHIFT -#undef GST_PT_MASK -#undef GST_TOTAL_PD_ENTRIES -#undef GST_CR3_PAGE_MASK -#undef GST_PDPE_ENTRIES -#undef GST_PDPT_SHIFT -#undef GST_PDPT_MASK -#undef GST_PDPE_PG_MASK -#undef GST_GET_PDE_BIG_PG_GCPHYS - -#if PGM_GST_TYPE == PGM_TYPE_REAL \ - || PGM_GST_TYPE == PGM_TYPE_PROT -# define GSTPT SHWPT -# define PGSTPT PSHWPT -# define GSTPTE SHWPTE -# define PGSTPTE PSHWPTE -# define GSTPD SHWPD -# define PGSTPD PSHWPD -# define GSTPDE SHWPDE -# define PGSTPDE PSHWPDE -# define GST_PTE_PG_MASK SHW_PTE_PG_MASK - -#elif PGM_GST_TYPE == PGM_TYPE_32BIT -# define GSTPT X86PT -# define PGSTPT PX86PT -# define GSTPTE X86PTE -# define PGSTPTE PX86PTE -# define GSTPD X86PD -# define PGSTPD PX86PD -# define GSTPDE X86PDE -# define PGSTPDE PX86PDE -# define GST_BIG_PAGE_SIZE X86_PAGE_4M_SIZE -# define GST_BIG_PAGE_OFFSET_MASK X86_PAGE_4M_OFFSET_MASK -# define GST_PDE_PG_MASK X86_PDE_PG_MASK -# define GST_PDE_BIG_PG_MASK X86_PDE4M_PG_MASK -# define GST_GET_PDE_BIG_PG_GCPHYS(PdeGst) pgmGstGet4MBPhysPage(&pVM->pgm.s, PdeGst) -# define GST_PD_SHIFT X86_PD_SHIFT -# define GST_PD_MASK X86_PD_MASK -# define GST_TOTAL_PD_ENTRIES X86_PG_ENTRIES -# define GST_PTE_PG_MASK X86_PTE_PG_MASK -# define GST_PT_SHIFT X86_PT_SHIFT -# define GST_PT_MASK X86_PT_MASK -# define GST_CR3_PAGE_MASK X86_CR3_PAGE_MASK - -#elif PGM_GST_TYPE == PGM_TYPE_PAE \ - || PGM_GST_TYPE == PGM_TYPE_AMD64 -# define GSTPT X86PTPAE -# define PGSTPT PX86PTPAE -# define GSTPTE X86PTEPAE -# define PGSTPTE PX86PTEPAE -# define GSTPD X86PDPAE -# define PGSTPD PX86PDPAE -# define GSTPDE X86PDEPAE -# define PGSTPDE PX86PDEPAE -# define GST_BIG_PAGE_SIZE X86_PAGE_2M_SIZE -# define GST_BIG_PAGE_OFFSET_MASK X86_PAGE_2M_OFFSET_MASK -# define GST_PDE_PG_MASK X86_PDE_PAE_PG_MASK_FULL -# define GST_PDE_BIG_PG_MASK X86_PDE2M_PAE_PG_MASK -# define GST_GET_PDE_BIG_PG_GCPHYS(PdeGst) (PdeGst.u & GST_PDE_BIG_PG_MASK) -# define GST_PD_SHIFT X86_PD_PAE_SHIFT -# define GST_PD_MASK X86_PD_PAE_MASK -# if PGM_GST_TYPE == PGM_TYPE_PAE -# define GST_TOTAL_PD_ENTRIES (X86_PG_PAE_ENTRIES * X86_PG_PAE_PDPE_ENTRIES) -# define GST_PDPE_ENTRIES X86_PG_PAE_PDPE_ENTRIES -# define GST_PDPE_PG_MASK X86_PDPE_PG_MASK_FULL -# define GST_PDPT_SHIFT X86_PDPT_SHIFT -# define GST_PDPT_MASK X86_PDPT_MASK_PAE -# define GST_PTE_PG_MASK X86_PTE_PAE_PG_MASK -# define GST_CR3_PAGE_MASK X86_CR3_PAE_PAGE_MASK -# else -# define GST_TOTAL_PD_ENTRIES (X86_PG_AMD64_ENTRIES * X86_PG_AMD64_PDPE_ENTRIES) -# define GST_PDPE_ENTRIES X86_PG_AMD64_PDPE_ENTRIES -# define GST_PDPT_SHIFT X86_PDPT_SHIFT -# define GST_PDPE_PG_MASK X86_PDPE_PG_MASK_FULL -# define GST_PDPT_MASK X86_PDPT_MASK_AMD64 -# define GST_PTE_PG_MASK X86_PTE_PAE_PG_MASK_FULL -# define GST_CR3_PAGE_MASK X86_CR3_AMD64_PAGE_MASK -# endif -# define GST_PT_SHIFT X86_PT_PAE_SHIFT -# define GST_PT_MASK X86_PT_PAE_MASK -#endif Index: unk/src/VBox/VMM/VMMAll/PGMAllGstDefs.h =================================================================== --- /trunk/src/VBox/VMM/VMMAll/PGMAllGstDefs.h (revision 17214) +++ (revision ) @@ -1,123 +1,0 @@ -/* $Id$ */ -/** @file - * VBox - Page Manager, Guest Paging Template - All context code. - */ - -/* - * Copyright (C) 2006-2007 Sun Microsystems, Inc. - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa - * Clara, CA 95054 USA or visit http://www.sun.com if you need - * additional information or have any questions. - */ - - -/******************************************************************************* -* Defined Constants And Macros * -*******************************************************************************/ -#undef GSTPT -#undef PGSTPT -#undef GSTPTE -#undef PGSTPTE -#undef GSTPD -#undef PGSTPD -#undef GSTPDE -#undef PGSTPDE -#undef GST_BIG_PAGE_SIZE -#undef GST_BIG_PAGE_OFFSET_MASK -#undef GST_PDE_PG_MASK -#undef GST_PDE_BIG_PG_MASK -#undef GST_PD_SHIFT -#undef GST_PD_MASK -#undef GST_PTE_PG_MASK -#undef GST_PT_SHIFT -#undef GST_PT_MASK -#undef GST_TOTAL_PD_ENTRIES -#undef GST_CR3_PAGE_MASK -#undef GST_PDPE_ENTRIES -#undef GST_PDPT_SHIFT -#undef GST_PDPT_MASK -#undef GST_PDPE_PG_MASK -#undef GST_GET_PDE_BIG_PG_GCPHYS - -#if PGM_GST_TYPE == PGM_TYPE_REAL \ - || PGM_GST_TYPE == PGM_TYPE_PROT -# define GSTPT SHWPT -# define PGSTPT PSHWPT -# define GSTPTE SHWPTE -# define PGSTPTE PSHWPTE -# define GSTPD SHWPD -# define PGSTPD PSHWPD -# define GSTPDE SHWPDE -# define PGSTPDE PSHWPDE -# define GST_PTE_PG_MASK SHW_PTE_PG_MASK - -#elif PGM_GST_TYPE == PGM_TYPE_32BIT -# define GSTPT X86PT -# define PGSTPT PX86PT -# define GSTPTE X86PTE -# define PGSTPTE PX86PTE -# define GSTPD X86PD -# define PGSTPD PX86PD -# define GSTPDE X86PDE -# define PGSTPDE PX86PDE -# define GST_BIG_PAGE_SIZE X86_PAGE_4M_SIZE -# define GST_BIG_PAGE_OFFSET_MASK X86_PAGE_4M_OFFSET_MASK -# define GST_PDE_PG_MASK X86_PDE_PG_MASK -# define GST_PDE_BIG_PG_MASK X86_PDE4M_PG_MASK -# define GST_GET_PDE_BIG_PG_GCPHYS(PdeGst) pgmGstGet4MBPhysPage(&pVM->pgm.s, PdeGst) -# define GST_PD_SHIFT X86_PD_SHIFT -# define GST_PD_MASK X86_PD_MASK -# define GST_TOTAL_PD_ENTRIES X86_PG_ENTRIES -# define GST_PTE_PG_MASK X86_PTE_PG_MASK -# define GST_PT_SHIFT X86_PT_SHIFT -# define GST_PT_MASK X86_PT_MASK -# define GST_CR3_PAGE_MASK X86_CR3_PAGE_MASK - -#elif PGM_GST_TYPE == PGM_TYPE_PAE \ - || PGM_GST_TYPE == PGM_TYPE_AMD64 -# define GSTPT X86PTPAE -# define PGSTPT PX86PTPAE -# define GSTPTE X86PTEPAE -# define PGSTPTE PX86PTEPAE -# define GSTPD X86PDPAE -# define PGSTPD PX86PDPAE -# define GSTPDE X86PDEPAE -# define PGSTPDE PX86PDEPAE -# define GST_BIG_PAGE_SIZE X86_PAGE_2M_SIZE -# define GST_BIG_PAGE_OFFSET_MASK X86_PAGE_2M_OFFSET_MASK -# define GST_PDE_PG_MASK X86_PDE_PAE_PG_MASK_FULL -# define GST_PDE_BIG_PG_MASK X86_PDE2M_PAE_PG_MASK -# define GST_GET_PDE_BIG_PG_GCPHYS(PdeGst) (PdeGst.u & GST_PDE_BIG_PG_MASK) -# define GST_PD_SHIFT X86_PD_PAE_SHIFT -# define GST_PD_MASK X86_PD_PAE_MASK -# if PGM_GST_TYPE == PGM_TYPE_PAE -# define GST_TOTAL_PD_ENTRIES (X86_PG_PAE_ENTRIES * X86_PG_PAE_PDPE_ENTRIES) -# define GST_PDPE_ENTRIES X86_PG_PAE_PDPE_ENTRIES -# define GST_PDPE_PG_MASK X86_PDPE_PG_MASK_FULL -# define GST_PDPT_SHIFT X86_PDPT_SHIFT -# define GST_PDPT_MASK X86_PDPT_MASK_PAE -# define GST_PTE_PG_MASK X86_PTE_PAE_PG_MASK -# define GST_CR3_PAGE_MASK X86_CR3_PAE_PAGE_MASK -# else -# define GST_TOTAL_PD_ENTRIES (X86_PG_AMD64_ENTRIES * X86_PG_AMD64_PDPE_ENTRIES) -# define GST_PDPE_ENTRIES X86_PG_AMD64_PDPE_ENTRIES -# define GST_PDPT_SHIFT X86_PDPT_SHIFT -# define GST_PDPE_PG_MASK X86_PDPE_PG_MASK_FULL -# define GST_PDPT_MASK X86_PDPT_MASK_AMD64 -# define GST_PTE_PG_MASK X86_PTE_PAE_PG_MASK_FULL -# define GST_CR3_PAGE_MASK X86_CR3_AMD64_PAGE_MASK -# endif -# define GST_PT_SHIFT X86_PT_PAE_SHIFT -# define GST_PT_MASK X86_PT_PAE_MASK -#endif - -