Changeset 114 for trunk

Timestamp:

Jun 30, 2017, 11:26:32 AM (7 years ago)

Author:

max@…

Message:

compute the offset for bootinfo

Location:

trunk/hal/x86_64/core

Files:

• hal_gpt.c (modified) (1 diff)
• hal_init.c (modified) (2 diffs)

trunk/hal/x86_64/core/hal_gpt.c

@@ -71 +71 @@
 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);
+//      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;
 }
 

trunk/hal/x86_64/core/hal_init.c

@@ -109 +109 @@
 static void init_bootinfo(boot_info_t *info)
 {
+        extern paddr_t pa_avail;
+        extern vaddr_t va_avail;
+
         extern uint64_t __kernel_data_start;
         extern uint64_t __kernel_end;
+
+        size_t pa_offset = pa_avail - 0;
+        size_t va_offset = va_avail - CLUSTER_MIN_VA(0);
 
         memset(info, 0, sizeof(boot_info_t));
@@ -135 +141 @@
         /* dev_ XXX */
 
-        info->pages_offset = 0;
-        info->pages_nr = 0;
+        info->pages_offset = MAX(pa_offset, va_offset);
+        info->pages_nr = 0; /* XXX */
 
         info->kernel_code_start = (intptr_t)(KERNTEXTOFF - KERNBASE);