Changeset 165 for soft/giet_vm/sys/ctx_handler.c

Timestamp:

Jul 4, 2012, 2:51:18 PM (12 years ago)

Author:

alain

Message:

Introducing various modifications in kernel initialisation

File:

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

soft/giet_vm/sys/ctx_handler.c

@@ -25 +25 @@
 // ctx[3] <- $3   ctx[11]<- $11   ctx[19]<- $19   ctx[27]<- HI    ctx[35]<- PTPR
 // ctx[4] <- $4   ctx[12]<- $12   ctx[20]<- $20   ctx[28]<- $28   ctx[36]<- MODE
-// ctx[5] <- $5   ctx[13]<- $13   ctx[21]<- $21   ctx[29]<- $29   ctx[37]<- reserved
+// ctx[5] <- $5   ctx[13]<- $13   ctx[21]<- $21   ctx[29]<- $29   ctx[37]<- FBDMA
 // ctx[6] <- $6   ctx[14]<- $14   ctx[22]<- $22   ctx[30]<- $30   ctx[38]<- reserved
 // ctx[7] <- $7   ctx[15]<- $15   ctx[23]<- $23   ctx[31]<- $31   ctx[39]<- reserved
@@ -64 +64 @@
     unsigned int *next_context;
 
-    unsigned int tasks;
-    unsigned int proc_id;
-
-    proc_id = _procid();
-    tasks   = _scheduler[proc_id].tasks;
+    unsigned int pid   = _procid();
+    unsigned int time  = _proctime();
+    unsigned int tasks = _scheduler[pid].tasks;
 
     // return if only one task  */
@@ -74 +72 @@
  
     // compute the task context base address for the current task
-    curr_task_id = _scheduler[proc_id].current;
-    curr_context = &(_scheduler[proc_id].context[curr_task_id][0]);
+    curr_task_id = _scheduler[pid].current;
+    curr_context = &(_scheduler[pid].context[curr_task_id][0]);
     
     // select the next task using a round-robin scheduling policy
@@ -81 +79 @@
     
     // compute the task context base address for the next task
-    next_context = &(_scheduler[proc_id].context[next_task_id][0]);
-
-    //  update the scheduler state, and makes the task switch
-    _scheduler[proc_id].current = next_task_id;
-    _task_switch( curr_context, next_context );
+    next_context = &(_scheduler[pid].context[next_task_id][0]);
 
 #if GIET_DEBUG_SWITCH
-unsigned int time = _proctime();
+_get_lock( &_tty_put_lock );
 _puts( "\n[GIET] Context switch for processor ");
-_putw( proc_id );
+_putw( pid );
 _puts( " at cycle ");
 _putw( time );
@@ -103 +97 @@
 _putw( next_task_id );
 _puts("\n");
+_release_lock( &_tty_put_lock );
 #endif
+
+    //  update the scheduler state, and makes the task switch
+    _scheduler[pid].current = next_task_id;
+    _task_switch( curr_context, next_context );
 
 } // end _ctx_switch