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

Timestamp:

Jul 24, 2017, 4:30:00 PM (6 years ago)

Author:

max@…

Message:

Use local_cxy for GET_PTR, instead of the triple map. This fixes a number
of inconsistencies.

File:

• trunk/hal/x86_64/core/hal_types.h (modified) (1 diff)

trunk/hal/x86_64/core/hal_types.h

@@ -204 +204 @@
 #define PTR_SHIFT              36
 #define GET_CXY(xp)            ((cxy_t)(((xp) & CXY_MASK) >> PTR_SHIFT))
-#define GET_PTR(xp)            ((void*)(HAL_VA_LOCAL_CLUSTER | ((xp) & PTR_MASK)))
+
+#define GET_PTR(xp)            ((void *)((uint64_t)HAL_VA_BASE | \
+                                ((uint64_t)(local_cxy) << PTR_SHIFT) | \
+                                (((uint64_t)(xp)) & PTR_MASK)))
+
 #define XPTR(cxy,ptr)          ((uint64_t)HAL_VA_BASE | \
                                 ((uint64_t)(cxy) << PTR_SHIFT) | \