X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/43c43c058ededea929645fef68d15820eed1f5e9..b6ff3c7dbab3f40d03389808d95ac27d416c35e3:/lunaix-os/kernel/proc0.c

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index 1e54e59..2029bc5 100644
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -1,9 +1,10 @@
 #include <lunaix/block.h>
 #include <lunaix/common.h>
-#include <lunaix/fctrl.h>
+#include <lunaix/exec.h>
+#include <lunaix/foptions.h>
 #include <lunaix/fs.h>
+#include <lunaix/fs/probe_boot.h>
 #include <lunaix/fs/twifs.h>
-#include <lunaix/lunistd.h>
 #include <lunaix/lxconsole.h>
 #include <lunaix/mm/cake.h>
 #include <lunaix/mm/pmm.h>
@@ -11,11 +12,11 @@
 #include <lunaix/mm/vmm.h>
 #include <lunaix/peripheral/ps2kbd.h>
 #include <lunaix/peripheral/serial.h>
-#include <lunaix/proc.h>
 #include <lunaix/spike.h>
 #include <lunaix/syscall.h>
 #include <lunaix/syslog.h>
 #include <lunaix/types.h>
+
 #include <sdbg/protocol.h>
 
 #include <hal/acpi/acpi.h>
@@ -29,13 +30,8 @@
 
 #include <klibc/string.h>
 
-#include <ulibc/stdio.h>
-
 LOG_MODULE("PROC0")
 
-extern void
-_lxinit_main(); /* lxinit.c */
-
 void
 init_platform();
 
@@ -48,70 +44,39 @@ unlock_reserved_memory();
 void
 __do_reserved_memory(int unlock);
 
-#define USE_DEMO
-// #define DEMO_SIGNAL
-// #define DEMO_READDIR
-// #define DEMO_IOTEST
-// #define DEMO_INPUT_TEST
-#define DEMO_SIMPLE_SH
-
-extern void
-_pconsole_main();
-
-extern void
-_signal_demo_main();
-
-extern void
-_lxinit_main();
-
-extern void
-_readdir_main();
-
-extern void
-_iotest_main();
+int
+mount_bootmedium()
+{
+    struct v_dnode* dnode;
+    int errno = 0;
+    struct device* dev = probe_boot_medium();
+    if (!dev) {
+        kprintf(KERROR "fail to acquire device. (%d)", errno);
+        return 0;
+    }
 
-extern void
-input_test();
+    if ((errno = vfs_mount("/mnt/lunaix-os", "iso9660", dev, 0))) {
+        kprintf(KERROR "fail to mount boot medium. (%d)", errno);
+        return 0;
+    }
 
-extern void
-sh_main();
+    return 1;
+}
 
-void __USER__
-__proc0_usr()
+int
+exec_initd()
 {
-    // 打开tty设备(控制台)，作为标准输入输出。
-    //  tty设备属于序列设备（Sequential Device），该类型设备的上层读写
-    //  无须经过Lunaix的缓存层，而是直接下发到底层驱动。（不受FO_DIRECT的影响）
-    int fdstdout = open("/dev/tty", 0);
-    int fdstdin = dup2(stdout, 1);
-
-    pid_t p;
-
-    if (!(p = fork())) {
-#ifndef USE_DEMO
-        _exit(0);
-#elif defined DEMO_SIGNAL
-        _signal_demo_main();
-#elif defined DEMO_READDIR
-        _readdir_main();
-#elif defined DEMO_IOTEST
-        _iotest_main();
-#elif defined DEMO_INPUT_TEST
-        input_test();
-#elif defined DEMO_SIMPLE_SH
-        sh_main();
-#else
-        _lxinit_main();
-#endif
-        printf("==== test end ====\n");
-        _exit(0);
+    int errno = 0;
+
+    if ((errno = exec_kexecve("/mnt/lunaix-os/usr/init", NULL, NULL))) {
+        goto fail;
     }
 
-    waitpid(p, 0, 0);
+    fail("should not reach");
 
-    while (1) {
-        yield();
-    }
+fail:
+    kprintf(KERROR "fail to load initd. (%d)", errno);
+    return 0;
 }
 
 /**
@@ -129,21 +94,12 @@ __proc0()
 
     init_proc_user_space(__current);
 
-    // user space
-    asm volatile("movw %0, %%ax\n"
-                 "movw %%ax, %%es\n"
-                 "movw %%ax, %%ds\n"
-                 "movw %%ax, %%fs\n"
-                 "movw %%ax, %%gs\n"
-                 "pushl %0\n"
-                 "pushl %1\n"
-                 "pushl %2\n"
-                 "pushl %3\n"
-                 "retf" ::"i"(UDATA_SEG),
-                 "i"(USTACK_TOP & ~0xf),
-                 "i"(UCODE_SEG),
-                 "r"(__proc0_usr)
-                 : "eax", "memory");
+    if (!mount_bootmedium() || !exec_initd()) {
+        while (1) {
+            asm("hlt");
+        }
+        // should not reach
+    }
 }
 
 extern uint8_t __kernel_start;            /* link/linker.ld */
@@ -154,7 +110,9 @@ extern multiboot_info_t* _k_init_mb_info; /* k_init.c */
 void
 init_platform()
 {
-    kprintf(KINFO "\033[11;0mLunaixOS \033[39;49m\n");
+    kprintf(KINFO "\033[11;0mLunaixOS (gcc v%s, %s)\033[39;49m\n",
+            __VERSION__,
+            __TIME__);
 
     // 锁定所有系统预留页（内存映射IO，ACPI之类的），并且进行1:1映射
     lock_reserved_memory();
@@ -193,7 +151,7 @@ init_platform()
 
     // clean up
     for (size_t i = 0; i < (uintptr_t)(&__init_hhk_end); i += PG_SIZE) {
-        vmm_del_mapping(PD_REFERENCED, (void*)i);
+        vmm_del_mapping(VMS_SELF, (void*)i);
         pmm_free_page(KERNEL_PID, (void*)i);
     }
 }
@@ -237,7 +195,7 @@ __do_reserved_memory(int unlock)
                     // Don't fuck up our kernel space!
                     break;
                 }
-                vmm_set_mapping(PD_REFERENCED, _pa, _pa, PG_PREM_R, VMAP_NULL);
+                vmm_set_mapping(VMS_SELF, _pa, _pa, PG_PREM_R, VMAP_NULL);
                 pmm_mark_page_occupied(
                   KERNEL_PID, _pa >> PG_SIZE_BITS, PP_FGLOCKED);
             }
@@ -250,7 +208,7 @@ __do_reserved_memory(int unlock)
                     mmap.type);
             for (; j < pg_num; j++) {
                 uintptr_t _pa = pa + (j << PG_SIZE_BITS);
-                vmm_del_mapping(PD_REFERENCED, _pa);
+                vmm_del_mapping(VMS_SELF, _pa);
                 if (mmap.type == MULTIBOOT_MEMORY_ACPI_RECLAIMABLE) {
                     pmm_mark_page_free(_pa >> PG_SIZE_BITS);
                 }