Changeset 275 for soft/giet_vm/giet_kernel/ctx_handler.c

Timestamp:

Jan 21, 2014, 7:20:06 PM (11 years ago)

Author:

cfuguet

Message:

• Adding volatile attribute for pointers used to address memory mapped hardware registers.

• Removing the activation of interruptions before the execution of the ctx_switch function on the ioc_access function. This is to avoid been interrupted during the modification of task context variables.

File:

• soft/giet_vm/giet_kernel/ctx_handler.c (modified) (5 diffs)

soft/giet_vm/giet_kernel/ctx_handler.c

@@ -108 +108 @@
     if (curr_task_id != next_task_id) 
     {
+#if GIET_DEBUG_SWITCH
+_tty_get_lock( 0 );
+_puts("\n[GIET DEBUG] Context switch for processor ");
+_putd(_get_procid());
+_puts(" at cycle ");
+_putd(_get_proctime());
+_puts("\n");
+_puts(" - tasks        = ");
+_putd(tasks);
+_puts("\n");
+_puts(" - curr_task_id = ");
+_putd( curr_task_id );
+_puts("\n");
+_puts(" - next_task_id = ");
+_putd(next_task_id);
+_puts("\n");
+_tty_release_lock(  0 );
+#endif
+
         unsigned int* curr_ctx_vaddr = &(psched->context[curr_task_id][0]);
         unsigned int* next_ctx_vaddr = &(psched->context[next_task_id][0]);
@@ -113 +132 @@
         unsigned int local_id = procid % NB_PROCS_MAX;
         unsigned int cluster_id = procid / NB_PROCS_MAX;
-
-        // set current task index 
-        psched->current = next_task_id;
 
         // reset timer counter
@@ -124 +140 @@
 #endif
 
+        // set current task index 
+        psched->current = next_task_id;
+
         // makes context switch
         _task_switch(curr_ctx_vaddr, next_ctx_vaddr);
-
-#if GIET_DEBUG_SWITCH
-_tty_get_lock( 0 );
-_puts("\n[GIET DEBUG] Context switch for processor ");
-_putd(_get_procid());
-_puts(" at cycle ");
-_putd(_get_proctime());
-_puts("\n");
-_puts(" - tasks        = ");
-_putd(tasks);
-_puts("\n");
-_puts(" - curr_task_id = ");
-_putd( curr_task_id );
-_puts("\n");
-_puts(" - next_task_id = ");
-_putd(next_task_id);
-_puts("\n");
-_tty_release_lock(  0 );
-#endif
-
     }
 } //end _ctx_switch()
@@ -157 +156 @@
     while(1)
     {
+#if GIET_IDLE_TASK_VERBOSITY == 1
+        _tty_get_lock( 0 );
+        _puts("\n[GIET WARNING] Processor ");
+        _putd(_get_procid());
+        _puts(" idle at cycle ");
+        _putd(_get_proctime());
+        _puts("\n");
+        _tty_release_lock( 0 );
+#endif
+
         asm volatile(
                 "move   $3,   %0              \n"
@@ -167 +176 @@
                 : "$3" ); 
 
-#if GIET_IDLE_TASK_VERBOSITY == 1
-        _tty_get_lock( 0 );
-        _puts("\n[GIET WARNING] Processor ");
-        _putd(_get_procid());
-        _puts(" idle at cycle ");
-        _putd(_get_proctime());
-        _puts("\n");
-        _tty_release_lock( 0 );
-#endif
-
          count = GIET_IDLE_TASK_PERIOD;
     }