refactor: simplify the vmm design, single responsibility. But using it should with...

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

diff --git a/lunaix-os/kernel/k_init.c b/lunaix-os/kernel/k_init.c
index eee475fc604d0dbb7786c174a7bd530df1368ca9..971464c9f705a722d4243a8060d142a1f5ab7894 100644 (file)
--- a/lunaix-os/kernel/k_init.c
+++ b/lunaix-os/kernel/k_init.c
@@ -82,11 +82,9 @@ _kernel_init()
 
     // 为内核创建一个专属栈空间。
     for (size_t i = 0; i < (KSTACK_SIZE >> PG_SIZE_BITS); i++) {
-        vmm_alloc_page(KERNEL_PID,
-                       (void*)(KSTACK_START + (i << PG_SIZE_BITS)),
-                       NULL,
-                       PG_PREM_RW,
-                       0);
+        uintptr_t pa = pmm_alloc_page(KERNEL_PID, 0);
+        vmm_set_mapping(
+          PD_REFERENCED, KSTACK_START + (i << PG_SIZE_BITS), pa, PG_PREM_RW);
     }
     kprintf(KINFO "[MM] Allocated %d pages for stack start at %p\n",
             KSTACK_SIZE >> PG_SIZE_BITS,
@@ -118,18 +116,22 @@ spawn_proc0()
      *      2. 将_kernel_post_init搬进proc0进程
      * （_kernel_post_init已经更名为init_platform）
      *
-     * 目前的解决方案是两者都使用
+     * 目前的解决方案是2
      */
 
     init_proc(&proc0);
-    proc0.intr_ctx = (isr_param){ .registers.esp = KSTACK_TOP - 20,
+    proc0.intr_ctx = (isr_param){ .registers = { .ds = KDATA_SEG,
+                                                 .es = KDATA_SEG,
+                                                 .fs = KDATA_SEG,
+                                                 .gs = KDATA_SEG },
                                   .cs = KCODE_SEG,
                                   .eip = (void*)__proc0,
                                   .ss = KDATA_SEG,
                                   .eflags = cpu_reflags() };
 
-    // 必须在读取eflags之后禁用。否则当进程被调度时，中断依然是关闭的！
-    cpu_disable_interrupt();
+    // 方案1：必须在读取eflags之后禁用。否则当进程被调度时，中断依然是关闭的！
+    // cpu_disable_interrupt();
+
     setup_proc_mem(&proc0, PD_REFERENCED);
 
     // Ok... 首先fork进我们的零号进程，而后由那里，我们fork进init进程。
@@ -139,18 +141,21 @@ spawn_proc0()
     */
     asm volatile("movl %%cr3, %%eax\n"
                  "movl %%esp, %%ebx\n"
-                 "movl %0, %%cr3\n"
-                 "movl %1, %%esp\n"
+                 "movl %1, %%cr3\n"
+                 "movl %2, %%esp\n"
                  "pushf\n"
-                 "pushl %2\n"
                  "pushl %3\n"
+                 "pushl %4\n"
                  "pushl $0\n"
                  "pushl $0\n"
+                 "movl %%esp, %0\n"
                  "movl %%eax, %%cr3\n"
-                 "movl %%ebx, %%esp\n" ::"r"(proc0.page_table),
-                 "i"(KSTACK_TOP),
-                 "i"(KCODE_SEG),
-                 "r"(proc0.intr_ctx.eip)
+                 "movl %%ebx, %%esp\n"
+                 : "=m"(proc0.intr_ctx.registers.esp)
+                 : "r"(proc0.page_table),
+                   "i"(KSTACK_TOP),
+                   "i"(KCODE_SEG),
+                   "r"(proc0.intr_ctx.eip)
                  : "%eax", "%ebx", "memory");
 
     // 向调度器注册进程。
@@ -199,10 +204,10 @@ setup_memory(multiboot_memory_map_t* map, size_t map_size)
 
     // 重映射VGA文本缓冲区（以后会变成显存，i.e., framebuffer）
     for (size_t i = 0; i < vga_buf_pgs; i++) {
-        vmm_map_page(KERNEL_PID,
-                     (void*)(VGA_BUFFER_VADDR + (i << PG_SIZE_BITS)),
-                     (void*)(VGA_BUFFER_PADDR + (i << PG_SIZE_BITS)),
-                     PG_PREM_URW);
+        vmm_set_mapping(PD_REFERENCED,
+                        VGA_BUFFER_VADDR + (i << PG_SIZE_BITS),
+                        VGA_BUFFER_PADDR + (i << PG_SIZE_BITS),
+                        PG_PREM_URW);
     }
 
     // 更新VGA缓冲区位置至虚拟地址