Changeset 189 for soft/giet_vm/sys/vm_handler.c

Timestamp:

Aug 7, 2012, 6:37:49 PM (12 years ago)

Author:

alain

Message:

Introducing a new release where all initialisation
is done in the boot code.

File:

• soft/giet_vm/sys/vm_handler.c (modified) (1 diff)

soft/giet_vm/sys/vm_handler.c

@@ -118 +118 @@
 
         // gets ppn_value and flags_value, after temporary DTLB desactivation
-        asm volatile ( 
-                       "li      $27,    0xFFFFFFFE  \n"     /* Mask for IE bits     */
-                       "mfc0    $8,     $12         \n"     /* $8 <= SR             */ 
-                       "and     $26,    $8,    $27 \n"      /* $26 <= SR && 0xFFFFFFE */
-                       "mtc0    $26,    $12         \n"     /* disable Interrupts   */
+        asm volatile ( "li      $27,    0xFFFFFFFE  \n"     /* Mask for IE bits     */
+                       "mfc0    $26,    $12         \n"     /* save SR              */ 
+                       "and     $27,    $26,    $27 \n"
+                       "mtc0    $27,    $12         \n"     /* disable Interrupts   */
+
+                       "li      $27,    0xB         \n"     
+                       "mtc2    $27,    $1          \n"     /* DTLB unactivated     */ 
 
                        "move    $27,    %2          \n"     /* $27 <= pte2          */
-                       "li      $26,    0xB         \n"     /* DTLB unactivated     */
-                       "mtc2    $26,    $1          \n"
                        "lw      %0,     0($27)      \n"     /* read flags           */ 
                        "lw      %1,     4($27)      \n"     /* read ppn             */
-                       "li      $26,    0xF         \n" 
-                       "mtc2    $26,    $1          \n"     /* DTLB activated       */
 
-                       "or     $26,     $8,    $0   \n"     /* SR previous state    */
+                       "li      $27,    0xF         \n" 
+                       "mtc2    $27,    $1          \n"     /* DTLB activated       */
+
+                       "mtc0    $26,    $12         \n"     /* restore SR           */
                         :"=r"(flags_value), "=r"(ppn_value)
                         :"r"(pte2)