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

Timestamp:

Jun 23, 2017, 9:57:35 AM (7 years ago)

Author:

max@…

Message:

Update. We need to use two separate arrays: one for the heap and one for
the kimg. The size of a heap entry is configurable, but that of the kimg
is not (fixed by mcmodel).

As a result, we also need to use two XPTRs: XPTR_HEAP and XPTR_KIMG. For
now we only declare XPTR_KIMG, and are not using it yet.

File:

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

trunk/hal/x86_64/hal_gpt.c

@@ -44 +44 @@
 #define pl4_i(VA)       (((VA_SIGN_POS(VA)) & L4_FRAME) >> L4_SHIFT)
 
+extern vaddr_t __kernel_end;
+size_t kimg_size __in_kdata = 0;
+
 paddr_t pa_avail __in_kdata = 0;
 vaddr_t va_avail __in_kdata = 0;
@@ -176 +179 @@
 void hal_gpt_init(paddr_t firstpa)
 {
+        paddr_t kimg_min_pa = 0;
+
+        /* Initialize global values */
         pa_avail = firstpa;
-        va_avail = CLUSTER_MIN_VA(0);
-        hal_gpt_maptree_area(CLUSTER_MIN_VA(0), CLUSTER_MAX_VA(0));
+        va_avail = CLUSTER_HEAP_MIN_VA(0);
+        kimg_size = ((uint64_t)&__kernel_end - KERNBASE);
+        XASSERT(kimg_size % PAGE_SIZE == 0);
+        kimg_size = kimg_size / PAGE_SIZE;
+
+        /* 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));
+
+        /* Manually enter cluster0's kimg */
+        hal_gpt_enter_range(CLUSTER_KIMG_MIN_VA(0), kimg_min_pa, kimg_size);
 }