Changeset 267 for soft/giet_vm/giet_kernel

Timestamp:

Jan 13, 2014, 3:20:29 PM (11 years ago)

Author:

cfuguet

Message:

• Adding new task context information: THREAD INDEX.

This value can be accessed by USER applications to get the
thread index of the current task. This thread index
corresponds to the index in a vspace.

The value of this index can be forced in the vspace part
of the XML description file using the trdid field in the
task description. When this value is missing, for each
task, a value from 0 to N-1 will be assigned, where N is
the number of task in the vspace.

The user application access this value through the
giet_thread_id() function defined in the stdio library
which uses the SYSCALL_THREAD_ID to access the task
context information.

• Supporting mono TTY platforms

When the GIET_MONO_TTY constant defined in the giet_config
file, contains a value different than 0, all tasks will
share the TTY[0]. If this is the case, in the stdio
library, the giet_tty_printf() function will take the TTY
hardware lock before writing

Location:

soft/giet_vm/giet_kernel

Files:

• ctx_handler.c (modified) (4 diffs)
• ctx_handler.h (modified) (1 diff)
• giet.s (modified) (1 diff)
• sys_handler.c (modified) (2 diffs)
• sys_handler.h (modified) (1 diff)

soft/giet_vm/giet_kernel/ctx_handler.c

@@ -41 +41 @@
 // - LTID   : Task local index (in scheduler)
 // - VSID   : Virtual space index
-// - RUN    : Task state (0 => sleeping / 1 => runable ) 
+// - RUN    : Task state (0 => sleeping / 1 => runnable ) 
+// - TRDID  : Thread ID index (in vspace)
 //
 // ctx[0]<- ***|ctx[8] <- $8 |ctx[16]<- $16|ctx[24]<- $24|ctx[32]<- EPC  |ctx[40]<- TTY
@@ -51 +52 @@
 // ctx[6]<- $6 |ctx[14]<- $14|ctx[22]<- $22|ctx[30]<- $30|ctx[38]<- VSID |ctx[46]<- GTID
 // ctx[7]<- $7 |ctx[15]<- $15|ctx[23]<- $23|ctx[31]<- RA |ctx[39]<- PTPR |ctx[47]<- RUN
+//
+// ctx[48]<- TRDID
 //////////////////////////////////////////////////////////////////////////////////////////
 
@@ -164 +167 @@
                 : "$3" ); 
 
+#if GIET_IDLE_TASK_VERBOSITY == 1
         _tty_get_lock( 0 );
         _puts("\n[GIET WARNING] Processor ");
@@ -171 +175 @@
         _puts("\n");
         _tty_release_lock( 0 );
+#endif
 
          count = GIET_IDLE_TASK_PERIOD;

soft/giet_vm/giet_kernel/ctx_handler.h

@@ -48 +48 @@
 #define CTX_GTID_ID      46  // Global Task Index
 #define CTX_RUN_ID       47  // Boolean: task runable
+#define CTX_TRDID_ID     48  // Thread Index in vspace
 
 //////////////////////////////////////////////////////////////////////////////////

soft/giet_vm/giet_kernel/giet.s

@@ -9 +9 @@
 * - the _cause_vector[16] array defines the 16 causes to enter the GIET
 *   it is initialized in th exc_handler.c file
-* - the _syscall_vector[32] array defines the 32 system calls entry points
+* - the _syscall_vector[64] array defines the 64 system calls entry points
 *   it is initialised in the sys_handler.c file 
 ***********************************************************************************/

soft/giet_vm/giet_kernel/sys_handler.c

@@ -48 +48 @@
     &_fb_sync_write,       /* 0x10 */
     &_fb_sync_read,        /* 0x11 */
-    &_sys_ukn,             /* 0x12 */
-    &_sys_ukn,             /* 0x13 */
+    &_thread_id,           /* 0x12 */
+    &_tty_get_release_lock,/* 0x13 */
     &_sys_ukn,             /* 0x14 */
     &_sys_ukn,             /* 0x15 */ 
@@ -180 +180 @@
 {
     return _get_context_slot(CTX_GTID_ID);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// _thread_id()
+// Returns current thread index.
+/////////////////////////////////////////////////////////////////////////////
+unsigned int _thread_id()
+{
+    return _get_context_slot(CTX_TRDID_ID);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// _tty_get_release_lock(int val)
+// Get or release the hardware TTY lock depending on val (0: get,1: release)
+/////////////////////////////////////////////////////////////////////////////
+int _tty_get_release_lock(unsigned int val)
+{
+    unsigned int channel = _get_context_slot(CTX_TTY_ID);
+
+    if      ( val == 0 ) _tty_get_lock(channel);
+    else if ( val == 1 ) _tty_release_lock(channel);
+    else return -1; // Wrong action
+
+    return 0;
 }
 

soft/giet_vm/giet_kernel/sys_handler.h

@@ -24 +24 @@
 unsigned int _local_task_id();
 unsigned int _global_task_id();
+unsigned int _thread_id();
+
+int          _tty_get_release_lock(unsigned int val);
 
 unsigned int _procs_number( unsigned int  cluster_id,