Changeset 231 for soft/giet_vm/sys/common.c

Timestamp:

Mar 5, 2013, 1:42:57 PM (12 years ago)

Author:

joannou

Message:

• Bugfix in Interruption mechanism :
  • _it_mask() and _it_restore() functions now share a global array indexed by the proc_id (used a simple global variable before => problem with multiproc)
  • added 2 new fuctions _it_enable() and _it_disable() that only affect the IE bit of the status register in COP0
  • replaced interrupt masking/restoring arround _ctx_switch() in sys_handler by a simple interrupt disabling before the call to _ctx_switch (restoring after a _ctx_switch wouldn't restore the correct task's status register)
  • replaced the use of _ctx_switch in _exit() by a call to _context_switch() (this function actually does the interrupt disabling)
• Added some comments in the ctx_handler.h
• Added the delay reset in the idle task (ctx_handler.c)
• Added a new irq type (PTI)
  • Modifications in xml_parser.c to accept PTI irq type (now used in xml mappings)
  • Added the test on the irq type in the _irq_demux() function. This leads to a different argument passed to the ISR (i.e. either channel_id or irq_id (aka icuid) )

File:

• soft/giet_vm/sys/common.c (modified) (4 diffs)

soft/giet_vm/sys/common.c

@@ -23 +23 @@
 
 // SR save (used by _it_mask() / it_restore()
-unsigned int _status_register_save;
+unsigned int _status_register_save[NB_CLUSTERS*NB_PROCS_MAX];
 
 ///////////////////////////////////////////////////////////////////////////////////
@@ -103 +103 @@
 //    _it_mask()
 // Access CP0 and mask IRQs
+// This function uses a global _status_register_save array
+// This function is NOT USED and NOT TESTED
 ///////////////////////////////////////////////////////////////////////////////////
 inline void _it_mask() {
     unsigned int sr_value;
+    unsigned int proc_id;
     asm volatile(
             "li      $3,        0xFFFFFFFE    \n"
@@ -111 +114 @@
             "and     $3,        $3, %0        \n"
             "mtc0    $3,        $12           \n"
-            : "=r"(sr_value) 
+            "mfc0    %1,        $15, 1        \n"
+            : "=r"(sr_value), "=r"(proc_id)
             : 
             : "$3");
-    _status_register_save = sr_value;
+    _status_register_save[proc_id] = sr_value;
 }
 
@@ -121 +125 @@
 //    _it_restore()
 // Access CP0 and enable IRQs
+// This function uses a global _status_register_save array
+// This function is NOT USED and NOT TESTED
 ///////////////////////////////////////////////////////////////////////////////////
 inline void _it_restore() {
-    unsigned int sr_value = _status_register_save;
-    asm volatile(
-            "mtc0  %0,        $12            \n"
-            :
-            : "r"(sr_value));
+    unsigned int proc_id;
+    // get the processor id to index the _status_register_save table
+    asm volatile("mfc0 %0, $15, 1" : "=r" (proc_id));
+    // restore the saved value into the status register
+    asm volatile("mtc0  %0, $12" : : "r" (_status_register_save[proc_id]));
+}
+
+///////////////////////////////////////////////////////////////////////////////////
+//    _it_disable()
+// Access CP0 and disables IRQs
+///////////////////////////////////////////////////////////////////////////////////
+inline void _it_disable() {
+    asm volatile(
+            "li      $3,        0xFFFFFFFE    \n"
+            "mfc0    $4,        $12           \n"
+            "and     $3,        $3, $4        \n"
+            "mtc0    $3,        $12           \n"
+            ::: "$3", "$4");
+}
+
+///////////////////////////////////////////////////////////////////////////////////
+//    _it_enable()
+// Access CP0 and enables IRQs
+///////////////////////////////////////////////////////////////////////////////////
+inline void _it_enable() {
+    asm volatile(
+            "li      $3,        0x00000001    \n"
+            "mfc0    $4,        $12           \n"
+            "or      $3,        $3, $4        \n"
+            "mtc0    $3,        $12           \n"
+            ::: "$3", "$4");
 }