Changeset 32 for trunk/hal/x86_64/hal_init.c

Timestamp:

Jun 21, 2017, 11:34:09 AM (7 years ago)

Author:

max@…

Message:

Update. Retrieve and parse the multiboot info, and dump the mmap. Some
more sanity checks could probably be added.

File:

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

trunk/hal/x86_64/hal_init.c

@@ -22 +22 @@
 #include <hal_types.h>
 #include <hal_boot.h>
+#include <hal_multiboot.h>
 #include <hal_segmentation.h>
 
@@ -39 +40 @@
 void cpu_attach();
 
-/* -------------------------------------------------------------------------- */
+
+struct multiboot_info mb_info __in_kdata;
+char mb_loader_name[PAGE_SIZE] __in_kdata;
+uint8_t mb_mmap[PAGE_SIZE] __in_kdata;
+
+#define offsetof(type, member) __builtin_offsetof(type, member)
+
+
+/* -------------------------------------------------------------------------- */
+
+static void
+dump_memmap()
+{
+        size_t mmap_length = mb_info.mi_mmap_length;
+        uint8_t *mmap_addr = (uint8_t *)&mb_mmap;
+        size_t i;
+
+        if (!(mb_info.mi_flags & MULTIBOOT_INFO_HAS_MMAP))
+                x86_printf("SHIT!!\n");
+
+        i = 0;
+        while (i < mmap_length) {
+                struct multiboot_mmap *mm;
+
+                mm = (struct multiboot_mmap *)(mmap_addr + i);
+
+                x86_printf("-> [%Z, %Z] %s\n", mm->mm_base_addr,
+                    mm->mm_base_addr + mm->mm_length,
+                    (mm->mm_type == 1) ? "ram" : "rsv" );
+
+                i += mm->mm_size + 4;
+        }
+}
 
 void init_x86_64(paddr_t firstpa)
@@ -46 +79 @@
 
         extern uint64_t __kernel_end;
-        x86_printf("__kernel_end: %p\n", (void *)&__kernel_end);
+        x86_printf("__kernel_end: %Z\n", (uint64_t)&__kernel_end);
 
         /* Create the global structures */
@@ -58 +91 @@
         cpu_attach();
         x86_printf("[+] cpu_attach called\n");
+
+        x86_printf("[+] bootloader: %s\n", mb_loader_name);
+
+        dump_memmap();
+
+        x86_printf("[+] dump finished\n");
 
         char *buf = NULL;