X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fsyscalls.c;h=5580187df238562d19d49d2f4df901b7ed4e217f;hb=a2495c6ea4f4cab16b5d339ae511428e92e89e73;hp=cafe7c28e1bb58e63927ed9aa21df10290c865d2;hpb=c3d486ba13c6cd12558d4c0cf01d3fd93e797d64;p=tpg%2Facess2.git

diff --git a/Kernel/syscalls.c b/Kernel/syscalls.c
index cafe7c28..5580187d 100644
--- a/Kernel/syscalls.c
+++ b/Kernel/syscalls.c
@@ -7,35 +7,37 @@
 #include <acess.h>
 #include <syscalls.h>
 #include <proc.h>
+#include <hal_proc.h>
 #include <errno.h>
+#include <threads.h>
+#include <events.h>
 
 #define CHECK_NUM_NULLOK(v,size)	\
-	if((v)&&!Syscall_Valid((size),(Uint)(v))){ret=-1;err=-EINVAL;break;}
+	if((v)&&!Syscall_Valid((size),(v))){ret=-1;err=-EINVAL;break;}
 #define CHECK_STR_NULLOK(v)	\
-	if((v)&&!Syscall_ValidString((Uint)(v))){ret=-1;err=-EINVAL;break;}
+	if((v)&&!Syscall_ValidString((v))){ret=-1;err=-EINVAL;break;}
 #define CHECK_NUM_NONULL(v,size)	\
-	if(!(v)||!Syscall_Valid((size),(Uint)(v))){ret=-1;err=-EINVAL;break;}
+	if(!(v)||!Syscall_Valid((size),(v))){ret=-1;err=-EINVAL;break;}
 #define CHECK_STR_NONULL(v)	\
-	if(!(v)||!Syscall_ValidString((Uint)(v))){ret=-1;err=-EINVAL;break;}
+	if(!(v)||!Syscall_ValidString((v))){ret=-1;err=-EINVAL;break;}
+#define CHECK_STR_ARRAY(arr)	do {\
+	 int	i;\
+	char	**tmp = (char**)arr; \
+	CHECK_NUM_NONULL( tmp, sizeof(char**) ); \
+	for(i=0;tmp[i];i++) { \
+		CHECK_STR_NONULL( tmp[i] ); \
+		CHECK_NUM_NONULL( &tmp[i+1], sizeof(char*) ); \
+	}\
+	if(tmp[i]) break;\
+} while(0)
 
 // === IMPORTS ===
-extern int	Proc_Clone(Uint *Err, Uint Flags);
-extern int	Threads_WaitTID(int TID, int *status);
-extern Uint	Proc_SendMessage(Uint *Err, Uint Dest, Uint Length, void *Data);
-extern int	Proc_GetMessage(Uint *Err, Uint *Source, void *Buffer);
-extern int	Proc_Execve(char *File, char **ArgV, char **EnvP);
-extern Uint	Binary_Load(char *file, Uint *entryPoint);
-extern int	Threads_SetName(char *NewName);
-extern int	Threads_GetPID();
-extern int	Threads_GetTID();
-extern tUID	Threads_GetUID();
-extern int	Threads_SetUID(Uint *errno, tUID ID);
-extern tGID	Threads_GetGID();
-extern int	Threads_SetGID(Uint *errno, tGID ID);
+extern Uint	Binary_Load(const char *file, Uint *entryPoint);
 
 // === PROTOTYPES ===
- int	Syscall_ValidString(Uint Addr);
- int	Syscall_Valid(int Size, Uint Addr);
+void	SyscallHandler(tSyscallRegs *Regs);
+ int	Syscall_ValidString(const char *Addr);
+ int	Syscall_Valid(int Size, const void *Addr);
 
 // === CODE ===
 // TODO: Do sanity checking on arguments, ATM the user can really fuck with the kernel
@@ -43,11 +45,18 @@ void SyscallHandler(tSyscallRegs *Regs)
 {
 	Uint64	ret = 0;
 	Uint	err = -EOK;
+	 int	callNum = Regs->Num;
 	
-	ENTER("iThread iNum", Threads_GetTID(), Regs->Num);
-	if(Regs->Num < NUM_SYSCALLS)
-		LOG("Syscall %s", cSYSCALL_NAMES[Regs->Num]);
+	#if DEBUG < 2
+	if(callNum != SYS_READ && callNum != SYS_WRITE) {
+	#endif
+	ENTER("iThread iNum", Threads_GetTID(), callNum);
+	if(callNum < NUM_SYSCALLS)
+		LOG("Syscall %s", cSYSCALL_NAMES[callNum]);
 	LOG("Arg1: 0x%x, Arg2: 0x%x, Arg3: 0x%x, Arg4: 0x%x", Regs->Arg1, Regs->Arg2, Regs->Arg3, Regs->Arg4);
+	#if DEBUG < 2
+	}
+	#endif
 	
 	switch(Regs->Num)
 	{
@@ -60,13 +69,15 @@ void SyscallHandler(tSyscallRegs *Regs)
 	// -- Yield current timeslice
 	case SYS_YIELD:	Threads_Yield();	break;
 	
+	// -- Set Error Handler
+	case SYS_SETFAULTHANDLER:
+		Threads_SetFaultHandler(Regs->Arg1);
+		break;
+	
 	// -- 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
@@ -74,13 +85,19 @@ void SyscallHandler(tSyscallRegs *Regs)
 		err = -ENOSYS;
 		ret = -1;
 		break;
-	
+
+	// -- Wait fr an event	
+	case SYS_WAITEVENT:
+		// Message mask
+		ret = Threads_WaitEvents(Regs->Arg1);
+		break;
+
 	// -- Wait for a thread
 	case SYS_WAITTID:
 		// Sanity Check (Status can be NULL)
-		CHECK_NUM_NULLOK( Regs->Arg2, sizeof(int) );
+		CHECK_NUM_NULLOK( (int*)Regs->Arg2, sizeof(int) );
 		// TID, *Status
-		ret = Threads_WaitTID(Regs->Arg1, (void*)Regs->Arg2);
+		ret = Threads_WaitTID(Regs->Arg1, (int*)Regs->Arg2);
 		break;
 	
 	// -- Get the physical address of a page
@@ -106,71 +123,69 @@ void SyscallHandler(tSyscallRegs *Regs)
 	case SYS_GETGID:	ret = Threads_GetGID();	break;
 	
 	// -- Set User/Group IDs
-	case SYS_SETUID:	ret = Threads_SetUID(&err, Regs->Arg1);	break;
-	case SYS_SETGID:	ret = Threads_SetGID(&err, Regs->Arg1);	break;
+	case SYS_SETUID:	ret = Threads_SetUID(Regs->Arg1);	break;
+	case SYS_SETGID:	ret = Threads_SetGID(Regs->Arg1);	break;
 	
 	// -- Send Message
 	case SYS_SENDMSG:
-		CHECK_NUM_NONULL(Regs->Arg3, Regs->Arg2);
+		CHECK_NUM_NONULL( (void*)Regs->Arg3, Regs->Arg2 );
 		// Destination, Size, *Data
-		ret = Proc_SendMessage(&err, Regs->Arg1, Regs->Arg2, (void*)Regs->Arg3);
+		ret = Proc_SendMessage(Regs->Arg1, Regs->Arg2, (void*)Regs->Arg3);
 		break;
 	// -- Check for messages
 	case SYS_GETMSG:
-		CHECK_NUM_NULLOK(Regs->Arg1, sizeof(Uint));
-		if( Regs->Arg2 && Regs->Arg2 != -1 && !MM_IsUser(Regs->Arg2) )
-		{
+		CHECK_NUM_NULLOK( (Uint*)Regs->Arg1, sizeof(Uint) );
+		// NOTE: Can't do range checking as we don't know the size
+		// - Should be done by Proc_GetMessage
+		if( Regs->Arg2 && Regs->Arg2 != -1 && !MM_IsUser(Regs->Arg2) ) {
 			err = -EINVAL;	ret = -1;	break;
 		}
 		// *Source, *Data
-		ret = Proc_GetMessage(&err, (Uint*)Regs->Arg1, (void*)Regs->Arg2);
+		ret = Proc_GetMessage((Uint*)Regs->Arg1, (void*)Regs->Arg2);
+		break;
+	
+	// -- Get the current timestamp
+	case SYS_GETTIME:
+		ret = now();
 		break;
 	
 	// -- Set the thread's name
 	case SYS_SETNAME:
-		CHECK_STR_NONULL(Regs->Arg1);
+		CHECK_STR_NONULL( (char*) Regs->Arg1);
 		Threads_SetName( (char*)Regs->Arg1 );
 		break;
 	
 	// ---
 	// Binary Control
 	// ---
+	// -- Create a new process
+	case SYS_SPAWN:
+		CHECK_STR_NONULL((const char*)Regs->Arg1);
+		CHECK_STR_ARRAY((const char**)Regs->Arg2);
+		CHECK_STR_ARRAY((const char**)Regs->Arg3);
+		CHECK_NUM_NONULL((void*)Regs->Arg5, Regs->Arg4*sizeof(int));
+		ret = Proc_SysSpawn(
+			(const char*)Regs->Arg1, (const char**)Regs->Arg2, (const char**)Regs->Arg3,
+			Regs->Arg4, (int*)Regs->Arg5
+			);
+		break;
+	// -- Replace the current process with another
 	case SYS_EXECVE:
-		CHECK_STR_NONULL(Regs->Arg1);
-		//Log(" Regs = {Arg2: %x, Arg3: %x}", Regs->Arg2, Regs->Arg3);
-		{
-			 int	i;
-			char	**tmp = (char**)Regs->Arg2;
-			// Check ArgV (traverse array checking all string pointers)
-			CHECK_NUM_NONULL( tmp, sizeof(char**) );
-			//Log("tmp = %p", tmp);
-			for(i=0;tmp[i];i++) {
-				CHECK_NUM_NONULL( &tmp[i], sizeof(char*) );
-				CHECK_STR_NONULL( tmp[i] );
-			}
-			// Check EnvP also
-			// - EnvP can be NULL
-			if( Regs->Arg3 )
-			{
-				tmp = (char**)Regs->Arg3;
-				//Log("tmp = %p", tmp);
-				for(i=0;tmp[i];i++) {
-					CHECK_NUM_NULLOK( &tmp[i], sizeof(char*) );
-					CHECK_STR_NONULL( tmp[i] );
-				}
-			}
-		}
+		CHECK_STR_NONULL((char*)Regs->Arg1);
+		CHECK_STR_ARRAY( (char**)Regs->Arg2 );
+		if( Regs->Arg3 )
+			CHECK_STR_ARRAY( (char**)Regs->Arg3 );
 		LEAVE('s', "Assuming 0");
-		// Path, **Argv, **Envp
-		ret = Proc_Execve((char*)Regs->Arg1, (char**)Regs->Arg2, (char**)Regs->Arg3);
+		// Path, **Argv, **Envp, DataSize (=0 to tell it to create a copy)
+		ret = Proc_Execve(
+			(const char*)Regs->Arg1, (const char**)Regs->Arg2, (const char**)Regs->Arg3,
+			0
+			);
 		break;
+	// -- Load a binary into the current process
 	case SYS_LOADBIN:
-		if( !Syscall_ValidString(Regs->Arg1)
-		||  !Syscall_Valid(sizeof(Uint), Regs->Arg2) ) {
-			err = -EINVAL;
-			ret = 0;
-			break;
-		}
+		CHECK_STR_NONULL( (char*)Regs->Arg1 );
+		CHECK_NUM_NONULL( (Uint*)Regs->Arg2, sizeof(Uint) );
 		// Path, *Entrypoint
 		ret = Binary_Load((char*)Regs->Arg1, (Uint*)Regs->Arg2);
 		break;
@@ -179,20 +194,22 @@ void SyscallHandler(tSyscallRegs *Regs)
 	// Virtual Filesystem
 	// ---
 	case SYS_OPEN:
-		if( !Syscall_ValidString(Regs->Arg1) ) {
-			err = -EINVAL;
-			ret = -1;
-			break;
-		}
+		CHECK_STR_NONULL( (char*)Regs->Arg1 );
+		LOG("VFS_Open(\"%s\", 0x%x)", (char*)Regs->Arg1, Regs->Arg2 | VFS_OPENFLAG_USER);
 		ret = VFS_Open((char*)Regs->Arg1, Regs->Arg2 | VFS_OPENFLAG_USER);
 		break;
 	
 	case SYS_CLOSE:
+		LOG("VFS_Close(%i)", Regs->Arg1);
 		VFS_Close( Regs->Arg1 );
 		break;
 	
 	case SYS_SEEK:
+		#if BITS == 64
 		ret = VFS_Seek( Regs->Arg1, Regs->Arg2, Regs->Arg3 );
+		#else
+		ret = VFS_Seek( Regs->Arg1, Regs->Arg2|(((Uint64)Regs->Arg3)<<32), Regs->Arg4 );
+		#endif
 		break;
 		
 	case SYS_TELL:
@@ -200,54 +217,53 @@ void SyscallHandler(tSyscallRegs *Regs)
 		break;
 	
 	case SYS_WRITE:
-		CHECK_NUM_NONULL( Regs->Arg3, Regs->Arg2 );
-		ret = VFS_Write( Regs->Arg1, Regs->Arg2, (void*)Regs->Arg3 );
+		CHECK_NUM_NONULL( (void*)Regs->Arg2, Regs->Arg3 );
+		ret = VFS_Write( Regs->Arg1, Regs->Arg3, (void*)Regs->Arg2 );
 		break;
 	
 	case SYS_READ:
-		CHECK_NUM_NONULL( Regs->Arg3, Regs->Arg2 );
-		ret = VFS_Read( Regs->Arg1, Regs->Arg2, (void*)Regs->Arg3 );
+		CHECK_NUM_NONULL( (void*)Regs->Arg2, Regs->Arg3 );
+		ret = VFS_Read( Regs->Arg1, Regs->Arg3, (void*)Regs->Arg2 );
 		break;
 	
 	case SYS_FINFO:
-		CHECK_NUM_NONULL( Regs->Arg2, sizeof(tFInfo) + Regs->Arg3*sizeof(tVFS_ACL) );
+		CHECK_NUM_NONULL( (void*)Regs->Arg2, sizeof(tFInfo) + Regs->Arg3*sizeof(tVFS_ACL) );
 		// FP, Dest, MaxACLs
 		ret = VFS_FInfo( Regs->Arg1, (void*)Regs->Arg2, Regs->Arg3 );
 		break;
 	
 	// Get ACL Value
 	case SYS_GETACL:
-		if( !Syscall_Valid(sizeof(tVFS_ACL), Regs->Arg1) ) {
-			err = -EINVAL;
-			ret = -1;
-			break;
-		}
+		CHECK_NUM_NONULL( (void*)Regs->Arg2, sizeof(tVFS_ACL) );
 		ret = VFS_GetACL( Regs->Arg1, (void*)Regs->Arg2 );
 		break;
 	
 	// Read Directory
 	case SYS_READDIR:
-		if( !Syscall_Valid(8, Regs->Arg2) ) {
-			err = -EINVAL;
-			ret = -1;
-			break;
-		}
+		// TODO: What if the filename is longer?
+		// Maybe force it to be a 256 byte buffer
+		CHECK_NUM_NONULL( (void*)Regs->Arg2, 256 );
 		ret = VFS_ReadDir( Regs->Arg1, (void*)Regs->Arg2 );
 		break;
 	
+	// Open a file that is a entry in an open directory
+	case SYS_OPENCHILD:
+		CHECK_STR_NONULL( (char*)Regs->Arg2 );
+		ret = VFS_OpenChild( Regs->Arg1, (char*)Regs->Arg2, Regs->Arg3 | VFS_OPENFLAG_USER);
+		break;
+	
 	// Change Directory
 	case SYS_CHDIR:
-		if( !Syscall_ValidString(Regs->Arg1) ) {
-			err = -EINVAL;
-			ret = -1;
-			break;
-		}
-		ret = VFS_ChDir( (void*)Regs->Arg1 );
+		CHECK_STR_NONULL( (const char*)Regs->Arg1 );
+		ret = VFS_ChDir( (const char*)Regs->Arg1 );
 		break;
 	
 	// IO Control
 	case SYS_IOCTL:
 		// All sanity checking should be done by the driver
+		if( Regs->Arg3 && !MM_IsUser(Regs->Arg3) ) {
+			err = -EINVAL;	ret = -1;	break;
+		}
 		ret = VFS_IOCtl( Regs->Arg1, Regs->Arg2, (void*)Regs->Arg3 );
 		break;
 	
@@ -260,10 +276,10 @@ void SyscallHandler(tSyscallRegs *Regs)
 			break;
 		}
 		// Sanity check the paths
-		if(!Syscall_ValidString(Regs->Arg1)
-		|| !Syscall_ValidString(Regs->Arg2)
-		|| !Syscall_ValidString(Regs->Arg3)
-		|| !Syscall_ValidString(Regs->Arg4) ) {
+		if(!Syscall_ValidString((char*)Regs->Arg1)
+		|| !Syscall_ValidString((char*)Regs->Arg2)
+		|| !Syscall_ValidString((char*)Regs->Arg3)
+		|| !Syscall_ValidString((char*)Regs->Arg4) ) {
 			err = -EINVAL;
 			ret = -1;
 			break;
@@ -275,24 +291,53 @@ void SyscallHandler(tSyscallRegs *Regs)
 			(char*)Regs->Arg4	// Options
 			);
 		break;
+		
+	// Wait on a set of handles
+	case SYS_SELECT:
+		// Sanity checks
+		if( (Regs->Arg2 && !Syscall_Valid(sizeof(fd_set), (void*)Regs->Arg2))
+		 || (Regs->Arg3 && !Syscall_Valid(sizeof(fd_set), (void*)Regs->Arg3))
+		 || (Regs->Arg4 && !Syscall_Valid(sizeof(fd_set), (void*)Regs->Arg4))
+		 || (Regs->Arg5 && !Syscall_Valid(sizeof(tTime), (void*)Regs->Arg5)) )
+		{
+			err = -EINVAL;
+			ret = -1;
+			break;
+		}
+		// Perform the call
+		ret = VFS_Select(
+			Regs->Arg1,	// Max handle
+			(fd_set *)Regs->Arg2,	// Read
+			(fd_set *)Regs->Arg3,	// Write
+			(fd_set *)Regs->Arg4,	// Errors
+			(tTime *)Regs->Arg5,	// Timeout
+			(Uint32)Regs->Arg6,	// Extra wakeup events
+			0	// User handles
+			);
+		break;
 	
 	// -- Debug
 	//#if DEBUG_BUILD
 	case SYS_DEBUG:
-		Log((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;
 	//#endif
 	
 	// -- Default (Return Error)
 	default:
-		Warning("SyscallHandler: Unknown System Call %i", Regs->Num);
+		Log_Warning("Syscalls", "Unknown System Call %i", Regs->Num);
 		if(Regs->Num < NUM_SYSCALLS)
-			Warning(" Syscall '%s'", cSYSCALL_NAMES[Regs->Num]);
+			Log_Warning("Syscall", " named '%s'", cSYSCALL_NAMES[Regs->Num]);
 		err = -ENOSYS;
 		ret = -1;
 		break;
 	}
+
+	if(err == 0)	err = errno;
 	
 	if(err != 0) {
 		LOG("ID: %i, Return errno = %i", Regs->Num, err);
@@ -306,33 +351,39 @@ void SyscallHandler(tSyscallRegs *Regs)
 	#endif
 	Regs->Error = err;
 	#if DEBUG
+	# if DEBUG < 2
+	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
 	#endif
 }
 
 /**
- * \fn int Syscall_ValidString(Uint Addr)
+ * \fn int Syscall_ValidString(const char *Addr)
  * \brief Checks if a memory address contains a valid string
  */
-int Syscall_ValidString(Uint Addr)
+int Syscall_ValidString(const char *Addr)
 {
 	// Check if the memory is user memory
-	if(!MM_IsUser(Addr))	return 0;
+	if(!MM_IsUser( (tVAddr) Addr))	return 0;
 	
-	return CheckString( (char*)Addr );
+	return CheckString( Addr );
 }
 
 /**
- * \fn int Syscall_Valid(int Size, Uint Addr)
+ * \fn int Syscall_Valid(int Size, const void *Addr)
  * \brief Checks if a memory address is valid
  */
-int Syscall_Valid(int Size, Uint Addr)
+int Syscall_Valid(int Size, const void *Addr)
 {
-	if(!MM_IsUser(Addr))	return 0;
+	if(!MM_IsUser( (tVAddr)Addr ))	return 0;
 	
-	return CheckMem( (void*)Addr, Size );
+	return CheckMem( Addr, Size );
 }