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

Timestamp:

Jun 30, 2017, 5:18:13 PM (7 years ago)

Author:

max@…

Message:

complete hal_ppm_init, to take into account the reserved areas

File:

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

trunk/hal/x86_64/core/hal_gpt.c

@@ -71 +71 @@
 void hal_gpt_bootstrap_reset()
 {
-//      XXX: will be revisited later
-//      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);
-//      va_avail = CLUSTER_MIN_VA(0) + KERNEL_VA_SIZE;
+        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);
+        va_avail = CLUSTER_MIN_VA(0) + KERNEL_VA_SIZE;
+}
+
+/*
+ * Uniformize the PA and VA offsets, and return the value. After this function,
+ * we are guaranteed to have [VA = PA + constant_offset]. And therefore we can
+ * only call hal_gpt_bootstrap_valloc, without entering it in a PA.
+ */
+size_t hal_gpt_bootstrap_uniformize()
+{
+        size_t pa_offset = pa_avail - 0;
+        size_t va_offset = va_avail - CLUSTER_MIN_VA(0);
+
+        if (pa_offset < va_offset)
+                pa_avail += (va_offset - pa_offset);
+        else if (pa_offset > va_offset)
+                va_avail += (pa_offset - va_offset);
+
+        return MAX(pa_offset, va_offset);
 }
 
@@ -81 +98 @@
         XASSERT(va % PAGE_SIZE == 0);
         XASSERT(pa % PAGE_SIZE == 0);
-        XASSERT(va == tmpva || PTE_BASE[pl1_i(va)] == 0);
+        //XASSERT(va == tmpva || PTE_BASE[pl1_i(va)] == 0);
         PTE_BASE[pl1_i(va)] = (pa & PG_FRAME) | flags;
         invlpg(va);
@@ -223 +240 @@
 
         /* Manually enter cluster0's heap */
-/*
         hal_gpt_enter_range(CLUSTER_MIN_VA(0) + kimg_size, kimg_max_pa,
             (CLUSTER_VA_SIZE - kimg_size) / PAGE_SIZE);
-*/
 }