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

Timestamp:

Mar 27, 2015, 11:43:48 AM (10 years ago)

Author:

alain

Message:

1) Introducing support for external IRQs dynamic routing.
2) Simplifying the _v2p_translate() function.
3) Removing the generic IOC driver (integrated in the FAT library).

File:

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

soft/giet_vm/giet_kernel/ctx_handler.c

@@ -8 +8 @@
 #include <ctx_handler.h>
 #include <giet_config.h>
+#include <hard_config.h>
 #include <utils.h>
 #include <tty0.h>
 #include <xcu_driver.h>
 
-////////// defined in giet_kernel/switch.s file /////////
+/////////////////////////////////////////////////////////////////////////////////
+//     Extern variables and functions
+/////////////////////////////////////////////////////////////////////////////////
+
+// defined in giet_kernel/switch.s file
 extern void _task_switch(unsigned int *, unsigned int *);
+
+// allocated in boot.c or kernel_init.c files
+extern static_scheduler_t* _schedulers[X_SIZE][Y_SIZE][NB_PROCS_MAX];
+
+//////////////////////////////////
+void _ctx_display( unsigned int x,
+                   unsigned int y,
+                   unsigned int p,
+                   unsigned int ltid,
+                   char*        string )
+{
+    static_scheduler_t* psched = _schedulers[x][y][p];
+    _printf("\n########## task[%d,%d,%d,%d] context\n"
+            " - CTX_EPC   = %x\n"
+            " - CTX_PTAB  = %x\n"
+            " - CTX_PTPR  = %x\n"
+            " - CTX_VSID  = %x\n"
+            " - CTX_SR    = %x\n"
+            " - CTX_RA    = %x\n"
+            " - CTX_SP    = %x\n"
+            " - CTX_RUN   = %x\n"
+            "########## %s\n",
+            x , y , p , ltid ,
+            psched->context[ltid][CTX_EPC_ID], 
+            psched->context[ltid][CTX_PTAB_ID], 
+            psched->context[ltid][CTX_PTPR_ID], 
+            psched->context[ltid][CTX_VSID_ID], 
+            psched->context[ltid][CTX_SR_ID], 
+            psched->context[ltid][CTX_RA_ID], 
+            psched->context[ltid][CTX_SP_ID], 
+            psched->context[ltid][CTX_RUN_ID],
+            string );
+}  // _ctx_display()
+
 
 //////////////////
@@ -48 +87 @@
 
     // launch "idle" task if no runable task
-    if (found == 0) 
-    {
-        next_task_id = IDLE_TASK_INDEX;
-    }
+    if (found == 0) next_task_id = IDLE_TASK_INDEX;
 
 #if GIET_DEBUG_SWITCH
 unsigned int x = cluster_xy >> Y_WIDTH;
 unsigned int y = cluster_xy & ((1<<Y_WIDTH)-1);
-
-_printf("\n[TASK SWITCH] (%d) -> (%d) on processor[%d,%d,%d] at cycle %d\n",
+_printf("\n[DEBUG SWITCH] (%d) -> (%d) on processor[%d,%d,%d] at cycle %d\n",
         curr_task_id, next_task_id, x, y , lpid, _get_proctime() );
 #endif
@@ -66 +101 @@
         unsigned int* next_ctx_vaddr = &(psched->context[next_task_id][0]);
 
-        // reset timer counter. 
-        // In all clusters, the first NB_PROCS_MAX
-        // timers are system timers (TICK)
-
-#if USE_XCU
+        // reset TICK timer counter. 
         _xcu_timer_reset_cpt( cluster_xy, lpid );
-#else
-        _timer_reset_cpt( cluster_xy, lpid); 
-#endif
 
         // set current task index 
@@ -80 +108 @@
 
         // makes context switch
-        _task_switch(curr_ctx_vaddr, next_ctx_vaddr);
+        _task_switch( curr_ctx_vaddr , next_ctx_vaddr );
+
     }
 } //end _ctx_switch()
+
 
 /////////////////
@@ -110 +140 @@
 
         // warning message
-        _puts("\n[GIET WARNING] Processor[");
-        _putd( x );
-        _puts(",");
-        _putd( y );
-        _puts(",");
-        _putd( p );
-        _puts("] still idle at cycle ");
-        _putd( _get_proctime() );
-        _puts("\n");
+        _printf("\n[GIET WARNING] Processor[%d,%d,%d] still idle at cycle %d",
+                x , y , p , _get_proctime() );
     }
 } // end ctx_idle()