feat: integrate gdb support over serial port for bare-metal debugging.

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

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index 3a6ea62116aea40654d96c93ee97a39ac8c1167f..2a410322345706414a4d2d4719c548e63b8e7c4a 100644 (file)
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -1,21 +1,35 @@
-#include <arch/x86/boot/multiboot.h>
+#include <lunaix/block.h>

 #include <lunaix/common.h>
 #include <lunaix/common.h>

+#include <lunaix/fctrl.h>
+#include <lunaix/fs.h>
+#include <lunaix/fs/twifs.h>

 #include <lunaix/lunistd.h>
 #include <lunaix/lxconsole.h>
 #include <lunaix/lunistd.h>
 #include <lunaix/lxconsole.h>

+#include <lunaix/mm/cake.h>

 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/pmm.h>

+#include <lunaix/mm/valloc.h>

 #include <lunaix/mm/vmm.h>
 #include <lunaix/peripheral/ps2kbd.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/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/acpi/acpi.h>

-#include <hal/ahci.h>
+#include <hal/ahci/ahci.h>

 #include <hal/apic.h>
 #include <hal/ioapic.h>
 #include <hal/pci.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")
 
 
 LOG_MODULE("PROC0")
 


@@ -34,8 +48,12 @@ unlock_reserved_memory();
 void
 __do_reserved_memory(int unlock);
 
 void
 __do_reserved_memory(int unlock);
 

-//#define USE_DEMO
-#define DEMO_SIGNAL
+#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
 _pconsole_main();


@@ -46,22 +64,50 @@ _signal_demo_main();
 extern void
 _lxinit_main();
 
 extern void
 _lxinit_main();
 

+extern void
+_readdir_main();
+
+extern void
+_iotest_main();
+
+extern void
+input_test();
+
+extern void
+sh_main();
+

 void __USER__
 __proc0_usr()
 {
 void __USER__
 __proc0_usr()
 {

+    // 打开tty设备(控制台)，作为标准输入输出。
+    //  tty设备属于序列设备（Sequential Device），该类型设备的上层读写
+    //  无须经过Lunaix的缓存层，而是直接下发到底层驱动。（不受FO_DIRECT的影响）
+    int fdstdout = open("/dev/tty", 0);
+    int fdstdin = dup2(stdout, 1);
+

     pid_t p;
     pid_t p;

-    if (!fork()) {
-        _pconsole_main();
-    }
+    // if (!fork()) {
+    //     _pconsole_main();
+    // }

 
     if (!(p = fork())) {
 #ifndef USE_DEMO
         _exit(0);
 #elif defined DEMO_SIGNAL
         _signal_demo_main();
 
     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
 #else
         _lxinit_main();
 #endif

+        printf("==== test end ====\n");
+        _exit(0);

     }
 
     waitpid(p, 0, 0);
     }
 
     waitpid(p, 0, 0);


@@ -110,33 +156,38 @@ extern multiboot_info_t* _k_init_mb_info; /* k_init.c */
 void
 init_platform()
 {
 void
 init_platform()
 {

-    assert_msg(kalloc_init(), "Fail to initialize heap");
-

     // 锁定所有系统预留页（内存映射IO，ACPI之类的），并且进行1:1映射
     lock_reserved_memory();
 
     // 锁定所有系统预留页（内存映射IO，ACPI之类的），并且进行1:1映射
     lock_reserved_memory();
 

+    rtc_init();

     acpi_init(_k_init_mb_info);
     apic_init();
     ioapic_init();
     acpi_init(_k_init_mb_info);
     apic_init();
     ioapic_init();

+    serial_init();
+    sdbg_init();

     timer_init(SYS_TIMER_FREQUENCY_HZ);
     clock_init();
     ps2_kbd_init();
     pci_init();
     timer_init(SYS_TIMER_FREQUENCY_HZ);
     clock_init();
     ps2_kbd_init();
     pci_init();

+    block_init();

     ahci_init();
     ahci_init();

-    pci_print_device();
-    ahci_list_device();

 
     syscall_install();
 
     console_start_flushing();
     console_flush();
 
 
     syscall_install();
 
     console_start_flushing();
     console_flush();
 

+    cake_export();

     unlock_reserved_memory();
 
     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);
     }
     unlock_reserved_memory();
 
     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);
     }

+
+    for (size_t i = L1_INDEX(KERNEL_MM_BASE); i < 1023; i++) {
+        vmm_set_mapping(PD_REFERENCED, i << 22, 0, 0, VMAP_NOMAP);
+    }

 }
 
 void
 }
 
 void