Changeset 148 for trunk/hal

Timestamp:

Jul 5, 2017, 3:14:43 PM (7 years ago)

Author:

max@…

Message:

fix a pretty dumb bug; we must not unmap since we use the area for
cluster0's virtual space

File:

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

trunk/hal/x86_64/core/hal_gpt.c

@@ -63 +63 @@
 void hal_gpt_bootstrap_reset()
 {
-        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);
+        /*
+         * Re-enter cluster0's space, because we altered it when mapping the ACPI
+         * tables.
+         */
+        hal_gpt_enter_range(CLUSTER_MIN_VA(0), 0, CLUSTER_PA_SIZE / PAGE_SIZE);
+
         va_avail = CLUSTER_MIN_VA(0) + KERNEL_VA_SIZE;
 }
@@ -124 +128 @@
  * enter these addresses to physical locations.
  *
- * This functions is a bit complicated, and may need to be revisited.
+ * This function is a bit complicated, and may need to be revisited.
  */
 void hal_gpt_maptree_area(vaddr_t va_start, vaddr_t va_end)
@@ -226 +230 @@
 
         /* Create cluster0's page tree */
-        hal_gpt_maptree_area(CLUSTER_MIN_VA(0), CLUSTER_MAX_VA(0));
-
-        /* Manually enter cluster0's kimg */
-        hal_gpt_enter_range(CLUSTER_MIN_VA(0), kimg_min_pa, kimg_size / PAGE_SIZE);
-
-        /* 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);
+        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 */