X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/4b61c735d6ab7cb250c9a170b87784746476434f..2a49908006b177c4d6354309333d06b1b96e4887:/lunaix-os/includes/lunaix/process.h

diff --git a/lunaix-os/includes/lunaix/process.h b/lunaix-os/includes/lunaix/process.h
index 0b8d302..974907d 100644
--- a/lunaix-os/includes/lunaix/process.h
+++ b/lunaix-os/includes/lunaix/process.h
@@ -6,6 +6,7 @@
 #include <lunaix/ds/waitq.h>
 #include <lunaix/fs.h>
 #include <lunaix/mm/mm.h>
+#include <lunaix/mm/region.h>
 #include <lunaix/signal.h>
 #include <lunaix/timer.h>
 #include <lunaix/types.h>
@@ -25,12 +26,6 @@
 
 #define PROC_FINPAUSE 1
 
-struct proc_mm
-{
-    heap_context_t u_heap;
-    struct mm_region regions;
-};
-
 struct proc_sigstate
 {
     isr_param proc_regs;
@@ -57,8 +52,8 @@ struct proc_info
     pid_t pid;                // offset = 0
     struct proc_info* parent; // offset = 4
     isr_param intr_ctx;       // offset = 8
-    uintptr_t ustack_top;     // offset = 84 -> 56 -> 60
-    void* page_table;         // offset = 88 -> 60 -> 64
+    ptr_t ustack_top;         // offset = 84 -> 56 -> 60
+    ptr_t page_table;         // offset = 88 -> 60 -> 64
     void* fxstate;            // offset = 92 -> 64 -> 68
 
     /* ---- critical section end ---- */
@@ -78,7 +73,7 @@ struct proc_info
 
     struct proc_mm mm;
     time_t created;
-    uint8_t state;
+    u8_t state;
     int32_t exit_code;
     int32_t k_status;
     sigset_t sig_pending;
@@ -127,7 +122,7 @@ pid_t
 destroy_process(pid_t pid);
 
 void
-setup_proc_mem(struct proc_info* proc, uintptr_t kstack_from);
+setup_proc_mem(struct proc_info* proc, ptr_t kstack_from);
 
 /**
  * @brief 复制当前进程（LunaixOS的类 fork (unix) 实现）