更新syscall

Author: xiaoyi1212

build.py

@@ -5,13 +5,9 @@ SECTIONS
 
 	. = 2M;
 
-	.multiboot :
-	{ 
-		*(.multiboot)
-	}
-
 	.text :
 	{
+	    *(.multiboot)
 		*(.text)
 	}
 

iso/limine.conf

@@ -1,4 +1,7 @@
 global gdt_flush,tss_flush,idt_flush,switch_to,copy_page_physical
+global asm_syscall_handler
+
+extern syscall
 
 gdt_flush: ; void gdt_flush(uint32_t gdtr);
     mov eax, [esp + 4] ; [esp+4]按规定是第一个参数，即gdtr
@@ -84,3 +87,19 @@ copy_page_physical:
     popf                  ; Pop EFLAGS back.
     pop ebx               ; Get the original value of EBX back.
     ret
+
+asm_syscall_handler:
+    cli
+    push ds
+    push es
+    push fs
+    push gs
+    pusha
+    call syscall
+    mov dword [esp+28], eax
+    popa
+    pop gs
+    pop fs
+    pop es
+    pop ds
+    IRETD

iso/limine/limine-bios-cd.bin

@@ -17,18 +17,25 @@
 #include "keyboard.h"
 #include "scheduler.h"
 #include "krlibc.h"
+#include "syscall.h"
 #include "shell.h"
 
 extern void* program_break_end;
 
 extern void iso9660_regist(); //iso9660.c
 
+int terminal_manual_flush(void* arg) { // 终端刷新服务
+    while (1) {
+        terminal_flush();
+    }
+}
+
 /*
  * 内核初始化函数, 最终会演变为CPU0的IDLE进程
  * > 注意, 其所有的函数调用顺序均不可改变. 需按顺序初始化OS功能
  * @Noreturn
  */
-_Noreturn void kernel_main(multiboot_t *multiboot, uint32_t kernel_stack) {
+void kernel_main(multiboot_t *multiboot, uint32_t kernel_stack) {
     vga_install();
 
     if(multiboot->cmdline != (multiboot_uint32_t)NULL) {
@@ -63,29 +70,17 @@ _Noreturn void kernel_main(multiboot_t *multiboot, uint32_t kernel_stack) {
     init_pcb();
 
     keyboard_init();
+    setup_syscall();
     create_kernel_thread((void*)setup_shell, NULL, "Shell");
     klogf(true,"Enable kernel shell service.\n");
+    create_kernel_thread(terminal_manual_flush, NULL, "Terminal manual flush");
+    klogf(true,"Enable terminal flush service.\n");
 
     klogf(true,"Kernel load done!\n");
     enable_scheduler();
     io_sti(); //内核加载完毕, 打开中断以启动进程调度器, 开始运行
 
-    // int ret = vfs_mkdir("/dev");
-    // printk(" vfs  ret=%d\n",ret);
-    // vfs_mount(NULL, vfs_open("/dev"));
-    // vfs_node_t p = vfs_open("/");
-    // list_foreach(p->child, i) {
-    //     vfs_node_t c = (vfs_node_t)i->data;
-    //     printk("%s ", c->name);
-    // }
-    // printk("\n");
-
-    // uint8_t *buf = kmalloc(2048);
-    // p = vfs_open("/dev/ide_atapi0");
-    // vfs_read(p,buf,2048,2048);
-    // for(int i = 0;i<2048;i++) {
-    //     printk("%02x ",buf[i]);
-    // }
+    __syscall(SYSCALL_PRINT,"Hello! Syscall!\n");
 
     while(1) io_hlt();
 }

iso/limine/limine-bios.sys

@@ -169,6 +169,10 @@ page_directory_t *clone_directory(page_directory_t *src) {
     return dir;
 }
 
+page_directory_t *get_current_directory(){
+    return current_directory;
+}
+
 void page_fault(registers_t *regs) {
     io_cli();
     uint32_t faulting_address;