Changeset 296 for trunk/hal/generic

Timestamp:

Jul 31, 2017, 1:59:52 PM (7 years ago)

Author:

alain

Message:

Several modifs in the generic scheduler and in the hal_context to
fix the context switch mechanism.

Location:

trunk/hal/generic

Files:

• hal_context.h (modified) (4 diffs)
• hal_ppm.h (modified) (1 diff)
• hal_special.h (modified) (3 diffs)

trunk/hal/generic/hal_context.h

@@ -32 +32 @@
 // void* pointers stored in the thread descriptor.
 // - the "hal_context_t" structure is used to store the CPU registers values that
-//   have not been saved in the stack by the interrupt handler.
+//   have not been saved in the kernel stack by the interrupt handler.
 // - the "hal_fpu_context_t" structure is used to save the FPU registers when required.
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -43 +43 @@
  * This function allocates, from the local cluster, the physical memory required for 
  * the thread CPU context, initialises it, and links the context to the thread.
- * Seven registers are initialised:
- * - sp_29 / fp_30 / ra_31
- * - c0_sr / c0_th
- * - c2_ptpr / c2_mode
  ****************************************************************************************
  * @ thread  : pointer on the thread descriptor.
@@ -73 +69 @@
 
 /****************************************************************************************
- * This function saves in the thread context the CPU registers values that have not 
- * been saved in the thread stack by the exception handler:
- * - GRs : s0 to S7 , sp , fp, ra
- * - CP0 : th
- * - CP2 : ptpr , mode
+ * This function saves in the thread context the CPU registers values that must be
+ * saved at context switch.
  ****************************************************************************************
- * @ thread  : pointer on the thread descriptor.
+ * @ ctx     : pointer on cpu context.
  ***************************************************************************************/
-void hal_cpu_context_save( struct thread_s * thread );
+void hal_cpu_context_save( void * ctx );
 
 /****************************************************************************************
- * This function restores from the thread context the CPU registers values that have not 
- * been saved in the thread stack by the exception handler.
- * - GRs : s0 to S7 , sp , fp, ra
- * - CP0 : th
- * - CP2 : ptpr , mode
+ * This function restores from the thread context the CPU registers values that must
+ * be restored at context switch.
  ****************************************************************************************
- * @ thread  : pointer on the thread descriptor.
+ * @ ctx     : pointer on cpu context.
  ***************************************************************************************/
-void hal_cpu_context_restore( struct thread_s * thread );
+void hal_cpu_context_restore( void * ctx );
 
 /****************************************************************************************
  * This function loads the relevant CPU registers from values contained in
  * the thread context. It should be called for a thread that has not been executed yet.
- * - GRs : sp , fp , a0
- * - CP0 : sr , epc , th
- * - CP2 : ptpr , mode
  * It reset the loadable flag in thread descriptor.
  ****************************************************************************************
@@ -105 +92 @@
  ***************************************************************************************/
 void hal_cpu_context_load( struct thread_s * thread );
-
 
 

trunk/hal/generic/hal_ppm.h

@@ -54 +54 @@
 error_t hal_ppm_init( boot_info_t * info );
 
+/****************************************************************************************
+ * This function initializes the architecture specific core registers, for the
+ * calling core. It is executed by all cores during kernel_init().
+ ****************************************************************************************
+ * @ info       : pointer on the boot_info structure.
+ ***************************************************************************************/
+void hal_core_init( boot_info_t * info );
+
+
+
 #endif  /* HAL_PPM_H_ */

trunk/hal/generic/hal_special.h

@@ -34 +34 @@
 //      Generic Special Registers Access API (implementation in hal_special.c)
 //
-// ALMOS-MKH uses the following API to access the MMU and other core protected registers.
+// ALMOS-MKH uses the following API to access the core protected registers.
 ///////////////////////////////////////////////////////////////////////////////////////////
 
@@ -50 +50 @@
  * This function returns the current value of the hardware cycles counter.
  ****************************************************************************************/
-inline cycle_t hal_time_stamp();
+inline reg_t hal_time_stamp();
 
 /*****************************************************************************************
- * This function returns the content of the calling core private cycles counter.
+ * This function returns the content of the calling core private cycles counter,
+ * taking into account overflow if the core hardware register is not 64 bits.
  * This cycle counter is reset when the core is initialised (at each boot).
- * If the hardware counter is not a 64 bits register, this function must handle overflow.
  ****************************************************************************************/
-uint64_t hal_get_cycles();
+cycle_t hal_get_cycles();
 
 /*****************************************************************************************
@@ -68 +68 @@
  ****************************************************************************************/
 void hal_set_current_thread( struct thread_s * thread );
+
+/*****************************************************************************************
+ * This function registers a new kentry base address in the relevant core register.
+ ****************************************************************************************/
+void hal_set_ebase( reg_t base );
 
 /*****************************************************************************************