Changeset 32

Timestamp:

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

Author:

max@…

Message:

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

Location:

trunk/hal/x86_64

Files:

• hal_boot.S (modified) (6 diffs)
• hal_init.c (modified) (4 diffs)
• hal_multiboot.h (added)
• hal_types.h (modified) (2 diffs)
• x86_printf.c (modified) (3 diffs)

trunk/hal/x86_64/hal_boot.S

@@ -24 +24 @@
 #define x86_ASM
 #include <hal_boot.h>
+#include <hal_multiboot.h>
 #include <hal_register.h>
 #include <hal_segmentation.h>
@@ -181 +182 @@
         /* Warm boot */
         movw    $0x1234,0x472
+        cld
 
         /* Make sure it is a multiboot-compliant bootloader. */
-//      cmpl    $MULTIBOOT_INFO_MAGIC,%eax
-//      jne     boot_panic
+        cmpl    $MULTIBOOT_INFO_MAGIC,%eax
+        je      1f
+        ret     /* what to do? */
+1:
 
         movl    $RELOC(tmpstk),%esp
@@ -192 +196 @@
         popfl
 
+        /*
+         * Copy the various multiboot structures
+         */
+        movl    %ebx,%esi                       /* src */
+        movl    $RELOC(mb_info),%edi            /* dst */
+        movl    $MULTIBOOT_INFO_SIZE,%ecx       /* len */
+        rep
+        movsb   /* copy esi -> edi */
+
+        testl   $MULTIBOOT_INFO_HAS_LOADER_NAME,MB_MI_FLAGS(%ebx)
+        jz      1f
+        movl    MB_MI_LOADER_NAME(%ebx),%esi    /* src */
+        movl    $RELOC(mb_loader_name),%edi     /* dst */
+copy_loop:
+        cmpb    $0,(%esi)
+        je      copy_end
+        movsb   /* copy esi -> edi */
+        jmp     copy_loop
+copy_end:
+        movsb   /* copy esi -> edi */
+1:
+
+        testl   $MULTIBOOT_INFO_HAS_MMAP,MB_MI_FLAGS(%ebx)
+        jz      1f
+        movl    MB_MI_MMAP_ADDR(%ebx),%esi      /* src */
+        movl    $RELOC(mb_mmap),%edi            /* dst */
+        movl    MB_MI_MMAP_LENGTH(%ebx),%ecx    /* len */
+
+        rep
+        movsb   /* copy esi -> edi */
+1:
+
 /*
  * There are four levels of pages in amd64: PML4 -> PDP -> PD -> PT. They will
@@ -197 +233 @@
  *
  * Virtual address space of the kernel:
- * +---------------+------------+-----------------------------------+---
- * | TEXT + RODATA | DATA + BSS | L4 -> PROC0 STK -> L3 -> L2 -> L1 |
- * +---------------+------------+-----------------------------------+---
- *                             (1)
- *
- * ---+-------------+
- *    | ISA I/O MEM |
- * ---+-------------+
- *   (2)
+ * +---------------+------+-----------------------------------+-------------+
+ * | TEXT + RODATA | DATA | L4 -> PROC0 STK -> L3 -> L2 -> L1 | ISA I/O MEM |
+ * +---------------+------+-----------------------------------+-------------+
+ *                       (1)                                 (2)
  *
  * PROC0 STK is obviously not linked as a page level. It just happens to be
@@ -215 +246 @@
  *
  * Important note: the kernel segments are properly 4k-aligned
- * (see kern.ldscript), so there's no need to enforce alignment.
+ * (see kernel_x86.ld), so there's no need to enforce alignment.
  */
 
@@ -430 +461 @@
         killkpt
 
-        /* Relocate atdevbase. */
+        /* Save the virtual address of ISA I/O MEM. */
         movq    $(TABLESIZE+KERNBASE),%rdx
         addq    %rsi,%rdx

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;

trunk/hal/x86_64/hal_types.h

@@ -35 +35 @@
 #define __in_kdata      __attribute__((section(".kdata")))
 
-
 /**************************************************************************
  *                      Exact-width integer types.  
  **************************************************************************/
 
-typedef   signed           char     int8_t;
-typedef unsigned           char    uint8_t;
+typedef   signed           char      int8_t;
+typedef unsigned           char     uint8_t;
 
 typedef   signed           short    int16_t;
 typedef unsigned           short   uint16_t;
 
-typedef   signed long      int      int32_t;
-typedef unsigned long      int     uint32_t;
+typedef          int                int32_t;
+typedef unsigned int               uint32_t;
 
 typedef   signed long long int      int64_t;
@@ -53 +52 @@
 
 typedef uint64_t                     size_t;
+
+typedef uint64_t                    vaddr_t; // XXX
 
 /***************************************************************************

trunk/hal/x86_64/x86_printf.c

@@ -75 +75 @@
 }
 
+static void x86_ztoa(char *buf, uint64_t n, uint64_t base)
+{
+        uint64_t tmp;
+        int i, j;
+
+        tmp = n;
+        i = 0;
+
+        do {
+                tmp = n % base;
+                buf[i++] = (tmp < 10) ? (tmp + '0') : (tmp + 'a' - 10);
+        } while (n /= base);
+        buf[i--] = 0;
+
+        for (j = 0; j < i; j++, i--) {
+                tmp = buf[j];
+                buf[j] = buf[i];
+                buf[i] = tmp;
+        }
+}
+
 void x86_printf(char *s, ...)
 {
@@ -85 +106 @@
         int ival;
         unsigned int uival;
+        uint64_t zval;
 
         va_start(ap, s);
@@ -101 +123 @@
                         }
 
-                        if (c == 'd') {
+                        if (c == 'z') {
+                                zval = va_arg(ap, uint64_t);
+                                x86_ztoa(buf, zval, 10);
+
+                                buflen = strlen(buf);
+                                if (buflen < size)
+                                        for (i = size, j = buflen; i >= 0; i--, j--)
+                                                buf[i] = (j >= 0) ? buf[j] : '0';
+
+                                x86_printf(buf);
+                        } else if (c == 'Z') {
+                                zval = va_arg(ap, uint64_t);
+                                x86_ztoa(buf, zval, 16);
+
+                                buflen = strlen(buf);
+                                if (buflen < size)
+                                        for (i = size, j = buflen; i >= 0; i--, j--)
+                                                buf[i] = (j >= 0) ? buf[j] : '0';
+
+                                x86_printf("0x%s", buf);
+                        } else if (c == 'd') {
                                 ival = va_arg(ap, int);
                                 if (ival < 0) {