Merge branch 'master' into iso-9660

[lunaix-os.git] / lunaix-os / kernel / k_init.c

diff --git a/lunaix-os/kernel/k_init.c b/lunaix-os/kernel/k_init.c
index fc6c51cc221c129bac5ae880ab4f3dc8c9638180..32164c88aa832cafad68c919068cf2dbe227d679 100644 (file)
--- a/lunaix-os/kernel/k_init.c
+++ b/lunaix-os/kernel/k_init.c
@@ -4,6 +4,7 @@
 #include <lunaix/device.h>
 #include <lunaix/foptions.h>
 #include <lunaix/input.h>
+#include <lunaix/isrm.h>
 #include <lunaix/lxconsole.h>
 #include <lunaix/mm/mmio.h>
 #include <lunaix/mm/page.h>
@@ -46,9 +47,12 @@ setup_memory(multiboot_memory_map_t* map, size_t map_size);
 void
 _kernel_pre_init()
 {
+    // interrupts
     _init_idt();
+    isrm_init();
     intr_routine_init();
 
+    // memory
     pmm_init(MEM_1MB + (_k_init_mb_info->mem_upper << 10));
     vmm_init();
 
@@ -68,16 +72,22 @@ void
 _kernel_init()
 {
     int errno = 0;
+
+    // allocators
     cake_init();
     valloc_init();
 
+    // crt
     tty_init(ioremap(VGA_FRAMEBUFFER, PG_SIZE));
     tty_set_theme(VGA_COLOR_WHITE, VGA_COLOR_BLACK);
 
+    // file system & device subsys
     vfs_init();
     fsm_init();
     input_init();
 
+    vfs_export_attributes();
+
     if ((errno = vfs_mount_root("ramfs", NULL))) {
         panickf("Fail to mount root. (errno=%d)", errno);
     }
@@ -90,6 +100,8 @@ _kernel_init()
 
     sched_init();
 
+    syscall_install();
+
     spawn_proc0();
 }
 
@@ -162,6 +174,11 @@ spawn_proc0()
                  : "i"(KSTACK_TOP), "i"(KCODE_SEG), "r"(proc0->intr_ctx.eip)
                  : "%ebx", "memory");
 
+    // 加载x87默认配置
+    asm volatile("fninit\n"
+                 "fxsave (%%eax)" ::"a"(proc0->fxstate)
+                 : "memory");
+
     // 向调度器注册进程。
     commit_process(proc0);