Changeset 224 for trunk

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.

Location:

trunk/hal/x86_64/core

Files:

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

trunk/hal/x86_64/core/hal_boot.h

@@ -144 +144 @@
         (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

@@ -224 +224 @@
         XASSERT(kimg_size % PAGE_SIZE == 0);
 
-        /* Create cluster0's page tree */
+        /*
+         * Create cluster0's page tree, enter the space, and unmap the area
+         * below the kernel.
+         */
         hal_gpt_maptree_area(CLUSTER_MIN_VA(0), CLUSTER_MIN_VA(0) + CLUSTER_PA_SIZE);
-
-        /* Enter cluster0's space */
         hal_gpt_enter_range(CLUSTER_MIN_VA(0), 0, CLUSTER_PA_SIZE / PAGE_SIZE);
-
-        /* Unmap the area below the kernel */
         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_init.c

@@ -300 +300 @@
         x86_printf("[+] cput_tls_init called\n");
 
+        mytest = 0;
         x86_printf("-> mytest = %z\n", mytest);
         void *hoho = &init_x86_64;

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