Changeset 459 for trunk/hal

Timestamp:

Aug 13, 2018, 1:43:20 PM (6 years ago)

Author:

alain

Message:

Introduce the math library, to support the floating point
data used by the multi-thread fft application.
Fix several bugs regarding the FPU context save/restore.
Introduce support for the %f format in printf.

Location:

trunk/hal

Files:

• generic/hal_user.h (modified) (1 diff)
• tsar_mips32/core/hal_context.c (modified) (5 diffs)
• tsar_mips32/core/hal_exception.c (modified) (2 diffs)
• tsar_mips32/core/hal_shared_types.h (modified) (3 diffs)
• tsar_mips32/core/hal_special.c (modified) (4 diffs)

trunk/hal/generic/hal_user.h

@@ -2 +2 @@
  * hal_user.h - User-side, architecture specific API definition.
  *
- * Author      Alain Greiner (2016,2017)
+ * Author      Alain Greiner (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites

trunk/hal/tsar_mips32/core/hal_context.c

@@ -186 +186 @@
     // get remote child thread cluster and local pointer
     cxy_t      child_cxy = GET_CXY( child_xp );
-    thread_t * child_ptr = (thread_t *)GET_PTR( child_xp );
+    thread_t * child_ptr = GET_PTR( child_xp );
 
     // get remote child cpu_context local pointer
@@ -257 +257 @@
     // get thread cluster and local pointer
     cxy_t      cxy = GET_CXY( thread_xp );
-    thread_t * ptr = (thread_t *)GET_PTR( thread_xp );
+    thread_t * ptr = GET_PTR( thread_xp );
 
     // get context pointer
@@ -358 +358 @@
 {
     // allocate a local FPU context in kernel stack
-    hal_fpu_context_t  context;
+    hal_fpu_context_t  src_context;
 
     // get remote child cluster and local pointer
     cxy_t      thread_cxy = GET_CXY( thread_xp );
-    thread_t * thread_ptr = (thread_t *)GET_PTR( thread_xp );
+    thread_t * thread_ptr = GET_PTR( thread_xp );
 
     asm volatile(
@@ -399 +399 @@
     "swc1    $f31,  31*4(%0)  \n"   
     ".set reorder             \n"
-    : : "r"(&context) );
+    : : "r"(&src_context) );
+
+    // get local pointer on target thread FPU context
+    void * dst_context = hal_remote_lpt( XPTR( thread_cxy , &thread_ptr->fpu_context ) );
 
     // copy local context to remote child context)
-    hal_remote_memcpy( XPTR( thread_cxy , &thread_ptr->fpu_context ),
-                       XPTR( local_cxy  , &context ) , 
+    hal_remote_memcpy( XPTR( thread_cxy , dst_context ),
+                       XPTR( local_cxy  , &src_context ), 
                        sizeof( hal_fpu_context_t ) );
 
@@ -411 +414 @@
 void hal_fpu_context_restore( thread_t * thread )
 {
+    // get pointer on FPU context and cast to uint32_t
     uint32_t ctx = (uint32_t)thread->fpu_context;
 

trunk/hal/tsar_mips32/core/hal_exception.c

@@ -311 +311 @@
         {
             assert( false , __FUNCTION__ ,
-            "thread %x in process %x / core[%x,%d] / epc %x / vaddr %x / cycle %d\n",
-            this->trdid, this->process->pid, local_cxy, this->core->lid,
-            excPC, bad_vaddr, (uint32_t)hal_get_cycles() );
+            "thread %x in process %x / epc %x / badvaddr %x / cycle %d\n",
+            this->trdid, this->process->pid, excPC, bad_vaddr, (uint32_t)hal_get_cycles() );
 
             return EXCP_KERNEL_PANIC;
@@ -428 +427 @@
             case XCODE_CPU:    // can be non fatal
         {
-            if( ((uzone[UZ_CR] >> 28) & 0x3) == 1 )     // unavailable FPU
-            {
-                error = hal_fpu_exception( this );
+            if( ((uzone[UZ_CR] >> 28) & 0x3) == 1 ) // FPU
+            {
+                error = hal_fpu_exception( this );              // FPU exception
             }
             else

trunk/hal/tsar_mips32/core/hal_shared_types.h

@@ -1 +1 @@
 /*
- * hal_kernel_types.h - Data types shared by kernel & libraries for TSAR-MIPS32.
+ * hal_shared_types.h - Data types shared by kernel & libraries for TSAR-MIPS32.
  *
  * Author  Alain Greiner (2016)
@@ -26 +26 @@
 
 /*******************i***************************************************************
- * This file defines - for the TSAR_MIPS32 architecture - the <reg_t> type, used 
- * by the hal_user_syscall() function, called by several user-level libraries 
- * to pass syscall arguments to the  kernel, and used by the do_syscall() function,
- * called by the kernel syscall handler, to analyse arguments.
- * It is also used by various kernel functions such as the hal_*_irq() functions
- * to save/restore the SR register value.
+ * This file defines - for the TSAR_MIPS32 architecture - types that can be used
+ * by both the kernel and the user applications.
+ *
+ * - the <reg_t> type, is used by the hal_user_syscall() function, called by 
+ *   several user-level libraries to pass syscall arguments to the  kernel, 
+ *   and used by the do_syscall() kernel function, to analyse arguments.
+ *   It is also used by the hal_*_irq() kernel functions to save/restore 
+ *   the SR register value.
  **********************************************************************************/
 
@@ -40 +42 @@
 typedef unsigned long int     reg_t;    // core register
 
-#endif  /* HAL_TYPES_H_ */
+#endif

trunk/hal/tsar_mips32/core/hal_special.c

@@ -113 +113 @@
 void hal_fpu_enable()
 {
+    // set CU1 bit (FPU enable) in c0_sr
         asm volatile 
         ( ".set noat                         \n"
@@ -120 +121 @@
       "mtc0   $27,    $12                \n"
       ".set at                           \n" );
+
+    // set CU1 bit in calling thread UZONE
+    uint32_t * uzone = CURRENT_THREAD->uzone_current;
+    uzone[34] |= 0x20000000;
 }
 
@@ -125 +130 @@
 void hal_fpu_disable()
 {
+    // reset CU1 bit (FPU enable) in c0_sr
         asm volatile 
         ( ".set noat                         \n"
@@ -133 +139 @@
       "mtc0   $27,    $12                \n"
           ".set at                           \n");
+
+    // reset CU1 bit in calling thread UZONE
+    uint32_t * uzone = CURRENT_THREAD->uzone_current;
+    uzone[34] &= 0xDFFFFFFF;
 }