fix: add dummy process to keep scheduler busy

[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..d1643b42a71c391f545729f75c78e42273bffa36 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/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>
 #include <lunaix/lxconsole.h>
 #include <lunaix/mm/mmio.h>
 #include <lunaix/mm/page.h>


@@ -32,8 +33,6 @@ multiboot_info_t* _k_init_mb_info;
 
 x86_page_table* __kernel_ptd;
 
 
 x86_page_table* __kernel_ptd;
 

-struct proc_info tmp;
-

 extern void
 __proc0(); /* proc0.c */
 
 extern void
 __proc0(); /* proc0.c */
 


@@ -46,9 +45,12 @@ setup_memory(multiboot_memory_map_t* map, size_t map_size);
 void
 _kernel_pre_init()
 {
 void
 _kernel_pre_init()
 {

+    // interrupts

     _init_idt();
     _init_idt();

+    isrm_init();

     intr_routine_init();
 
     intr_routine_init();
 

+    // memory

     pmm_init(MEM_1MB + (_k_init_mb_info->mem_upper << 10));
     vmm_init();
 
     pmm_init(MEM_1MB + (_k_init_mb_info->mem_upper << 10));
     vmm_init();
 


@@ -56,28 +58,30 @@ _kernel_pre_init()
       _k_init_mb_info->mmap_length / sizeof(multiboot_memory_map_t);
 
     setup_memory((multiboot_memory_map_t*)_k_init_mb_info->mmap_addr, map_size);
       _k_init_mb_info->mmap_length / sizeof(multiboot_memory_map_t);
 
     setup_memory((multiboot_memory_map_t*)_k_init_mb_info->mmap_addr, map_size);

-
-    __kernel_ptd = cpu_rcr3();
-
-    tmp = (struct proc_info){ .page_table = __kernel_ptd };
-
-    __current = &tmp;

 }
 
 void
 _kernel_init()
 {
     int errno = 0;
 }
 
 void
 _kernel_init()
 {
     int errno = 0;

+
+    // allocators

     cake_init();
     valloc_init();
 
     cake_init();
     valloc_init();
 

+    sched_init();
+
+    // crt

     tty_init(ioremap(VGA_FRAMEBUFFER, PG_SIZE));
     tty_set_theme(VGA_COLOR_WHITE, VGA_COLOR_BLACK);
 
     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_init();
     fsm_init();
     input_init();
 

+    vfs_export_attributes();
+

     if ((errno = vfs_mount_root("ramfs", NULL))) {
         panickf("Fail to mount root. (errno=%d)", errno);
     }
     if ((errno = vfs_mount_root("ramfs", NULL))) {
         panickf("Fail to mount root. (errno=%d)", errno);
     }


@@ -88,7 +92,7 @@ _kernel_init()
 
     lxconsole_init();
 
 
     lxconsole_init();
 

-    sched_init();
+    syscall_install();

 
     spawn_proc0();
 }
 
     spawn_proc0();
 }


@@ -162,6 +166,11 @@ spawn_proc0()
                  : "i"(KSTACK_TOP), "i"(KCODE_SEG), "r"(proc0->intr_ctx.eip)
                  : "%ebx", "memory");
 
                  : "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);
 
     // 向调度器注册进程。
     commit_process(proc0);