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

Timestamp:

Jul 18, 2012, 9:17:22 AM (12 years ago)

Author:

karaoui

Message:

Testing the placement of the kernel segments without the identity mapping.
debugging memo.
debugging the vm_handler to disable the interrupts while passing in physical addressing.

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 ( "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   */
+        asm volatile ( 
+                       "li      $27,    0xFFFFFFFE  \n"     /* Mask for IE bits     */
+                       "mfc0    $8,     $12         \n"     /* $8 <= SR             */ 
+                       "and     $26,    $26,    $27 \n"     /* disable Interrupts   */
+                       "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    */
                         :"=r"(flags_value), "=r"(ppn_value)
                         :"r"(pte2)
-                        :"$26" );
+                        :"$26","$27","$8" );
 
         // check PTE2 mapping