Changeset 70 for trunk/hal/x86_64

Timestamp:

Jun 27, 2017, 10:39:08 AM (7 years ago)

Author:

max@…

Message:

start constructing the bootinfo structure

Location:

trunk/hal/x86_64/core

Files:

• hal_init.c (modified) (3 diffs)
• hal_special.c (modified) (1 diff)
• hal_types.h (modified) (1 diff)

trunk/hal/x86_64/core/hal_init.c

@@ -36 +36 @@
 #include <core.h>
 #include <cluster.h>
+#include <chdev.h>
+
+#include <boot_info.h>
 
 static void gdt_create();
@@ -73 +76 @@
 }
 
+static void init_bootinfo_core(boot_core_t *core)
+{
+        memset(core, 0, sizeof(boot_core_t));
+
+        core->gid = hal_lapic_gid();
+        core->lid = 0;
+        core->cxy = 0;
+}
+
+static void init_bootinfo_txt(boot_device_t *dev)
+{
+        memset(dev, 0, sizeof(boot_device_t));
+
+        dev->base = 0xB8000;
+        dev->type = (DEV_FUNC_TXT << 16) | IMPL_TXT_X86;
+        dev->channels = 1;
+        dev->param0 = 0;
+        dev->param1 = 0;
+        dev->param2 = 0;
+        dev->param3 = 0;
+
+#ifdef NOTYET
+    uint32_t    irqs;    /*! number of input IRQs                    */
+    boot_irq_t  irq[32]; /*! array of input IRQS (PIC and ICU only)  */
+#endif
+}
+
+static void init_bootinfo(boot_info_t *info)
+{
+        extern uint64_t __kernel_data_start;
+        extern uint64_t __kernel_end;
+
+        memset(info, 0, sizeof(boot_info_t));
+
+        info->signature = 0;
+
+        info->paddr_width = 0;
+        info->x_width = 1;
+        info->y_width = 1;
+        info->x_size = 1;
+        info->y_size = 1;
+        info->io_cxy = 0;
+
+        info->ext_dev_nr = 1;
+        init_bootinfo_txt(&info->ext_dev[0]);
+
+        info->cxy = 0;
+        info->cores_nr = 1;
+        init_bootinfo_core(&info->core[0]);
+
+        info->rsvd_nr = 0;
+        /* rsvd XXX */
+
+        /* dev_ XXX */
+
+        info->pages_offset = 0;
+        info->pages_nr = 0;
+
+        info->kernel_code_start = (intptr_t)(KERNTEXTOFF - KERNBASE);
+        info->kernel_code_end = (intptr_t)(&__kernel_data_start - KERNBASE) - 1;
+        info->kernel_data_start = (intptr_t)(&__kernel_data_start - KERNBASE);
+        info->kernel_code_end = (intptr_t)(&__kernel_end - KERNBASE) - 1;
+}
+
 void init_x86_64(paddr_t firstpa)
 {
+        boot_info_t btinfo;
+
         x86_printf("[+] init_x86_64 called\n");
 
@@ -109 +178 @@
         *myptr = 1;
         x86_printf("-> mytest = %z\n", mytest);
+
+        init_bootinfo(&btinfo);
+        kernel_init(&btinfo);
+        x86_printf("[+] kernel_init called\n");
 
         int m = 0;

trunk/hal/x86_64/core/hal_special.c

@@ -70 +70 @@
 gid_t hal_get_gid()
 {
-        x86_panic((char *)__func__);
         return curcpu()->ci_gid;
 }

trunk/hal/x86_64/core/hal_types.h

@@ -34 +34 @@
 #define __arraycount(a) (sizeof(a) / sizeof(*(a)))
 #define __in_kdata      __attribute__((section(".kdata")))
+
+#define __HAL_x86_64__ 1
 
 /**************************************************************************