Changeset 255 for soft/giet_vm/sys

Timestamp:

Oct 9, 2013, 9:32:41 AM (11 years ago)

Author:

meunier

Message:

• Added a syscall and some user functions to manipulate the Simulation Helper
• Changed the the way the Vseg -> Pseg mapping is made during the boot to better utilize the address space (+ adaptation of the algorithm in memo)
• Fixed a bug in boot_init (vobj_init): the vobj initialization could only be made for the first application (ptpr was not changed)

Location:

soft/giet_vm/sys

Files:

• common.h (modified) (1 diff)
• drivers.c (modified) (1 diff)
• drivers.h (modified) (1 diff)
• giet.s (modified) (3 diffs)
• hwr_mapping.h (modified) (1 diff)
• sys_handler.c (modified) (3 diffs)
• sys_handler.h (modified) (1 diff)

soft/giet_vm/sys/common.h

@@ -31 +31 @@
 extern _ld_symbol_t seg_mmc_base;
 extern _ld_symbol_t seg_cma_base;
+extern _ld_symbol_t seg_sim_base;
 
 extern _ld_symbol_t vseg_cluster_increment;

soft/giet_vm/sys/drivers.c

@@ -1834 +1834 @@
 }
 
+
+////////////////////////////////////////////////////////////////////////////////
+// _sim_helper_access()
+// Accesses the Simulation Helper Component
+// If the access is on a writable register (except SIMHELPER_PAUSE_SIM),
+// the function should never return since the simulation will stop before
+// If the access is on a readable register, returns 0 on success, 1 on failure,
+// and writes the return value at address retval
+////////////////////////////////////////////////////////////////////////////////
+unsigned int _sim_helper_access(unsigned int register_index,
+                                unsigned int value,
+                                unsigned int * retval) {
+    unsigned int * sim_helper_address = (unsigned int *) &seg_sim_base;
+    
+    if (register_index == SIMHELPER_SC_STOP ||
+        register_index == SIMHELPER_END_WITH_RETVAL ||
+        register_index == SIMHELPER_EXCEPT_WITH_VAL ||
+        register_index == SIMHELPER_PAUSE_SIM ||
+        register_index == SIMHELPER_SIGINT) {
+        sim_helper_address[register_index] = value;
+    }
+    else if (register_index == SIMHELPER_CYCLES) {
+        *retval = sim_helper_address[register_index];
+    }
+    else {
+        _get_lock(&_tty_put_lock);
+        _puts("\n[GIET ERROR] in _sim_helper_access() : access to unmapped register\n");
+        _release_lock(&_tty_put_lock);
+        return -1;
+    }
+
+    return 0;
+}
+
+
+
 // Local Variables:
 // tab-width: 4

soft/giet_vm/sys/drivers.h

@@ -132 +132 @@
 
 ///////////////////////////////////////////////////////////////////////////////////
+// Sim Helper access function
+///////////////////////////////////////////////////////////////////////////////////
+unsigned int _sim_helper_access(unsigned int register_index,
+                                unsigned int value,
+                                unsigned int * retval);
+
+///////////////////////////////////////////////////////////////////////////////////
 // MEMC access functions
 ///////////////////////////////////////////////////////////////////////////////////

soft/giet_vm/sys/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 
 ***********************************************************************************/
@@ -38 +38 @@
  *
  * A system call is handled as a special function call.
- *  - $2 contains the system call index (< 16).
+ *  - $2 contains the system call index (< 64).
  *  - $3 is used to store the syscall address
  *  - $4, $5, $6, $7 contain the arguments values.
@@ -62 +62 @@
     sw      $27,    20($29)         /* save it in the stack */
 
-    andi    $26,    $2,     0x1F    /* $26 <= syscall index (i < 32) */
+    andi    $26,    $2,     0x3F    /* $26 <= syscall index (i < 64) */
     sll     $26,    $26,    2       /* $26 <= index * 4 */
     la      $27,    _syscall_vector /* $27 <= &_syscall_vector[0] */

soft/giet_vm/sys/hwr_mapping.h

@@ -192 +192 @@
 };
 
+enum SoclibSimhelperRegisters
+{
+    SIMHELPER_SC_STOP,
+    SIMHELPER_END_WITH_RETVAL,
+    SIMHELPER_EXCEPT_WITH_VAL,
+    SIMHELPER_PAUSE_SIM,
+    SIMHELPER_CYCLES,
+    SIMHELPER_SIGINT,
+};
+
+
+
 #endif
 

soft/giet_vm/sys/sys_handler.c

@@ -6 +6 @@
 ///////////////////////////////////////////////////////////////////////////////////
 // The sys_handler.c and sys_handler.h files are part of the GIET-VM nano-kernel.
-// It define the syscall_vector[] (at the end of this file), as well as the 
+// It defines the syscall_vector[], as well as the 
 // associated syscall handlers that are not related to peripherals.
 // The syscall handlers for peripherals are defined in the drivers.c file.
@@ -21 +21 @@
 //    Initialize the syscall vector with syscall handlers
 ////////////////////////////////////////////////////////////////////////////
-const void * _syscall_vector[32] = 
+const void * _syscall_vector[64] = 
 {
     &_procid,              /* 0x00 */
@@ -55 +55 @@
     &_nic_sync_read,       /* 0x1E */
     &_nic_sync_write,      /* 0x1F */
+    &_sim_helper_access,   /* 0x20 */
 };
 

soft/giet_vm/sys/sys_handler.h

@@ -13 +13 @@
 //////////////////////////////////////////////////////////////////////////////////
 
-extern const void * _syscall_vector[32];
+extern const void * _syscall_vector[64];
 
 //////////////////////////////////////////////////////////////////////////////////