Changeset 112

Timestamp:

Jun 30, 2017, 10:47:08 AM (7 years ago)

Author:

max@…

Message:

In fact, we need to enter all of the VA space, because we massively
make this assumption later. The thing is, also need to keep the
same offset for the PA and VA, so it needs to be rethought. Until
then, add a commented code.

File:

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

trunk/hal/x86_64/core/hal_gpt.c

@@ -117 +117 @@
 void hal_gpt_maptree_area(vaddr_t va_start, vaddr_t va_end)
 {
-        pt_entry_t flags = PG_V| PG_KW | PG_NX;
+        pt_entry_t flags = PG_V | PG_KW | PG_NX;
         size_t L4start, L4end, nL4e;
         size_t L3start, L3end, nL3e;
@@ -203 +203 @@
 void hal_gpt_init(paddr_t firstpa)
 {
-        paddr_t kimg_min_pa = 0;
+        paddr_t kimg_min_pa, kimg_max_pa;
 
         /* Initialize global values */
@@ -210 +210 @@
         kimg_size = ((uint64_t)&__kernel_end - KERNBASE);
         XASSERT(kimg_size % PAGE_SIZE == 0);
-        kimg_size = kimg_size / PAGE_SIZE;
+
+        kimg_min_pa = 0;
+        kimg_max_pa = kimg_min_pa + kimg_size;
 
         /* Create cluster0's heap entry. */
@@ -216 +218 @@
 
         /* Manually enter cluster0's kimg */
-        hal_gpt_enter_range(CLUSTER_MIN_VA(0), kimg_min_pa, kimg_size);
+        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);
+*/
 }