X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/98fd6cb58b5bbc55cd9ceb45bd27b45a3b222df7..04ee277abd77fc51c5ab02ee58790a859607ea24:/lunaix-os/kernel/k_init.c?ds=sidebyside

diff --git a/lunaix-os/kernel/k_init.c b/lunaix-os/kernel/k_init.c
index 25af27e..2dc39e6 100644
--- a/lunaix-os/kernel/k_init.c
+++ b/lunaix-os/kernel/k_init.c
@@ -1,18 +1,20 @@
 #include <lunaix/common.h>
-#include <lunaix/tty/tty.h>
-
 #include <lunaix/device.h>
 #include <lunaix/foptions.h>
 #include <lunaix/input.h>
 #include <lunaix/isrm.h>
 #include <lunaix/lxconsole.h>
+#include <lunaix/mm/cake.h>
 #include <lunaix/mm/mmio.h>
 #include <lunaix/mm/page.h>
 #include <lunaix/mm/pmm.h>
+#include <lunaix/mm/valloc.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/process.h>
 #include <lunaix/sched.h>
 #include <lunaix/spike.h>
+#include <lunaix/syscall.h>
+#include <lunaix/tty/tty.h>
 #include <lunaix/types.h>
 
 #include <arch/x86/boot/multiboot.h>
@@ -22,9 +24,9 @@
 #include <klibc/stdio.h>
 #include <klibc/string.h>
 
-extern uint8_t __kernel_start;
-extern uint8_t __kernel_end;
-extern uint8_t __init_hhk_end;
+extern u8_t __kernel_start;
+extern u8_t __kernel_end;
+extern u8_t __init_hhk_end;
 
 #define PP_KERN_SHARED (PP_FGSHARED | PP_TKERN)
 
@@ -124,10 +126,6 @@ spawn_proc0()
      * 目前的解决方案是2
      */
 
-    proc0->intr_ctx = (isr_param){ .registers = { .ds = KDATA_SEG,
-                                                  .es = KDATA_SEG,
-                                                  .fs = KDATA_SEG,
-                                                  .gs = KDATA_SEG } };
     proc0->parent = proc0;
 
     // 方案1：必须在读取eflags之后禁用。否则当进程被调度时，中断依然是关闭的！
@@ -139,12 +137,12 @@ spawn_proc0()
     proc0->page_table = vmm_dup_vmspace(proc0->pid);
 
     // 直接切换到新的拷贝，进行配置。
-    cpu_lcr3(proc0->page_table);
+    cpu_ldvmspace(proc0->page_table);
 
     // 为内核创建一个专属栈空间。
     for (size_t i = 0; i < (KSTACK_SIZE >> PG_SIZE_BITS); i++) {
-        uintptr_t pa = pmm_alloc_page(KERNEL_PID, 0);
-        vmm_set_mapping(PD_REFERENCED,
+        ptr_t pa = pmm_alloc_page(KERNEL_PID, 0);
+        vmm_set_mapping(VMS_SELF,
                         KSTACK_START + (i << PG_SIZE_BITS),
                         pa,
                         PG_PREM_RW,
@@ -153,17 +151,19 @@ spawn_proc0()
 
     struct exec_param* execp =
       (struct exec_param*)(KSTACK_TOP - sizeof(struct exec_param));
+    isr_param* isrp = (isr_param*)((ptr_t)execp - sizeof(isr_param));
 
     *execp = (struct exec_param){ .cs = KCODE_SEG,
-                                  .eip = (void*)__proc0,
+                                  .eip = (ptr_t)__proc0,
                                   .ss = KDATA_SEG,
                                   .eflags = cpu_reflags() };
-    proc0->intr_ctx.execp = execp;
+    *isrp = (isr_param){ .registers = { .ds = KDATA_SEG,
+                                        .es = KDATA_SEG,
+                                        .fs = KDATA_SEG,
+                                        .gs = KDATA_SEG },
+                         .execp = execp };
 
-    // 加载x87默认配置
-    asm volatile("fninit\n"
-                 "fxsave (%%eax)" ::"a"(proc0->fxstate)
-                 : "memory");
+    proc0->intr_ctx = isrp;
 
     // 向调度器注册进程。
     commit_process(proc0);
@@ -177,9 +177,6 @@ spawn_proc0()
     assert_msg(0, "Unexpected Return");
 }
 
-extern void __usrtext_start;
-extern void __usrtext_end;
-
 // 按照 Memory map 标识可用的物理页
 void
 setup_memory(multiboot_memory_map_t* map, size_t map_size)
@@ -190,7 +187,7 @@ setup_memory(multiboot_memory_map_t* map, size_t map_size)
         multiboot_memory_map_t mmap = map[i];
         if (mmap.type == MULTIBOOT_MEMORY_AVAILABLE) {
             // 整数向上取整除法
-            uintptr_t pg = map[i].addr_low + 0x0fffU;
+            ptr_t pg = map[i].addr_low + 0x0fffU;
             pmm_mark_chunk_free(pg >> PG_SIZE_BITS,
                                 map[i].len_low >> PG_SIZE_BITS);
         }
@@ -200,12 +197,8 @@ setup_memory(multiboot_memory_map_t* map, size_t map_size)
     size_t pg_count = V2P(&__kernel_end) >> PG_SIZE_BITS;
     pmm_mark_chunk_occupied(KERNEL_PID, 0, pg_count, PP_FGLOCKED);
 
-    for (uintptr_t i = &__usrtext_start; i < &__usrtext_end; i += PG_SIZE) {
-        vmm_set_mapping(PD_REFERENCED, i, V2P(i), PG_PREM_UR, VMAP_NULL);
-    }
-
     // reserve higher half
     for (size_t i = L1_INDEX(KERNEL_MM_BASE); i < 1023; i++) {
-        assert(vmm_set_mapping(PD_REFERENCED, i << 22, 0, 0, VMAP_NOMAP));
+        assert(vmm_set_mapping(VMS_SELF, i << 22, 0, 0, VMAP_NOMAP));
     }
 }