Changeset 301 for soft/giet_vm/giet_common/utils.c

Timestamp:

Apr 14, 2014, 6:44:51 PM (10 years ago)

Author:

cfuguet

Message:

Bugfix for interrupt masking and demasking.

File:

• soft/giet_vm/giet_common/utils.c (modified) (7 diffs)

soft/giet_vm/giet_common/utils.c

@@ -257 +257 @@
                   : "=r"(sr)
                   :
-                  : "$3" );
+                  : "$3", "memory" );
     *save_sr_ptr = sr;
 }
@@ -269 +269 @@
                   "or      $3,        $3, $4        \n"
                   "mtc0    $3,        $12           \n"  
-                  ::: "$3", "$4" );
+                  ::: "$3", "$4", "memory" );
 }
 
@@ -280 +280 @@
     asm volatile( "mtc0    %0,        $12           \n" 
                   :
-                  : "r"(sr) );
+                  : "r"(sr)
+                  : "memory" );
 }
 
@@ -325 +326 @@
     unsigned int lsb = (unsigned int) paddr;
     unsigned int msb = (unsigned int) (paddr >> 32);
-
+    unsigned int sr;
+
+    _it_disable(&sr);
     asm volatile(
-            "li     $3,     0xFFFFFFFE         \n"
-            "mfc0   $2,     $12                \n"
-            "and    $3,     $2,        $3      \n"
-            "mtc0   $3,     $12                \n"     /* IRQ disabled     */
-
             "mfc2   $2,     $1                 \n"     /* $2 <= MMU_MODE   */
             "andi   $3,     $2,        0xb     \n"
@@ -341 +339 @@
 
             "mtc2   $2,     $1                 \n"     /* restore MMU_MODE */
-
-            "li     $3,     0x00000001         \n"
-            "mfc0   $2,     $12                \n"
-            "or     $3,     $3,        $2      \n"
-            "mtc0   $3,     $12                \n"     /* IRQ enabled      */
             : "=r" (value)
             : "r" (lsb), "r" (msb)
             : "$2", "$3");
+    _it_restore(&sr);
     return value;
 }
@@ -360 +354 @@
     unsigned int lsb = (unsigned int)paddr;
     unsigned int msb = (unsigned int)(paddr >> 32);
-
+    unsigned int sr;
+
+    _it_disable(&sr);
     asm volatile(
-            "li     $3,     0xFFFFFFFE         \n"
-            "mfc0   $2,     $12                \n"
-            "and    $3,     $2,        $3      \n"
-            "mtc0   $3,     $12                \n"     /* IRQ disabled     */
-
             "mfc2   $2,     $1                 \n"     /* $2 <= MMU_MODE   */
             "andi   $3,     $2,        0xb     \n"
@@ -376 +367 @@
 
             "mtc2   $2,     $1                 \n"     /* restore MMU_MODE */
-
-            "li     $3,     0x00000001         \n"
-            "mfc0   $2,     $12                \n"
-            "or     $3,     $3,        $2      \n"
-            "mtc0   $3,     $12                \n"     /* IRQ enabled      */
             :
             : "r" (value), "r" (lsb), "r" (msb)
             : "$2", "$3");
+    _it_restore(&sr);
 }