vbox的更動 17215 路徑 trunk/src/VBox/VMM/PGMGstDefs.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/PGMGstDefs.h (移動) (移動 從 trunk/src/VBox/VMM/VMMAll/PGMAllGstDefs.h ) (1 筆差異)

trunk/src/VBox/VMM/PGMGstDefs.h

@@ -51 +51 @@
 #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
 
+# 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