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

Timestamp:

Nov 20, 2020, 12:30:31 AM (3 years ago)

Author:

alain

Message:

Mainly cosmetic.

File:

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

trunk/hal/tsar_mips32/core/hal_context.c

@@ -120 +120 @@
 error_t hal_cpu_context_alloc( thread_t * thread )
 {
-    assert( (sizeof(hal_cpu_context_t) <= CONFIG_CPU_CTX_SIZE) ,
-    "illegal CPU context size" );
+
+assert( __FUNCTION__, (sizeof(hal_cpu_context_t) <= CONFIG_CPU_CTX_SIZE), "illegal CPU context size" );
 
     // allocate memory for cpu_context
@@ -139 +139 @@
 }   // end hal_cpu_context_alloc()
 
-/////////////////////////////////////////////////
-// The following context slots are initialised 
-// GPR : a0_04 / sp_29 / ra_31
+//////////////////////////////////////////////////////////////////////////////
+// The following context slots are initialised for the MIPS32 architecture
+// GPR : a0_04 / a1_05 / sp_29 / ra_31
 // CP0 : c0_sr / c0_th / c0_epc
 // CP2 : c2_ptpr / c2_mode
-/////////////////////////////////////////////////
-void hal_cpu_context_init( thread_t * thread )
+//////////////////////////////////////////////////////////////////////////////
+void hal_cpu_context_init( thread_t * thread,
+                           bool_t     is_main,
+                           uint32_t   argc,
+                           intptr_t   argv )
 {
     hal_cpu_context_t * context = (hal_cpu_context_t *)thread->cpu_context;
 
-    assert( (context != NULL ), "CPU context not allocated" );
+assert( __FUNCTION__, (context != NULL ), "CPU context not allocated" );
 
     // compute the PPN for the GPT PT1
@@ -155 +158 @@
 
     // initialisation depends on thread type
-    if( thread->type == THREAD_USER )
+    if( (thread->type == THREAD_USER) && (is_main != 0) )
+    {
+        context->a0_04   = (uint32_t)argc;
+        context->a1_05   = (uint32_t)argv;
+        context->sp_29   = (uint32_t)thread->user_stack_vseg->max - 8;
+        context->ra_31   = (uint32_t)&hal_kentry_eret;
+        context->c0_epc  = (uint32_t)thread->entry_func;
+        context->c0_sr   = SR_USR_MODE;
+            context->c0_th   = (uint32_t)thread; 
+            context->c2_ptpr = (uint32_t)(gpt_pt1_ppn >> 1);
+        context->c2_mode = 0xF;
+    }
+    else if( (thread->type == THREAD_USER) && (is_main == 0) )
     {
         context->a0_04   = (uint32_t)thread->entry_args;
@@ -353 +368 @@
 }  // end hal_cpu_context_fork()
 
-//////////////////////////////////////////////
-void hal_cpu_context_exec( thread_t * thread )
-{
-    // re_initialize CPU context
-    hal_cpu_context_init( thread );
-
-    // restore CPU registers ... and jump to user code
-    hal_do_cpu_restore( (hal_cpu_context_t *)thread->cpu_context );
-
-} // end hal_cpu_context_exec()
-
 /////////////////////////////////////////////////
 void hal_cpu_context_display( xptr_t  thread_xp )
@@ -379 +383 @@
     uint32_t sp_29   = hal_remote_l32( XPTR( cxy , &ctx->sp_29   ) );
     uint32_t ra_31   = hal_remote_l32( XPTR( cxy , &ctx->ra_31   ) );
+    uint32_t a0_04   = hal_remote_l32( XPTR( cxy , &ctx->a0_04   ) );
+    uint32_t a1_05   = hal_remote_l32( XPTR( cxy , &ctx->a1_05   ) );
     uint32_t c0_sr   = hal_remote_l32( XPTR( cxy , &ctx->c0_sr   ) );
     uint32_t c0_epc  = hal_remote_l32( XPTR( cxy , &ctx->c0_epc  ) );
@@ -386 +392 @@
     
     printk("\n***** CPU context for thread %x in process %x / cycle %d\n" 
-           " sp_29   = %X    ra_31   = %X\n" 
-           " c0_sr   = %X    c0_epc  = %X    c0_th = %X\n"
-           " c2_ptpr = %X    c2_mode = %X\n",
+           " sp_29   = %X  ra_31   = %X  a0_04 = %X   a1_05 = %X\n" 
+           " c0_sr   = %X  c0_epc  = %X  c0_th = %X\n"
+           " c2_ptpr = %X  c2_mode = %X\n",
            ptr, ptr->process->pid, (uint32_t)hal_get_cycles(),
-           sp_29   , ra_31,
+           sp_29   , ra_31   , a0_04 , a1_05,
            c0_sr   , c0_epc  , c0_th,
            c2_ptpr , c2_mode );
@@ -417 +423 @@
 
 
+
+
+
+
 //////////////////////////////////////////////////
 error_t hal_fpu_context_alloc( thread_t * thread )
 {
-    assert( (sizeof(hal_fpu_context_t) <= CONFIG_FPU_CTX_SIZE) ,
+    assert( __FUNCTION__, (sizeof(hal_fpu_context_t) <= CONFIG_FPU_CTX_SIZE) ,
     "illegal CPU context size" );
 
@@ -444 +454 @@
     hal_fpu_context_t * context = thread->fpu_context;
 
-    assert( (context != NULL) , "fpu context not allocated" );
+    assert( __FUNCTION__, (context != NULL) , "fpu context not allocated" );
 
     memset( context , 0 , sizeof(hal_fpu_context_t) );
@@ -453 +463 @@
                            thread_t * src )
 {
-    assert( (src != NULL) , "src thread pointer is NULL\n");
-    assert( (dst != NULL) , "dst thread pointer is NULL\n");
+    assert( __FUNCTION__, (src != NULL) , "src thread pointer is NULL\n");
+    assert( __FUNCTION__, (dst != NULL) , "dst thread pointer is NULL\n");
 
     // get fpu context pointers