Changeset 255 for soft/giet_vm/libs

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/libs

Files:

• spin_lock.c (modified) (1 diff)
• stdio.c (modified) (2 diffs)
• stdio.h (modified) (1 diff)

soft/giet_vm/libs/spin_lock.c

@@ -39 +39 @@
             "sc   $3,    0($16)             \n" /* try to get lock */
             "bnez $3,    giet_lock_ok       \n" /* exit if atomic */
+            "nop                            \n"
 
             "giet_lock_delay:               \n"

soft/giet_vm/libs/stdio.c

@@ -45 +45 @@
 #define SYSCALL_NIC_SYNC_READ     0x1E
 #define SYSCALL_NIC_SYNC_WRITE    0x1F
+#define SYSCALL_SIM_HELPER_ACCESS 0x20
 
 //////////////////////////////////////////////////////////////////////////////////
@@ -851 +852 @@
 
 
+////////////////////////////////////////////////////////////////////////////////////
+// giet_sc_stop()
+// This function causes the Sim Helper to cause sc_stop()
+////////////////////////////////////////////////////////////////////////////////////
+unsigned int giet_sc_stop()
+{
+    unsigned int reg_index = 0; // Index of the SIMHELPER_SC_STOP register
+    return sys_call(SYSCALL_SIM_HELPER_ACCESS, reg_index, 0, 0, 0);
+}
+
+
+////////////////////////////////////////////////////////////////////////////////////
+// giet_end_simu()
+// This function causes the Sim Helper to cause exit(val)
+////////////////////////////////////////////////////////////////////////////////////
+unsigned int giet_end_simu(unsigned int val)
+{
+    unsigned int reg_index = 1; // Index of the SIMHELPER_END_WITH_RETVAL register
+    return sys_call(SYSCALL_SIM_HELPER_ACCESS, reg_index, val, 0, 0);
+}
+
+
+////////////////////////////////////////////////////////////////////////////////////
+// giet_throw_soclib_exception()
+// This function causes the Sim Helper to launch a soclib exception with val in message
+////////////////////////////////////////////////////////////////////////////////////
+unsigned int giet_throw_soclib_exception(unsigned int val)
+{
+    unsigned int reg_index = 2; // Index of the SIMHELPER_EXCEPT_WITH_VAL register
+    return sys_call(SYSCALL_SIM_HELPER_ACCESS, reg_index, val, 0, 0);
+}
+
+
+////////////////////////////////////////////////////////////////////////////////////
+// giet_pause_simu()
+// This function causes the Sim Helper to pause the simulation
+////////////////////////////////////////////////////////////////////////////////////
+unsigned int giet_pause_simu()
+{
+    unsigned int reg_index = 3; // Index of the SIMHELPER_PAUSE_SIM register
+    return sys_call(SYSCALL_SIM_HELPER_ACCESS, reg_index, 0, 0, 0);
+}
+
+
+////////////////////////////////////////////////////////////////////////////////////
+// giet_raise_sigint()
+// This function causes the Sim Helper to call raise(SIGINT) to interrupt simulation
+////////////////////////////////////////////////////////////////////////////////////
+unsigned int giet_raise_sigint()
+{
+    unsigned int reg_index = 5; // Index of the SIMHELPER_PAUSE_SIM register
+    return sys_call(SYSCALL_SIM_HELPER_ACCESS, reg_index, 0, 0, 0);
+}
+
+
+////////////////////////////////////////////////////////////////////////////////////
+// giet_simhelper_cycles()
+// This function causes the Sim Helper to write the number of simulated cycles
+// at address *retval
+////////////////////////////////////////////////////////////////////////////////////
+unsigned int giet_simhelper_cycles(unsigned int * retval)
+{
+    unsigned int reg_index = 4; // Index of the SIMHELPER_PAUSE_SIM register
+    return sys_call(SYSCALL_SIM_HELPER_ACCESS, reg_index, 0, (unsigned int) retval, 0);
+}
+
+
+
 // Local Variables:
 // tab-width: 4

soft/giet_vm/libs/stdio.h

@@ -50 +50 @@
 unsigned int giet_fb_cma_stop();
 
-/* Network controller relate functions */
+/* Network controller related functions */
 unsigned int giet_nic_cma_rx_init(void* buf0, void* buf1, unsigned int length);
 unsigned int giet_nic_cma_tx_init(void* buf0, void* buf1, unsigned int length);
 unsigned int giet_nic_cma_stop();
+
+/* Simulation Helper related functions */
+unsigned int giet_sc_stop();
+unsigned int giet_end_simu(unsigned int retval);
+unsigned int giet_throw_soclib_exception(unsigned int val);
+unsigned int giet_pause_simu();
+unsigned int giet_raise_sigint();
+unsigned int giet_simhelper_cycles(unsigned int * retval);
 
 /* Misc */