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

Timestamp:

Jul 16, 2012, 10:26:27 AM (12 years ago)

Author:

alain

Message:

Fix several bugs to use the vci_block_device with MMU activated

File:

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

soft/giet_vm/sys/ctx_handler.c

@@ -15 +15 @@
 // It contains copies of processor registers, when the task is not running,
 // and some general informations associated to the task.
+//
 // - It contains GPR[i], generally stored in slot (i). $0, *26 & $27 are not saved.
 // - It contains HI & LO registers.
 // - It contains CP0 registers: EPC, SR, CR.
 // - It contains CP2 registers : PTPR and MODE.
-// - It contains the TTY index for the terminal allocated to the task.
-// ctx[0] <- SR   ctx[8] <- $8    ctx[16]<- $16   ctx[24]<- $24   ctx[32]<- EPC
-// ctx[1] <- $1   ctx[9] <- $9    ctx[17]<- $17   ctx[25]<- $25   ctx[33]<- CR
-// ctx[2] <- $2   ctx[10]<- $10   ctx[18]<- $18   ctx[26]<- LO    ctx[34]<- TTY
-// 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]<- 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
+// - It contains the TTY global index, the FBDMA global index, the virtual base 
+//   address of the page table (PTAB), and the task global index (TASK).
+//
+// ctx[0]<- SR|ctx[8] <- $8 |ctx[16]<- $16|ctx[24]<- $24|ctx[32]<- EPC |ctx[40]<- TTY
+// ctx[1]<- $1|ctx[9] <- $9 |ctx[17]<- $17|ctx[25]<- $25|ctx[33]<- CR  |ctx[41]<- FBDMA
+// ctx[2]<- $2|ctx[10]<- $10|ctx[18]<- $18|ctx[26]<- LO |ctx[34]<- *** |ctx[42]<- PTAB
+// ctx[3]<- $3|ctx[11]<- $11|ctx[19]<- $19|ctx[27]<- HI |ctx[35]<- PTPR|ctx[43]<- TASK
+// ctx[4]<- $4|ctx[12]<- $12|ctx[20]<- $20|ctx[28]<- $28|ctx[36]<- MODE|ctx[44]<- ***
+// ctx[5]<- $5|ctx[13]<- $13|ctx[21]<- $21|ctx[29]<- SP |ctx[37]<- *** |ctx[45]<- ***
+// ctx[6]<- $6|ctx[14]<- $14|ctx[22]<- $22|ctx[30]<- $30|ctx[38]<- *** |ctx[46]<- ***
+// ctx[7]<- $7|ctx[15]<- $15|ctx[23]<- $23|ctx[31]<- RA |ctx[39]<- *** |ctx[47]<- ***
 /////////////////////////////////////////////////////////////////////////////////////
 
@@ -40 +43 @@
 
 /////////////////////////////////////////////////////////////////////////////////
-//      Global variables
+//      Global variables : array of schedulers (one scheduler per processor)
 /////////////////////////////////////////////////////////////////////////////////
 
-static_scheduler_t _scheduler[NB_CLUSTERS * NB_PROCS];
+__attribute__((section (".kdata"))) static_scheduler_t _scheduler[NB_CLUSTERS * NB_PROCS];
 
 /////////////////////////////////////////////////////////////////////////////////
@@ -64 +67 @@
     unsigned int *next_context;
 
-    unsigned int pid   = _procid();
-    unsigned int time  = _proctime();
-    unsigned int tasks = _scheduler[pid].tasks;
+    unsigned int proc_id   = _procid();
+    unsigned int tasks     = _scheduler[proc_id].tasks;
 
     // return if only one task  */
@@ -72 +74 @@
  
     // compute the task context base address for the current task
-    curr_task_id = _scheduler[pid].current;
-    curr_context = &(_scheduler[pid].context[curr_task_id][0]);
+    curr_task_id = _scheduler[proc_id].current;
+    curr_context = &(_scheduler[proc_id].context[curr_task_id][0]);
     
     // select the next task using a round-robin scheduling policy
@@ -79 +81 @@
     
     // compute the task context base address for the next task
-    next_context = &(_scheduler[pid].context[next_task_id][0]);
+    next_context = &(_scheduler[proc_id].context[next_task_id][0]);
 
 #if GIET_DEBUG_SWITCH
 _get_lock( &_tty_put_lock );
 _puts( "\n[GIET] Context switch for processor ");
-_putw( pid );
+_putw( proc_id );
 _puts( " at cycle ");
-_putw( time );
+_putw( _proctime() );
 _puts("\n");
 _puts( " - tasks        = ");
@@ -101 +103 @@
 
     //  update the scheduler state, and makes the task switch
-    _scheduler[pid].current = next_task_id;
+    _scheduler[proc_id].current = next_task_id;
     _task_switch( curr_context, next_context );