Changeset 73

Timestamp:

Jun 27, 2017, 11:03:16 AM (7 years ago)

Author:

max@…

Message:

now that the fields are stable, embed the VA base in XPTR

Location:

trunk/hal/x86_64/core

Files:

• hal_boot.h (modified) (1 diff)
• hal_types.h (modified) (2 diffs)

trunk/hal/x86_64/core/hal_boot.h

@@ -131 +131 @@
 
 #define KERNEL_VA_SIZE          (NKL2_KIMG_ENTRIES * NBPD_L2)
-#define CLUSTERS_BASE_VA        0xffff800000000000
+#define CLUSTERS_BASE_VA        HAL_VA_BASE
 
 /* These parameters are configurable. */

trunk/hal/x86_64/core/hal_types.h

@@ -196 +196 @@
 
 /* virtual */
+#define HAL_VA_BASE            0xffff800000000000ULL
 #define PTR_MASK               0x0000000FFFFFFFFFULL
 #define CXY_MASK               0x00000FF000000000ULL
@@ -201 +202 @@
 #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))
+#define XPTR(cxy,ptr)          ((uint64_t)HAL_VA_BASE | \
+                                ((uint64_t)(cxy) << PTR_SHIFT) | \
+                                (((uint64_t)(ptr)) & PTR_MASK))
 
 /* physical */