fix: ensure inlining

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

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index bdc23ced68618e2d89f95096b81c9471f752ae84..14e48621a356ecaba5d750868c6cde5d1ec4b45f 100644 (file)
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -10,11 +10,13 @@
 #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 <lunaix/types.h>
+#include <sdbg/protocol.h>
 
 #include <hal/acpi/acpi.h>
 #include <hal/ahci/ahci.h>
@@ -84,9 +86,6 @@ __proc0_usr()
     int fdstdin = dup2(stdout, 1);
 
     pid_t p;
-    // if (!fork()) {
-    //     _pconsole_main();
-    // }
 
     if (!(p = fork())) {
 #ifndef USE_DEMO
@@ -130,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"
@@ -157,29 +157,44 @@ init_platform()
     // 锁定所有系统预留页（内存映射IO，ACPI之类的），并且进行1:1映射
     lock_reserved_memory();
 
-    rtc_init();
+    // 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();
 
-    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);
     }