Changeset 93554 in vbox for trunk/include/VBox

Timestamp:

Feb 2, 2022 10:57:02 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

149688

Message:

VMM: Changed PAGE_SIZE -> GUEST_PAGE_SIZE / HOST_PAGE_SIZE, PAGE_SHIFT -> GUEST_PAGE_SHIFT / HOST_PAGE_SHIFT, and PAGE_OFFSET_MASK -> GUEST_PAGE_OFFSET_MASK / HOST_PAGE_OFFSET_MASK. Also removed most usage of ASMMemIsZeroPage and ASMMemZeroPage since the host and guest page size doesn't need to be the same any more. Some work left to do in the page pool code. bugref:9898

Location:

trunk/include/VBox

Files:

• param.h (modified) (1 diff)
• vmm/gmm.h (modified) (1 diff)

trunk/include/VBox/param.h

@@ -39 +39 @@
  * @{
  */
+
+/** The guest page size (x86). */
+#define GUEST_PAGE_SIZE             0x1000
+/** The guest page offset mask (x86).
+ * @note If one-complementing this, always put a typecast after the operator! */
+#define GUEST_PAGE_OFFSET_MASK      0xfff
+/** The guest page shift (x86). */
+#define GUEST_PAGE_SHIFT            12
+
+/** Host page size. */
+#define HOST_PAGE_SIZE              PAGE_SIZE
+/** Host page offset mask.
+ * @note If one-complementing this, always put a typecast after the operator! */
+#define HOST_PAGE_OFFSET_MASK       PAGE_OFFSET_MASK
+/** Host page shift. */
+#define HOST_PAGE_SHIFT             PAGE_SHIFT
+
 
 /** The maximum number of pages that can be allocated and mapped

trunk/include/VBox/vmm/gmm.h

@@ -83 +83 @@
 /** The allocation chunk size. */
 #define GMM_CHUNK_SIZE                  (1U << GMM_CHUNK_SHIFT)
-/** The allocation chunk size in pages. */
-#define GMM_CHUNK_NUM_PAGES             (1U << (GMM_CHUNK_SHIFT - PAGE_SHIFT))
+/** The allocation chunk size in (guest) pages. */
+#define GMM_CHUNK_NUM_PAGES             (1U << (GMM_CHUNK_SHIFT - GUEST_PAGE_SHIFT))
 /** The shift factor for converting a page id into a chunk id. */
-#define GMM_CHUNKID_SHIFT               (GMM_CHUNK_SHIFT - PAGE_SHIFT)
+#define GMM_CHUNKID_SHIFT               (GMM_CHUNK_SHIFT - GUEST_PAGE_SHIFT)
 /** The last valid Chunk ID value. */
 #define GMM_CHUNKID_LAST                (GMM_PAGEID_LAST >> GMM_CHUNKID_SHIFT)