Changeset 47 for trunk/hal/x86_64/hal_gpt.c

Timestamp:

Jun 26, 2017, 11:48:28 AM (7 years ago)

Author:

max@…

Message:

Use mcmodel=large, in order to have a kernel image that is located at the
beginning of each cluster in virtual memory, as discussed with Alain. The
performance cost will be taken care of later.

Now, the active kernel is located at 0xfffff00000000000, and the base of
the clusters is 0xffff800000000000.

File:

• trunk/hal/x86_64/hal_gpt.c (modified) (3 diffs)

trunk/hal/x86_64/hal_gpt.c

@@ -71 +71 @@
 void hal_gpt_bootstrap_reset()
 {
-        size_t npages = (va_avail - CLUSTER_HEAP_MIN_VA(0)) / PAGE_SIZE;
-        hal_gpt_leave_range(CLUSTER_HEAP_MIN_VA(0), npages);
+        size_t npages = (va_avail - (CLUSTER_MIN_VA(0) + KERNEL_VA_SIZE)) / PAGE_SIZE;
+        hal_gpt_leave_range(CLUSTER_MIN_VA(0) + KERNEL_VA_SIZE, npages);
 }
 
@@ -211 +211 @@
         /* Initialize global values */
         pa_avail = firstpa;
-        va_avail = CLUSTER_HEAP_MIN_VA(0);
+        va_avail = CLUSTER_MIN_VA(0) + KERNEL_VA_SIZE;
         kimg_size = ((uint64_t)&__kernel_end - KERNBASE);
         XASSERT(kimg_size % PAGE_SIZE == 0);
@@ -217 +217 @@
 
         /* Create cluster0's heap entry. */
-        hal_gpt_maptree_area(CLUSTER_HEAP_MIN_VA(0), CLUSTER_HEAP_MAX_VA(0));
-
-        /* Create cluster0's kimg entry. */
-        hal_gpt_maptree_area(CLUSTER_KIMG_MIN_VA(0), CLUSTER_KIMG_MAX_VA(0));
+        hal_gpt_maptree_area(CLUSTER_MIN_VA(0), CLUSTER_MAX_VA(0));
 
         /* Manually enter cluster0's kimg */
-        hal_gpt_enter_range(CLUSTER_KIMG_MIN_VA(0), kimg_min_pa, kimg_size);
+        hal_gpt_enter_range(CLUSTER_MIN_VA(0), kimg_min_pa, kimg_size);
 }