X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fsyscalls.c;h=35e48902566bc1a846a134ebfb7af3d98d88334d;hb=3de85568b7c3e6245521e3c27cf5593247e4012b;hp=1294b21413286bc5cc1d01b55366534550fd05c5;hpb=9dc3cf2a69c5c4563091f37a06eece1723f51d0d;p=tpg%2Facess2.git

diff --git a/Kernel/syscalls.c b/Kernel/syscalls.c
index 1294b214..35e48902 100644
--- a/Kernel/syscalls.c
+++ b/Kernel/syscalls.c
@@ -7,6 +7,7 @@
 #include <acess.h>
 #include <syscalls.h>
 #include <proc.h>
+#include <hal_proc.h>
 #include <errno.h>
 #include <threads.h>
 
@@ -66,10 +67,7 @@ void SyscallHandler(tSyscallRegs *Regs)
 	// -- Clone the current thread
 	case SYS_CLONE:
 		// Call clone system call
-		ret = Proc_Clone(&err, Regs->Arg1);
-		// Change user stack if a new stack address is passed
-		if(ret == 0 && Regs->Arg2)
-			Regs->StackPointer = Regs->Arg2;
+		ret = Proc_Clone(Regs->Arg1);
 		break;
 	
 	// -- Send a signal
@@ -158,16 +156,18 @@ void SyscallHandler(tSyscallRegs *Regs)
 				CHECK_NUM_NONULL( &tmp[i], sizeof(char*) );
 				CHECK_STR_NONULL( tmp[i] );
 			}
+			if(ret == -1) break;
 			// Check EnvP also
 			// - EnvP can be NULL
 			if( Regs->Arg3 )
 			{
 				tmp = (char**)Regs->Arg3;
-				//Log("tmp = %p", tmp);
+				CHECK_NUM_NONULL(tmp, sizeof(char**));
 				for(i=0;tmp[i];i++) {
-					CHECK_NUM_NULLOK( &tmp[i], sizeof(char*) );
+					CHECK_NUM_NONULL( &tmp[i], sizeof(char*) );
 					CHECK_STR_NONULL( tmp[i] );
 				}
+				if(ret == -1) break;
 			}
 		}
 		LEAVE('s', "Assuming 0");
@@ -314,8 +314,9 @@ void SyscallHandler(tSyscallRegs *Regs)
 	// -- Debug
 	//#if DEBUG_BUILD
 	case SYS_DEBUG:
-		LogF("Log: [%i] ", Threads_GetTID());
-		LogF((char*)Regs->Arg1,
+		CHECK_STR_NONULL( (char*)Regs->Arg1 );
+		LogF("Log: %08lli [%i] ", now(), Threads_GetTID());
+		LogF((const char*)Regs->Arg1,
 			Regs->Arg2, Regs->Arg3, Regs->Arg4, Regs->Arg5, Regs->Arg6);
 		LogF("\r\n");
 		break;
@@ -349,10 +350,10 @@ void SyscallHandler(tSyscallRegs *Regs)
 	if( callNum != SYS_READ && callNum != SYS_WRITE ) {
 	# endif
 	LOG("err = %i", err);
-	if(Regs->Num != SYS_EXECVE)
-		LEAVE('x', ret);
-	else
+	if( callNum == SYS_EXECVE )
 		LOG("Actual %i", ret);
+	else
+		LEAVE('x', ret);
 	# if DEBUG < 2
 	}
 	# endif