Changeset 311 for trunk

Timestamp:

Aug 2, 2017, 2:17:00 PM (7 years ago)

Author:

max@…

Message:

Introduce hal_cpu_context_switch.

Location:

trunk

Files:

• hal/generic/hal_context.h (modified) (2 diffs)
• hal/tsar_mips32/core/hal_context.c (modified) (1 diff)
• hal/x86_64/core/hal_context.c (modified) (1 diff)
• kernel/kern/scheduler.c (modified) (1 diff)

trunk/hal/generic/hal_context.h

@@ -69 +69 @@
 
 /****************************************************************************************
- * This function saves in the thread context the CPU registers values that must be
- * saved at context switch.
+ * This function performs a context switch, saving the CPU register values into the
+ * old thread, and initializing these registers with the values of the new thread.
  ****************************************************************************************
- * @ ctx     : pointer on cpu context.
+ * @ old     : pointer on current thread.
+ * @ new     : pointer on the thread we want to switch to.
  ***************************************************************************************/
-void hal_cpu_context_save( void * ctx );
-
-/****************************************************************************************
- * This function restores from the thread context the CPU registers values that must
- * be restored at context switch.
- ****************************************************************************************
- * @ ctx     : pointer on cpu context.
- ***************************************************************************************/
-void hal_cpu_context_restore( void * ctx );
+void hal_cpu_context_switch( struct thread_s * old , struct thread_s * new );
 
 /****************************************************************************************
@@ -92 +85 @@
  ***************************************************************************************/
 void hal_cpu_context_load( struct thread_s * thread );
-
 
 /****************************************************************************************

trunk/hal/tsar_mips32/core/hal_context.c

@@ -335 +335 @@
     ".set at                       \n"
     : : : "$26" , "$27" ); 
+}
+
+void hal_cpu_context_switch( thread_t * old , thread_t * new )
+{
+    // XXX XXX: TODO
+    hal_cpu_context_save( old->cpu_context );
+    hal_cpu_context_restore( new->cpu_context );
 }
 

trunk/hal/x86_64/core/hal_context.c

@@ -103 +103 @@
 }
 
-void hal_cpu_context_save( void * ctx )
-{
-        x86_panic((char *)__func__);
-}
-
-void hal_cpu_context_restore( void * ctx )
+void hal_cpu_context_switch( thread_t * old , thread_t * new )
 {
         x86_panic((char *)__func__);

trunk/kernel/kern/scheduler.c

@@ -321 +321 @@
 
         // switch contexts 
-        hal_cpu_context_save( current->cpu_context );
-        hal_cpu_context_restore( next->cpu_context );
+        hal_cpu_context_switch( current , next );
 
         // restore IRQs when calling thread resume