Changeset 408 for trunk/hal/tsar_mips32/core/hal_syscall.c

Timestamp:

Dec 5, 2017, 4:20:07 PM (6 years ago)

Author:

alain

Message:

Fix several bugs in the fork() syscall.

File:

• trunk/hal/tsar_mips32/core/hal_syscall.c (modified) (2 diffs)

trunk/hal/tsar_mips32/core/hal_syscall.c

@@ -30 +30 @@
 
 
-/////////////////////////////////////
-void hal_do_syscall( thread_t * this,
-                     reg_t    * regs_tbl )
+/////////////////////
+void hal_do_syscall()
 {
+    thread_t    * this;
 
-#if(CONFIG_SYSCALL_DEBUG & 0x1)
-printk("\n[DBG] %s : core[%x,%d] enter at cycle %d\n",
-__FUNCTION__ , local_cxy , this->core->lid , hal_time_stamp() );
-#endif
+    uint32_t    * enter_uzone;
+    uint32_t    * exit_uzone;
 
-        register reg_t      arg0;
-        register reg_t      arg1;
-        register reg_t      arg2;
-        register reg_t      arg3;
-        register reg_t      service_num;
-        register reg_t      retval;
+        uint32_t      arg0;
+        uint32_t      arg1;
+        uint32_t      arg2;
+        uint32_t      arg3;
+        uint32_t      service_num;
+        uint32_t      retval;
   
-        service_num = regs_tbl[UZ_V0];
+    // get pointer on enter_thread uzone
+    this        = CURRENT_THREAD;
+    enter_uzone = (uint32_t *)this->uzone;
 
-        arg0        = regs_tbl[UZ_A0];
-        arg1        = regs_tbl[UZ_A1];
-        arg2        = regs_tbl[UZ_A2];
-        arg3        = regs_tbl[UZ_A3];
+    // get syscall arguments from uzone
+        service_num = enter_uzone[UZ_V0];
+        arg0        = enter_uzone[UZ_A0];
+        arg1        = enter_uzone[UZ_A1];
+        arg2        = enter_uzone[UZ_A2];
+        arg3        = enter_uzone[UZ_A3];
  
+syscall_dmsg("\n[DBG] %s : core[%x,%d] enters for %s / &uzone %x / cycle %d \n",
+__FUNCTION__, local_cxy, this->core->lid, 
+syscall_str(service_num) , enter_uzone , (uint32_t)hal_get_cycles() );
+
     // call architecture independant syscall handler
         retval = do_syscall( this,
@@ -62 +68 @@
                          service_num );
 
-        regs_tbl[UZ_V0]   = retval;
-        regs_tbl[UZ_V1]   = this->errno;
-        regs_tbl[UZ_EPC] += 4;
+    // get pointer on exit_thread uzone,
+    // exit_thread can be different from enter_thread
+    this       = CURRENT_THREAD;
+    exit_uzone = (uint32_t *)this->uzone;
 
-#if(CONFIG_SYSCALL_DEBUG & 0x1)
-printk("\n[DBG] %s : core[%x,%d] exit at cycle %d\n",
-__FUNCTION__ , local_cxy , this->core->lid , hal_time_stamp() );
-#endif
+    // set syscall return value to uzone 
+        exit_uzone[UZ_V0] = retval;
+
+    // update EPC in uzone
+        exit_uzone[UZ_EPC] += 4;
+
+syscall_dmsg("\n[DBG] %s : core[%x,%d] exit from %s / &uzone %x / cycle %d \n",
+__FUNCTION__, local_cxy, this->core->lid, 
+syscall_str(service_num) , exit_uzone , (uint32_t)hal_get_cycles() );
 
 }