Changeset 224 for trunk/hal/x86_64/core/hal_gpt.c

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_gpt.c (modified) (1 diff)

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);
 }