Changeset 87 for trunk

Timestamp:

Jun 28, 2017, 5:32:42 PM (7 years ago)

Author:

alain

Message:

Remove oldies.

Location:

trunk/hal/tsar_mips32/core

Files:

• __cpu_kentry.S (deleted)
• __kheader.S (deleted)
• hal_arch.c (deleted)
• hal_arch.h (deleted)
• hal_uspace.c (modified) (8 diffs)

trunk/hal/tsar_mips32/core/hal_uspace.c

@@ -50 +50 @@
         "mtc2   $14,   $1                       \n"   /* MMU_MODE <= DTLB ON            */
         "lw         $13,   0(%0)        \n"   /* read data from user space      */
-        "mtc2   $14,   $1                       \n"   /* restore MMU_MODE               */
+        "mtc2   $15,   $1                       \n"   /* restore MMU_MODE               */
             "sw     $13,   0(%1)        \n"   /* store data to kernel space     */
         : : "r"( src ) , "r"( dst ) : "$13","$14","$15", "memory" );
@@ -65 +65 @@
         "mtc2   $14,   $1                       \n"   /* MMU_MODE <= DTLB ON            */
         "lb         $13,   0(%0)        \n"   /* read data from user space      */
-        "mtc2   $14,   $1                       \n"   /* restore MMU_MODE               */
+        "mtc2   $15,   $1                       \n"   /* restore MMU_MODE               */
             "sb     $13,   0(%1)        \n"   /* store data to kernel space     */
         : : "r"( src ) , "r"( dst ) : "$13","$14","$15", "memory" );
@@ -74 +74 @@
 
     hal_restore_irq( save_sr );
-}
+
+}  // end hal_copy_from_uspace()
 
 ///////////////////////////////////////////
@@ -83 +84 @@
     uint32_t save_sr;
         uint32_t i;
-        uint32_t wsize;                   // number of words
+        uint32_t wsize;                   // number of words if aligned
     uint32_t src = (uint32_t)k_src;
     uint32_t dst = (uint32_t)u_dst;
 
-        if( (dst & 0x3) || (src & 0x3) ) wsize = 0;          // do it all in bytes
+        if( (dst & 0x3) || (src & 0x3) ) wsize = 0;          // not aligned
     else                             wsize = size >> 2;
 
@@ -100 +101 @@
         "mtc2   $14,   $1                       \n"   /* MMU_MODE <= DTLB ON            */
             "sw     $13,   0(%1)        \n"   /* store data to user space       */
-        "mtc2   $14,   $1                       \n"   /* restore MMU_MODE               */
+        "mtc2   $15,   $1                       \n"   /* restore MMU_MODE               */
         : : "r"( src ) , "r"( dst ) : "$13","$14","$15", "memory" );
 
@@ -115 +116 @@
         "mtc2   $14,   $1                       \n"   /* MMU_MODE <= DTLB ON            */
             "sb     $13,   0(%1)        \n"   /* store data to user space       */
-        "mtc2   $14,   $1                       \n"   /* restore MMU_MODE               */
+        "mtc2   $15,   $1                       \n"   /* restore MMU_MODE               */
         : : "r"( src ) , "r"( dst ) : "$13","$14","$15", "memory" );
 
@@ -123 +124 @@
 
     hal_restore_irq( save_sr );
-}
+
+}  // end hal_copy_to_uspace()
+
+//////////////////////////////////////////
+void hal_strcpy_from_uspace( char * k_dst,
+                             char * u_src )
+
+{
+    uint32_t save_sr;
+    uint32_t src = (uint32_t)u_src;
+    uint32_t dst = (uint32_t)k_dst;
+
+    hal_disable_irq( &save_sr );
+
+    // loop on characters while non NUL 
+    asm volatile(
+        "mfc2   $15,   $1           \n"   /* save current MMU_MODE          */
+        "1:                         \n"   /* loop entry                     */
+        "ori    $14,   $0,  0x7     \n"  
+        "mtc2   $14,   $1                       \n"   /* MMU_MODE <= DTLB ON            */
+        "lb         $13,   0(%0)        \n"   /* read char from user space      */
+        "mtc2   $15,   $1                       \n"   /* restore MMU_MODE               */
+            "sb     $13,   0(%1)        \n"   /* store char to kernel space     */
+        "addi   %0,    %0,  1       \n"   /* increment SRC pointer          */
+        "addi   %1,    %1,  1       \n"   /* increment DST pointer          */
+        "bne    $13,   $0,  1b      \n"   /* test NUL                       */
+        "nop                        \n"
+        : : "r"( src ) , "r"( dst ) : "$13","$14","$15", "memory" );
+
+    hal_restore_irq( save_sr );
+
+} // hal_strcpy_from_uspace()
+
+//////////////////////////////////////////
+void hal_strcpy_to_uspace( char * u_dst,
+                           char * k_src )
+
+{
+    uint32_t save_sr;
+    uint32_t src = (uint32_t)k_src;
+    uint32_t dst = (uint32_t)u_dst;
+
+    hal_disable_irq( &save_sr );
+
+    // loop on characters while non NUL 
+    asm volatile(
+        "mfc2   $15,   $1           \n"   /* save current MMU_MODE          */
+        "1:                         \n"   /* loop entry                     */
+        "lb         $13,   0(%0)        \n"   /* read char from kernel space    */
+        "ori    $14,   $0,  0x7     \n"  
+        "mtc2   $14,   $1                       \n"   /* MMU_MODE <= DTLB ON            */
+            "sb     $13,   0(%1)        \n"   /* store char to user space       */
+        "mtc2   $15,   $1                       \n"   /* restore MMU_MODE               */
+        "addi   %0,    %0,  1       \n"   /* increment SRC pointer          */
+        "addi   %1,    %1,  1       \n"   /* increment DST pointer          */
+        "bne    $13,   $0,  1b      \n"   /* test NUL                       */
+        "nop                        \n"
+        : : "r"( src ) , "r"( dst ) : "$13","$14","$15", "memory" );
+
+    hal_restore_irq( save_sr );
+
+} // hal_strcpy_from_uspace()
 
 ///////////////////////////////////////////////
@@ -143 +205 @@
 
         "1:                         \n"
-        "lb         $13,   0(%0)        \n"   /* read data from kernel space    */
+        "lb         $13,   0(%0)        \n"   /* read char from kernel space    */
         "addi   $13,   $13,  1      \n"   /* increment address              */
         "bne    $13,   $0,   1b     \n"   /* loop until NUL found           */