Changeset 44 for trunk/hal/x86_64/hal_types.h

Timestamp:

Jun 23, 2017, 9:57:35 AM (7 years ago)

Author:

max@…

Message:

Update. We need to use two separate arrays: one for the heap and one for
the kimg. The size of a heap entry is configurable, but that of the kimg
is not (fixed by mcmodel).

As a result, we also need to use two XPTRs: XPTR_HEAP and XPTR_KIMG. For
now we only declare XPTR_KIMG, and are not using it yet.

File:

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

trunk/hal/x86_64/hal_types.h

@@ -163 +163 @@
  *
  * In Intel 64 bits, the kernel virtual space has 4 Gbytes per cluster
- * - the cxy field occupies bits[63:32]
+ * - the cxy field occupies bits[34:32]
  * - the ptr field occupies bits[31:0]
  ***************************************************************************
@@ -193 +193 @@
 #define XPTR_NULL              0
 
+/* virtual (heap) */
 #define PTR_MASK               0x00000000FFFFFFFFULL
-
+#define CXY_MASK               0x0000000700000000ULL
 #define PTR_SHIFT              32
-
-#define GET_CXY(xp)            ((cxy_t)((xp) >> PTR_SHIFT))
-
+#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 */
 #define LPA_MASK               0x00000001FFFFFFFFULL
-
 #define LPA_SHIFT              33
-
 #define CXY_FROM_PADDR(paddr)  ((cxy_t)((paddr) >> LPA_SHIFT))
-
 #define LPA_FROM_PADDR(paddr)  (lpa_t)((paddr & LPA_MASK)
-
 #define PADDR(cxy,lad)         (((uint64_t)(cxy) << LPA_SHIFT) | (((uint64_t)(ptr)) & LPA_MASK))