Merge branch 'master' into iso-9660

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

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index 5fac5f86f609e3efc078701234451291fe7ca454..14e48621a356ecaba5d750868c6cde5d1ec4b45f 100644 (file)
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -1,4 +1,3 @@
-#include <arch/x86/boot/multiboot.h>
 #include <lunaix/block.h>
 #include <lunaix/common.h>
 #include <lunaix/fctrl.h>
@@ -11,20 +10,27 @@
 #include <lunaix/mm/valloc.h>
 #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 <stddef.h>
+#include <lunaix/types.h>
+#include <sdbg/protocol.h>
 
 #include <hal/acpi/acpi.h>
 #include <hal/ahci/ahci.h>
 #include <hal/apic.h>
 #include <hal/ioapic.h>
 #include <hal/pci.h>
+#include <hal/rtc.h>
+
+#include <arch/x86/boot/multiboot.h>
 
 #include <klibc/string.h>
 
+#include <ulibc/stdio.h>
+
 LOG_MODULE("PROC0")
 
 extern void
@@ -45,7 +51,9 @@ __do_reserved_memory(int unlock);
 #define USE_DEMO
 // #define DEMO_SIGNAL
 // #define DEMO_READDIR
-#define DEMO_IOTEST
+// #define DEMO_IOTEST
+// #define DEMO_INPUT_TEST
+#define DEMO_SIMPLE_SH
 
 extern void
 _pconsole_main();
@@ -62,19 +70,22 @@ _readdir_main();
 extern void
 _iotest_main();
 
+extern void
+input_test();
+
+extern void
+sh_main();
+
 void __USER__
 __proc0_usr()
 {
     // 打开tty设备(控制台)，作为标准输入输出。
     //  tty设备属于序列设备（Sequential Device），该类型设备的上层读写
     //  无须经过Lunaix的缓存层，而是直接下发到底层驱动。（不受FO_DIRECT的影响）
-    int stdout = open("/dev/tty", 0);
-    int stdin = dup2(stdout, 1);
+    int fdstdout = open("/dev/tty", 0);
+    int fdstdin = dup2(stdout, 1);
 
     pid_t p;
-    if (!fork()) {
-        _pconsole_main();
-    }
 
     if (!(p = fork())) {
 #ifndef USE_DEMO
@@ -85,9 +96,15 @@ __proc0_usr()
         _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);
     }
 
     waitpid(p, 0, 0);
@@ -112,6 +129,7 @@ __proc0()
 
     init_proc_user_space(__current);
 
+    // user space
     asm volatile("movw %0, %%ax\n"
                  "movw %%ax, %%es\n"
                  "movw %%ax, %%ds\n"
@@ -139,31 +157,47 @@ init_platform()
     // 锁定所有系统预留页（内存映射IO，ACPI之类的），并且进行1:1映射
     lock_reserved_memory();
 
-    assert_msg(kalloc_init(), "Fail to initialize heap");
-
+    // firmware
     acpi_init(_k_init_mb_info);
+
+    // die
     apic_init();
     ioapic_init();
+
+    // debugger
+    serial_init();
+    sdbg_init();
+
+    // timers & clock
+    rtc_init();
     timer_init(SYS_TIMER_FREQUENCY_HZ);
     clock_init();
+
+    // peripherals & chipset features
     ps2_kbd_init();
     pci_init();
     block_init();
     ahci_init();
-    // ahci_list_device();
-    // cake_stats();
-
-    syscall_install();
 
+    // console
     console_start_flushing();
     console_flush();
 
+    // expose cake allocator states to vfs
+    cake_export();
+
     unlock_reserved_memory();
 
+    // clean up
     for (size_t i = 0; i < (uintptr_t)(&__init_hhk_end); i += PG_SIZE) {
         vmm_del_mapping(PD_REFERENCED, (void*)i);
         pmm_free_page(KERNEL_PID, (void*)i);
     }
+
+    // reserve higher half
+    for (size_t i = L1_INDEX(KERNEL_MM_BASE); i < 1023; i++) {
+        vmm_set_mapping(PD_REFERENCED, i << 22, 0, 0, VMAP_NOMAP);
+    }
 }
 
 void