Changeset 301 for soft/giet_vm/giet_kernel/giet.s

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_kernel/giet.s (modified) (2 diffs)

soft/giet_vm/giet_kernel/giet.s

@@ -56 +56 @@
 _sys_handler:
     addiu   $29,    $29,    -24     /* 2 slots for SR&EPC, 4 slots for args passing */
-    mfc0    $26,    $12             /* load SR */
-    sw      $26,    16($29)         /* save it in the stack */
     mfc0    $27,    $14             /* load EPC */
     addiu   $27,    $27,    4       /* increment EPC for return address */
@@ -73 +71 @@
     mtc0    $26,    $12             /* interrupt enabled */
     jalr    $3                      /* jump to the proper syscall */
-    mtc0    $0,     $12             /* interrupt disbled */
 
-    lw      $26,    16($29)         /* load SR from stack */
-    mtc0    $26,    $12             /* restore SR */
+    mfc0    $26,    $12             /* load SR */
+    ori     $26,    $26,    0x2     /* set EXL bit */
+    mtc0    $26,    $12
+
     lw      $26,    20($29)         /* load EPC from stack */
     mtc0    $26,    $14             /* restore EPC */
-    addiu   $29,    $29,     24     /* restore stack pointer */
+    addiu   $29,    $29,    24      /* restore stack pointer */
     eret                            /* exit GIET */