Changeset 271 for soft/giet_vm/giet_kernel

Timestamp:

Jan 17, 2014, 11:49:27 PM (11 years ago)

Author:

cfuguet

Message:

• Bugfix: The ISR_SWITCH index should be NB_PROCS_MAX + local_pid. This is because the first NB_PROCS_MAX indexes on the XICU in each cluster are used for the WAKEUP software interrupts.

• Relocating the memcpy and memset functions into the giet_libs/stdlib.* files.

• Modification of the sort application to used 8 threads instead of
  4. Modifying the mapping files to distribute the 8 threads on the available processors. (Ex. When using 4 processors, each one executes 2 threads)

Location:

soft/giet_vm/giet_kernel

Files:

• ctx_handler.c (modified) (1 diff)
• kernel_init.c (modified) (1 diff)

soft/giet_vm/giet_kernel/ctx_handler.c

@@ -119 +119 @@
         // reset timer counter
 #if USE_XICU
-        _xcu_timer_reset_cpt(cluster_id, local_id);
+        _xcu_timer_reset_cpt(cluster_id, NB_PROCS_MAX + local_id);
 #else
-        _timer_reset_cpt(cluster_id, local_id); 
+        _timer_reset_cpt(cluster_id, NB_PROCS_MAX + local_id); 
 #endif
 

soft/giet_vm/giet_kernel/kernel_init.c

@@ -290 +290 @@
         }
 
+        // the ISR_SWITCH irq index must be NB_PROCS_MAX + local_pid because
+        // the first NB_PROCS_MAX irqs are used by the WAKEUP ones
+        if (isr_switch_index != (NB_PROCS_MAX + local_pid))
+        {
+            _tty_get_lock( 0 );
+            _puts("\n[GIET ERROR] ISR_SWITCH wrong index for processor ");
+            _putx(global_pid);
+            _puts("\n. It should be NB_PROCS_MAX + local_pid =");
+            _putd(NB_PROCS_MAX + local_pid);
+            _puts("\n");
+            _tty_release_lock( 0 );
+            _exit();
+        }
+
         // start system timer
         unsigned int ko;
 #if USE_XICU
-        ko = _xcu_timer_start( cluster_xy, local_pid, GIET_TICK_VALUE ); 
+        ko = _xcu_timer_start( cluster_xy, isr_switch_index, GIET_TICK_VALUE ); 
 #else
-        ko = _timer_start( cluster_xy, local_pid, GIET_TICK_VALUE ); 
+        ko = _timer_start( cluster_xy, isr_switch_index, GIET_TICK_VALUE ); 
 #endif
         if ( ko )