Changeset 640 for trunk/hal/tsar_mips32/core/hal_context.c

Timestamp:

Oct 1, 2019, 1:19:00 PM (5 years ago)

Author:

alain

Message:

Remove all RPCs in page-fault handling.

File:

• trunk/hal/tsar_mips32/core/hal_context.c (modified) (7 diffs)

trunk/hal/tsar_mips32/core/hal_context.c

@@ -151 +151 @@
     assert( (context != NULL ), "CPU context not allocated" );
 
+    // compute the PPN for the GPT PT1
+    ppn_t    gpt_pt1_ppn = ppm_base2ppn( XPTR( local_cxy , thread->process->vmm.gpt.ptr ) );
+
     // initialisation depends on thread type
     if( thread->type == THREAD_USER )
@@ -160 +163 @@
         context->c0_sr   = SR_USR_MODE;
             context->c0_th   = (uint32_t)thread; 
-            context->c2_ptpr = (uint32_t)((thread->process->vmm.gpt.ppn) >> 1);
+            context->c2_ptpr = (uint32_t)(gpt_pt1_ppn >> 1);
         context->c2_mode = 0xF;
     }
@@ -170 +173 @@
         context->c0_sr   = SR_SYS_MODE;
             context->c0_th   = (uint32_t)thread; 
-            context->c2_ptpr = (uint32_t)((thread->process->vmm.gpt.ppn) >> 1);
+            context->c2_ptpr = (uint32_t)(gpt_pt1_ppn >> 1);
         context->c2_mode = 0x3;
     }
@@ -193 +196 @@
 
     process_t         * child_process;     // local pointer on child processs
-    uint32_t            child_pt_ppn;      // PPN of child process PT1 
+    void              * child_gpt_ptr;     // local pointer on child GPT PT1
+    uint32_t            child_gpt_ppn;     // PPN of child GPT PT1 
     vseg_t            * child_us_vseg;     // local pointer on child user stack vseg
     
@@ -216 +220 @@
     child_process = hal_remote_lpt( XPTR(child_cxy , &child_ptr->process) );
 
-    // get ppn of remote child process page table
-    child_pt_ppn = hal_remote_l32( XPTR(child_cxy , &child_process->vmm.gpt.ppn) );
+    // get base and ppn of remote child process GPT PT1
+    child_gpt_ptr = hal_remote_l32( XPTR(child_cxy , &child_process->vmm.gpt.ptr) );
+    child_gpt_ppn = ppm_base2ppn( XPTR( child_cxy , child_gpt_ptr ) );    
 
     // get local pointer on local parent uzone (in parent kernel stack)
@@ -285 +290 @@
     context.sp_29   = (uint32_t)child_ksp;
     context.c0_th   = (uint32_t)child_ptr;
-    context.c2_ptpr = (uint32_t)child_pt_ppn >> 1;
+    context.c2_ptpr = (uint32_t)child_gpt_ppn >> 1;
 
     // From this point, both parent and child execute the following code,
@@ -304 +309 @@
         uint32_t child_sp    = parent_uzone[UZ_SP]  + child_us_base - parent_us_base;
         uint32_t child_th    = (uint32_t)child_ptr;
-        uint32_t child_ptpr  = (uint32_t)child_pt_ppn >> 1;
+        uint32_t child_ptpr  = (uint32_t)child_gpt_ppn >> 1;
 
 #if DEBUG_HAL_CONTEXT