refactor: decouple i386 specific instruction invocation

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

diff --git a/lunaix-os/kernel/process/process.c b/lunaix-os/kernel/process/process.c
index 533c577436b0c2d448a7e85f8d8d62a0c44ef954..0ba6c6352db3c6a76835bb6b0597da684bebf9c1 100644 (file)
--- a/lunaix-os/kernel/process/process.c
+++ b/lunaix-os/kernel/process/process.c
@@ -177,12 +177,12 @@ __mark_region(ptr_t start_vpn, ptr_t end_vpn, int attr)
         x86_pte_t* curproc = &PTE_MOUNTED(VMS_SELF, i);
         x86_pte_t* newproc = &PTE_MOUNTED(VMS_MOUNT_1, i);
 
         x86_pte_t* curproc = &PTE_MOUNTED(VMS_SELF, i);
         x86_pte_t* newproc = &PTE_MOUNTED(VMS_MOUNT_1, i);
 

-        cpu_invplg((ptr_t)newproc);
+        cpu_flush_page((ptr_t)newproc);

 
         if ((attr & REGION_MODE_MASK) == REGION_RSHARED) {
             // 如果读共享，则将两者的都标注为只读，那么任何写入都将会应用COW策略。
 
         if ((attr & REGION_MODE_MASK) == REGION_RSHARED) {
             // 如果读共享，则将两者的都标注为只读，那么任何写入都将会应用COW策略。

-            cpu_invplg((ptr_t)curproc);
-            cpu_invplg((ptr_t)(i << 12));
+            cpu_flush_page((ptr_t)curproc);
+            cpu_flush_page((ptr_t)(i << 12));

 
             *curproc = *curproc & ~PG_WRITE;
             *newproc = *newproc & ~PG_WRITE;
 
             *curproc = *curproc & ~PG_WRITE;
             *newproc = *newproc & ~PG_WRITE;


@@ -211,8 +211,6 @@ dup_proc()
     pcb->intr_ctx = __current->intr_ctx;
     pcb->parent = __current;
 
     pcb->intr_ctx = __current->intr_ctx;
     pcb->parent = __current;
 

-    memcpy(pcb->fxstate, __current->fxstate, 512);
-

     if (__current->cwd) {
         pcb->cwd = __current->cwd;
         vfs_ref_dnode(pcb->cwd);
     if (__current->cwd) {
         pcb->cwd = __current->cwd;
         vfs_ref_dnode(pcb->cwd);


@@ -221,7 +219,13 @@ dup_proc()
     __copy_fdtable(pcb);
     region_copy(&__current->mm, &pcb->mm);
 
     __copy_fdtable(pcb);
     region_copy(&__current->mm, &pcb->mm);
 

-    setup_proc_mem(pcb, VMS_SELF);
+    /*
+     *  store the return value for forked process.
+     *  this will be implicit carried over after kernel stack is copied.
+     */
+    store_retval(0);
+
+    copy_kernel_stack(pcb, VMS_SELF);

 
     // 根据 mm_region 进一步配置页表
 
 
     // 根据 mm_region 进一步配置页表
 


@@ -240,9 +244,6 @@ dup_proc()
 
     vmm_unmount_pd(VMS_MOUNT_1);
 
 
     vmm_unmount_pd(VMS_MOUNT_1);
 

-    // 正如同fork，返回两次。
-    store_retval_to(pcb, 0);
-

     commit_process(pcb);
 
     return pcb->pid;
     commit_process(pcb);
 
     return pcb->pid;


@@ -251,7 +252,7 @@ dup_proc()
 extern void __kernel_end;
 
 void
 extern void __kernel_end;
 
 void

-setup_proc_mem(struct proc_info* proc, ptr_t usedMnt)
+copy_kernel_stack(struct proc_info* proc, ptr_t usedMnt)

 {
     // copy the entire kernel page table
     pid_t pid = proc->pid;
 {
     // copy the entire kernel page table
     pid_t pid = proc->pid;


@@ -271,7 +272,7 @@ setup_proc_mem(struct proc_info* proc, ptr_t usedMnt)
             In the name of Celestia our glorious goddess, I will fucking HATE
            the TLB for the rest of my LIFE!
         */
             In the name of Celestia our glorious goddess, I will fucking HATE
            the TLB for the rest of my LIFE!
         */

-        cpu_invplg((ptr_t)ppte);
+        cpu_flush_page((ptr_t)ppte);

 
         x86_pte_t p = *ppte;
         ptr_t ppa = vmm_dup_page(pid, PG_ENTRY_ADDR(p));
 
         x86_pte_t p = *ppte;
         ptr_t ppa = vmm_dup_page(pid, PG_ENTRY_ADDR(p));


@@ -279,9 +280,5 @@ setup_proc_mem(struct proc_info* proc, ptr_t usedMnt)
         *ppte = (p & 0xfff) | ppa;
     }
 
         *ppte = (p & 0xfff) | ppa;
     }
 

-    // 我们不需要分配内核的区域，因为所有的内核代码和数据段只能通过系统调用来访问，任何非法的访问
-    // 都会导致eip落在区域外面，从而segmentation fault.
-
-    // 至于其他的区域我们暂时没有办法知道，因为那需要知道用户程序的信息。我们留到之后在处理。

     proc->page_table = pt_copy;
 }
\ No newline at end of file
     proc->page_table = pt_copy;
 }
\ No newline at end of file