Changeset 272

Timestamp:

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

Author:

max@…

Message:

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

Location:

trunk/hal/x86_64/core

Files:

• hal_boot.h (modified) (1 diff)
• hal_gpt.c (modified) (1 diff)
• hal_types.h (modified) (1 diff)

trunk/hal/x86_64/core/hal_boot.h

@@ -151 +151 @@
         (CLUSTER_MIN_VA(n) + CLUSTER_VA_SIZE)
 
-/* Macros indicating the VA ranges for the local cluster*/
-#define LOCAL_CLUSTER_MIN_VA    HAL_VA_LOCAL_CLUSTER
-#define LOCAL_CLUSTER_MAX_VA    (LOCAL_CLUSTER_MIN_VA + CLUSTER_VA_SIZE)
-

trunk/hal/x86_64/core/hal_gpt.c

@@ -231 +231 @@
         hal_gpt_enter_range(CLUSTER_MIN_VA(0), 0, CLUSTER_PA_SIZE / PAGE_SIZE);
         hal_gpt_leave_range(CLUSTER_MIN_VA(0), (KERNTEXTOFF - KERNBASE) / PAGE_SIZE);
-
-        /*
-         * Do the same, but now in the local cluster map.
-         */
-        hal_gpt_maptree_area(LOCAL_CLUSTER_MIN_VA, LOCAL_CLUSTER_MIN_VA + CLUSTER_PA_SIZE);
-        hal_gpt_enter_range(LOCAL_CLUSTER_MIN_VA, 0, CLUSTER_PA_SIZE / PAGE_SIZE);
-        hal_gpt_leave_range(LOCAL_CLUSTER_MIN_VA, (KERNTEXTOFF - KERNBASE) / PAGE_SIZE);
 }
 

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) | \