vbox的更動 17215 路徑 trunk/src/VBox/VMM/PGMGst.h

時間撮記:

2009-2-27 下午04:33:19 (16 年 以前)

作者:

vboxsync

訊息:

Split up the definitions and the guest code. Otherwise we'll end up using e.g. wrong masks in Bth code.

檔案:

• trunk/src/VBox/VMM/PGMGst.h (修改) (1 筆差異)

trunk/src/VBox/VMM/PGMGst.h

@@ -19 +19 @@
  * 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