Changeset 224 for trunk/hal/x86_64/core/hal_types.h

Timestamp:

Jul 18, 2017, 10:29:58 AM (7 years ago)

Author:

max@…

Message:

Create a (virtual) copy of the local cluster in 0xffffe00000000000, and
make GET_PTR() point to it. This way we can use pointers from GET_PTR()
directly, instead of reconstructing a XPTR with local_cxy.

File:

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

trunk/hal/x86_64/core/hal_types.h

@@ -196 +196 @@
 
 /* virtual */
+#define HAL_VA_LOCAL_CLUSTER   0xffffe00000000000ULL
 #define HAL_VA_BASE            0xffff800000000000ULL
 #define PTR_MASK               0x0000000FFFFFFFFFULL
@@ -201 +202 @@
 #define PTR_SHIFT              36
 #define GET_CXY(xp)            ((cxy_t)(((xp) & CXY_MASK) >> PTR_SHIFT))
-#define GET_PTR(xp)            ((void*)((xp) & PTR_MASK))
+#define GET_PTR(xp)            ((void*)(HAL_VA_LOCAL_CLUSTER | ((xp) & PTR_MASK)))
 #define XPTR(cxy,ptr)          ((uint64_t)HAL_VA_BASE | \
                                 ((uint64_t)(cxy) << PTR_SHIFT) | \