3 files changed, 18 insertions, 30 deletions

diff --git a/arch/x86_64/proc/init.c b/arch/x86_64/proc/init.c
index 4c86038..be1d556 100644
--- a/arch/x86_64/proc/init.c
+++ b/arch/x86_64/proc/init.c
@@ -144,7 +144,7 @@ init_setup(void)
     
     jove_owned_obj_t *message_obj = objdir_getlocal(_rootdir_obj, ROOTDIR_MESSAGE_I);
     obj_settype(message_obj, JOVE_OBJ_MESSAGE);
-    obj_setvalue(message_obj, (message_pptr & ~0xFFF) | 1);
+    obj_setvalue(message_obj, last_base | 1);
     obj_release(message_obj);
 
     obj_release(init_pagedir);
diff --git a/arch/x86_64/proc/process.c b/arch/x86_64/proc/process.c
index 0c5c282..6165585 100644
--- a/arch/x86_64/proc/process.c
+++ b/arch/x86_64/proc/process.c
@@ -11,55 +11,46 @@
 
 PAGEALIGN uint8_t s_init_iopb[0x2000];
 PAGEALIGN char _init_pcb_bytes[0x1000] = { 0 };
-pcb_t *_init_pcb = (pcb_t*)&_init_pcb_bytes;
-
-pid_t
-pcb_pid(pcb_t *pcb)
-{
-    return pcb->pid;
-}
-
-jove_obj_t*
-pcb_rootdir(pcb_t *pcb)
-{
-    return pcb->rootdir;
-}
+pcb_t *pcb_tree;
 
 void
 processing_setup(void (*process_main))
 {
+    pcb_t *init_pcb = (pcb_t*)&_init_pcb_bytes;
+    pcb_tree = init_pcb;
+
     memset(s_init_iopb, 0xFF, 0x2000);
     uintptr_t ksp = ((uintptr_t)&_init_pcb_bytes) + 0xFF8;
 
-    _init_pcb->tree_node.get_key = (void*)pcb_pid;
-    _init_pcb->tree_node.color = 1;
+    init_pcb->header.tree_node.get_key = (void*)pcb_getpid;
+    init_pcb->header.tree_node.color = 1;
+    init_pcb->header.rootdir = _rootdir_obj;
+    init_pcb->header.pagedir = obj_release(objdir_getlocal(_rootdir_obj, ROOTDIR_PAGEDIR_I));
 
-    _init_pcb->pid = 1;
-    _init_pcb->ksp = (void*)ksp;
-    _init_pcb->pml4 = paging_get_pml4();
-    _init_pcb->rootdir = _rootdir_obj;
+    init_pcb->header.pid = 1;
+    init_pcb->ksp = (void*)ksp;
 
     jove_owned_obj_t *iopb_obj = objdir_getlocal(_rootdir_obj, ROOTDIR_IOPB_I);
     obj_settype(iopb_obj, JOVE_OBJ_IOPB);
     obj_setvalue(iopb_obj, (uintptr_t)s_init_iopb);
-    _init_pcb->iopb = iopb_obj;
+    init_pcb->iopb = obj_release(iopb_obj);
 
     processor_t *proc = processor_current();
-    proc->tss.rsp[0] = (uintptr_t)_init_pcb->ksp;
+    proc->tss.rsp[0] = (uintptr_t)init_pcb->ksp;
     memcpy(proc->iopb, s_init_iopb, 0x2000);
 
     {
         jove_owned_obj_t *process_obj = objdir_getlocal(_rootdir_obj, ROOTDIR_PCB_I);
         obj_settype(process_obj, JOVE_OBJ_PCB);
-        obj_setvalue(process_obj, (uintptr_t)_init_pcb);
+        obj_setvalue(process_obj, (uintptr_t)init_pcb);
 
         proc->pcb_obj = process_obj;
-        proc->pcb = _init_pcb;
+        proc->pcb = init_pcb;
     }
 
     __asm__ volatile("\
             movq %0, %%rsp; \
             xorq %%rbp, %%rbp; \
             jmpq %1"::
-            "r"(_init_pcb->ksp), "r"(process_main));
+            "r"(init_pcb->ksp), "r"(process_main));
 }
diff --git a/arch/x86_64/proc/process.h b/arch/x86_64/proc/process.h
index cf4d8a8..534c8d5 100644
--- a/arch/x86_64/proc/process.h
+++ b/arch/x86_64/proc/process.h
@@ -7,13 +7,10 @@
 
 typedef struct process_control_block
 {
-    struct rbtree_node tree_node;
+    struct pcb_expected_header header;
     struct process_control_block *sched_next;
 
-    pid_t pid;
-    jove_obj_t *rootdir;
-    jove_owned_obj_t *iopb;
-    uintptr_t pml4;
+    jove_obj_t *iopb;
 
     enum pcb_state state;
     int killed;