Changeset 67 for trunk/hal/x86_64

Timestamp:

Jun 27, 2017, 10:02:15 AM (7 years ago)

Author:

max@…

Message:

switch to 64GB of VA per cluster, with 256 clusters

File:

• trunk/hal/x86_64/core/hal_types.h (modified) (3 diffs)

trunk/hal/x86_64/core/hal_types.h

@@ -162 +162 @@
  * - ptr : pointer in the virtual space of a single cluster.
  *
- * In Intel 64 bits, the kernel virtual space has 4 Gbytes per cluster
- * - the cxy field occupies bits[34:32]
- * - the ptr field occupies bits[31:0]
+ * In Intel 64 bits, the kernel virtual space has 64 Gbytes per cluster
+ * - the cxy field occupies bits[43:36]
+ * - the ptr field occupies bits[35:0]
  ***************************************************************************
  * A physical address is a 64 bits integer, structured in two fields :
@@ -171 +171 @@
  *
  * In Intel 64 bits, the physical space has 8 Gbytes per cluster.
- * - the cxy field occupies bits[35:33]
+ * - the cxy field occupies bits[40:33]
  * - the lpa field occupies bits[32:0]
  **************************************************************************/
@@ -193 +193 @@
 #define XPTR_NULL              0
 
-/* virtual (heap) */
-#define PTR_MASK               0x00000000FFFFFFFFULL
-#define CXY_MASK               0x0000000700000000ULL
-#define PTR_SHIFT              32
+/* virtual */
+#define PTR_MASK               0x0000000FFFFFFFFFULL
+#define CXY_MASK               0x00000FF000000000ULL
+#define PTR_SHIFT              36
 #define GET_CXY(xp)            ((cxy_t)(((xp) & CXY_MASK) >> PTR_SHIFT))
 #define GET_PTR(xp)            ((void*)((xp) & PTR_MASK))
 #define XPTR(cxy,ptr)          (((uint64_t)(cxy) << PTR_SHIFT) | (((uint64_t)(ptr)) & PTR_MASK))
-
-/* virtual (kimg). A KIMG entry has 2GB of VA. */
-#define PTR_KIMG_MASK          0x000000007FFFFFFFULL
-#define CXY_KIMG_MASK          0x0000000380000000ULL
-#define PTR_KIMG_SHIFT         31
-#define GET_KIMG_CXY(xp)       ((cxy_t)(((xp) & CXY_KIMG_MASK) >> PTR_KIMG_SHIFT))
-#define GET_KIMG_PTR(xp)       ((void*)((xp) & PTR_KIMG_MASK))
-#define XPTR_KIMG(cxy,ptr)     (((uint64_t)(cxy) << PTR_KIMG_SHIFT) | (((uint64_t)(ptr)) & PTR_KIMG_MASK))
 
 /* physical */