X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Facesskernel_src%2Fsyscalls.c;h=344745fd9d044886621deed1dd90b926a37ad8c0;hb=3c283c4831c40c14d308a54cefb997832a860bca;hp=827d611032639fe0da707bbdd13eed0ed2a84738;hpb=c18c6fea968e72403f9a7b75d6f7f8e3f9e8757f;p=tpg%2Facess2.git

diff --git a/AcessNative/acesskernel_src/syscalls.c b/AcessNative/acesskernel_src/syscalls.c
index 827d6110..344745fd 100644
--- a/AcessNative/acesskernel_src/syscalls.c
+++ b/AcessNative/acesskernel_src/syscalls.c
@@ -16,26 +16,34 @@
 // === IMPORTS ===
 extern int	Threads_Fork(void);	// AcessNative only function
 extern int	Threads_Spawn(int nFD, int FDs[], const void *info);
+extern int	Syscall_AN_GetPath_Real(char *Dest, size_t DstLen, const char *Path);
 
 // === TYPES ===
 typedef int	(*tSyscallHandler)(Uint *Errno, const char *Format, void *Args, int *Sizes);
 
 // === MACROS ===
+#define _SYSCALL_CHKFMT(_name,_fmtstr,Fmt) do{ \
+	if(strcmp(Fmt,_fmtstr) != 0) {\
+		*Errno = EINVAL;\
+		Log_Error("Syscalls", "Call %s takes args '%s', given '%s'", #_name, _fmtstr, Fmt);\
+		return -1;\
+	}\
+} while(0)
 #define SYSCALL6(_name, _fmtstr, _t0, _t1, _t2, _t3, _t4, _t5, _call) int _name(Uint*Errno,const char*Fmt,void*Args,int*Sizes){\
 	_t0 a0;_t1 a1;_t2 a2;_t3 a3;_t4 a4;_t5 a5;\
-	if(strcmp(Fmt,_fmtstr)!=0)return 0;\
+	_SYSCALL_CHKFMT(_name,_fmtstr,Fmt);\
 	a0 = *(_t0*)Args;Args+=sizeof(_t0);\
 	a1 = *(_t1*)Args;Args+=sizeof(_t1);\
 	a2 = *(_t2*)Args;Args+=sizeof(_t2);\
 	a3 = *(_t3*)Args;Args+=sizeof(_t3);\
 	a4 = *(_t4*)Args;Args+=sizeof(_t4);\
 	a5 = *(_t5*)Args;Args+=sizeof(_t5);\
-	LOG("SYSCALL5 '%s' %p %p %p %p %p %p", Fmt, (intptr_t)a0,(intptr_t)a1,(intptr_t)a2,(intptr_t)a3,(intptr_t)a4,(intptr_t)a5);\
+	LOG("SYSCALL6 '%s' %p %p %p %p %p %p", Fmt, (intptr_t)a0,(intptr_t)a1,(intptr_t)a2,(intptr_t)a3,(intptr_t)a4,(intptr_t)a5);\
 	_call\
 }
 #define SYSCALL5(_name, _fmtstr, _t0, _t1, _t2, _t3, _t4, _call) int _name(Uint*Errno,const char*Fmt,void*Args,int*Sizes){\
 	_t0 a0;_t1 a1;_t2 a2;_t3 a3;_t4 a4;\
-	if(strcmp(Fmt,_fmtstr)!=0)return 0;\
+	_SYSCALL_CHKFMT(_name,_fmtstr,Fmt);\
 	a0 = *(_t0*)Args;Args+=sizeof(_t0);\
 	a1 = *(_t1*)Args;Args+=sizeof(_t1);\
 	a2 = *(_t2*)Args;Args+=sizeof(_t2);\
@@ -46,7 +54,7 @@ typedef int	(*tSyscallHandler)(Uint *Errno, const char *Format, void *Args, int
 }
 #define SYSCALL4(_name, _fmtstr, _t0, _t1, _t2, _t3, _call) int _name(Uint*Errno,const char*Fmt,void*Args,int*Sizes){\
 	_t0 a0;_t1 a1;_t2 a2;_t3 a3;\
-	if(strcmp(Fmt,_fmtstr)!=0)return 0;\
+	_SYSCALL_CHKFMT(_name,_fmtstr,Fmt);\
 	a0 = *(_t0*)Args;Args+=sizeof(_t0);\
 	a1 = *(_t1*)Args;Args+=sizeof(_t1);\
 	a2 = *(_t2*)Args;Args+=sizeof(_t2);\
@@ -57,7 +65,7 @@ typedef int	(*tSyscallHandler)(Uint *Errno, const char *Format, void *Args, int
 
 #define SYSCALL3(_name, _fmtstr, _t0, _t1, _t2, _call) int _name(Uint*Errno,const char*Fmt,void*Args,int*Sizes){\
 	_t0 a0;_t1 a1;_t2 a2;\
-	if(strcmp(Fmt,_fmtstr)!=0)return 0;\
+	_SYSCALL_CHKFMT(_name,_fmtstr,Fmt);\
 	a0 = *(_t0*)Args;Args+=sizeof(_t0);\
 	a1 = *(_t1*)Args;Args+=sizeof(_t1);\
 	a2 = *(_t2*)Args;Args+=sizeof(_t2);\
@@ -67,7 +75,7 @@ typedef int	(*tSyscallHandler)(Uint *Errno, const char *Format, void *Args, int
 
 #define SYSCALL2(_name, _fmtstr, _t0, _t1, _call) int _name(Uint*Errno,const char*Fmt,void*Args,int*Sizes){\
 	_t0 a0;_t1 a1;\
-	if(strcmp(Fmt,_fmtstr)!=0)return 0;\
+	_SYSCALL_CHKFMT(_name,_fmtstr,Fmt);\
 	a0 = *(_t0*)Args;Args+=sizeof(_t0);\
 	a1 = *(_t1*)Args;Args+=sizeof(_t1);\
 	LOG("SYSCALL2 '%s' %p %p", Fmt, (intptr_t)a0,(intptr_t)a1);\
@@ -76,14 +84,14 @@ typedef int	(*tSyscallHandler)(Uint *Errno, const char *Format, void *Args, int
 
 #define SYSCALL1(_name, _fmtstr, _t0, _call) int _name(Uint*Errno,const char*Fmt, void*Args,int*Sizes){\
 	_t0 a0;\
-	if(strcmp(Fmt,_fmtstr)!=0)return 0;\
+	_SYSCALL_CHKFMT(_name,_fmtstr,Fmt);\
 	a0 = *(_t0*)Args;Args+=sizeof(_t0);\
 	LOG("SYSCALL1 '%s' %p", Fmt,(intptr_t)a0);\
 	_call;\
 }
 
 #define SYSCALL0(_name, _call) int _name(Uint*Errno,const char*Fmt, void*Args,int*Sizes){\
-	if(strcmp(Fmt,"")!=0)return 0;\
+	_SYSCALL_CHKFMT(_name,"",Fmt);\
 	LOG("SYSCALL0");\
 	_call;\
 }
@@ -119,6 +127,7 @@ SYSCALL3(Syscall_Read, "iid", int, int, void *,
 );
 SYSCALL3(Syscall_Write, "iid", int, int, const void *,
 	if( Sizes[2] < a1 ) {
+		Log_Warning("Syscalls", "Write - %x < %x", (int)Sizes[2], (int)a1);
 		*Errno = EINVAL;
 		return -1;
 	}
@@ -166,6 +175,11 @@ SYSCALL4(Syscall_Mount, "ssss", const char *, const char *, const char *, const
 SYSCALL1(Syscall_Chdir, "s", const char *,
 	return VFS_ChDir(a0);
 );
+
+SYSCALL2(Syscall_AN_Getpath, "ds", char *, const char *,
+	return Syscall_AN_GetPath_Real(a0, Sizes[0], a1);
+);
+
 SYSCALL0(Syscall_Sleep,
 	Threads_Sleep();
 	return 0;
@@ -235,26 +249,29 @@ SYSCALL1(Syscall_WaitEvent, "i", int,
 );
 
 const tSyscallHandler	caSyscalls[] = {
-	Syscall_Null,
-	Syscall_Exit,
-	Syscall_Open,
-	Syscall_Close,
-	Syscall_Read,
-	Syscall_Write,
-	Syscall_Seek,
-	Syscall_Tell,
-	Syscall_IOCtl,
-	Syscall_FInfo,
-	Syscall_ReadDir,
-	Syscall_OpenChild,
-	Syscall_GetACL,
-	Syscall_Mount,
-	NULL,	// SYS_REOPEN
-	Syscall_Chdir,
+	[SYS_NULL]	= Syscall_Null,
+	[SYS_EXIT]	= Syscall_Exit,
+	[SYS_OPEN]	= Syscall_Open,
+	[SYS_CLOSE]	= Syscall_Close,
+	[SYS_COPYFD]	= NULL,
+	[SYS_FDFLAGS]	= NULL,
+	[SYS_READ]	= Syscall_Read,
+	[SYS_WRITE]	= Syscall_Write,
+	[SYS_SEEK]	= Syscall_Seek,
+	[SYS_TELL]	= Syscall_Tell,
+	[SYS_IOCTL]	= Syscall_IOCtl,
+	[SYS_FINFO]	= Syscall_FInfo,
+	[SYS_READDIR]	= Syscall_ReadDir,
+	[SYS_OPENCHILD]	= Syscall_OpenChild,
+	[SYS_GETACL]	= Syscall_GetACL,
+	[SYS_MOUNT]	= Syscall_Mount,
+	[SYS_REOPEN]	= NULL,	// SYS_REOPEN
+	[SYS_CHDIR]	= Syscall_Chdir,
+	[SYS_AN_GETPATH] = Syscall_AN_Getpath,
 	
-	Syscall_WaitTID,
-	Syscall_SetUID,
-	Syscall_SetGID,
+	[SYS_WAITTID]	= Syscall_WaitTID,
+	[SYS_SETUID]	= Syscall_SetUID,
+	[SYS_SETGID]	= Syscall_SetGID,
 	
 	Syscall_GetTID,
 	Syscall_GetPID,
@@ -262,8 +279,8 @@ const tSyscallHandler	caSyscalls[] = {
 	Syscall_GetGID,
 
 	Syscall_Sleep,
-	Syscall_AN_Fork,
-	Syscall_AN_Spawn,
+	[SYS_AN_FORK]  = Syscall_AN_Fork,
+	[SYS_AN_SPAWN] = Syscall_AN_Spawn,
 
 	Syscall_SendMessage,
 	Syscall_GetMessage,
@@ -274,19 +291,22 @@ const int	ciNumSyscalls = sizeof(caSyscalls)/sizeof(caSyscalls[0]);
 /**
  * \brief Recieve a syscall structure from the server code
  */
-tRequestHeader *SyscallRecieve(tRequestHeader *Request, int *ReturnLength)
+tRequestHeader *SyscallRecieve(tRequestHeader *Request, size_t *ReturnLength)
 {
 	char	formatString[Request->NParams+1];
 	char	*inData = (char*)&Request->Params[Request->NParams];
 	 int	argListLen = 0;
-	 int	i, retVal;
+	 int	retVal;
 	tRequestHeader	*ret;
-	 int	retValueCount = 1;
-	 int	retDataLen = sizeof(Uint64);
+	 int	retValueCount;
+	 int	retDataLen;
 	void	*returnData[Request->NParams];
 	 int	argSizes[Request->NParams];
 	Uint	ret_errno = 0;
 	
+	// Clear errno (Acess verson) at the start of the request
+	errno = 0;
+	
 	// Sanity check
 	if( Request->CallID >= ciNumSyscalls ) {
 		Log_Notice("Syscalls", "Unknown syscall number %i", Request->CallID);
@@ -297,9 +317,13 @@ tRequestHeader *SyscallRecieve(tRequestHeader *Request, int *ReturnLength)
 		Log_Notice("Syscalls", "Unimplemented syscall %i", Request->CallID);
 		return NULL;
 	}
-	
+
+	// Init return count/size
+	retValueCount = 2;
+	retDataLen = sizeof(Uint64) + sizeof(Uint32);	
+
 	// Get size of argument list
-	for( i = 0; i < Request->NParams; i ++ )
+	for( int i = 0; i < Request->NParams; i ++ )
 	{
 		argSizes[i] = Request->Params[i].Length;
 		switch(Request->Params[i].Type)
@@ -318,16 +342,23 @@ tRequestHeader *SyscallRecieve(tRequestHeader *Request, int *ReturnLength)
 		case ARG_TYPE_DATA:
 			formatString[i] = 'd';
 			argListLen += sizeof(void*);
+			// Prepare the return values
+			if( Request->Params[i].Flags & ARG_FLAG_RETURN )
+			{
+				retDataLen += Request->Params[i].Length;
+				retValueCount ++;
+			}
 			break;
 		case ARG_TYPE_STRING:
 			formatString[i] = 's';
 			argListLen += sizeof(char*);
 			break;
 		default:
+			Log_Error("Syscalls", "Unknown param type %i", Request->Params[i].Type);
 			return NULL;	// ERROR!
 		}
 	}
-	formatString[i] = '\0';
+	formatString[Request->NParams] = '\0';
 	
 	LOG("Request %i(%s) '%s'", Request->CallID, casSYSCALL_NAMES[Request->CallID], formatString);
 	
@@ -335,7 +366,7 @@ tRequestHeader *SyscallRecieve(tRequestHeader *Request, int *ReturnLength)
 		char	argListData[argListLen];
 		argListLen = 0;
 		// Build argument list
-		for( i = 0; i < Request->NParams; i ++ )
+		for( int i = 0; i < Request->NParams; i ++ )
 		{
 			returnData[i] = NULL;
 			switch(Request->Params[i].Type)
@@ -364,13 +395,6 @@ tRequestHeader *SyscallRecieve(tRequestHeader *Request, int *ReturnLength)
 			// Data gets special handling, because only it can be returned to the user
 			// (ARG_TYPE_DATA is a pointer)
 			case ARG_TYPE_DATA:
-				// Prepare the return values
-				if( Request->Params[i].Flags & ARG_FLAG_RETURN )
-				{
-					retDataLen += Request->Params[i].Length;
-					retValueCount ++;
-				}
-				
 				// Check for non-resident data
 				if( Request->Params[i].Length == 0 )
 				{
@@ -406,9 +430,9 @@ tRequestHeader *SyscallRecieve(tRequestHeader *Request, int *ReturnLength)
 	
 	// ---------- Return
 	
-	if( ret_errno == 0 ) {
-		perror("Syscall?");
+	if( ret_errno == 0 && errno != 0 ) {
 		ret_errno = errno;
+		LOG("errno = %i", errno);
 	}
 	
 	// Allocate the return
@@ -427,10 +451,19 @@ tRequestHeader *SyscallRecieve(tRequestHeader *Request, int *ReturnLength)
 	*(Uint64*)inData = retVal;
 	inData += sizeof(Uint64);
 	
+	// Static Uint32 errno value
+	ret->Params[1].Type = ARG_TYPE_INT32;
+	ret->Params[1].Flags = 0;
+	ret->Params[1].Length = sizeof(Uint32);
+	*(Uint32*)inData = ret_errno;
+	inData += sizeof(Uint32);
+
+	LOG("Ret: %llx, errno=%i", retVal, ret_errno);	
+
 	//Log_Debug("Syscalls", "Return 0x%llx", retVal);
 	
-	retValueCount = 1;
-	for( i = 0; i < Request->NParams; i ++ )
+	retValueCount = 2;
+	for( int i = 0; i < Request->NParams; i ++ )
 	{
 		if( Request->Params[i].Type != ARG_TYPE_DATA )	continue;
 		if( !(Request->Params[i].Flags & ARG_FLAG_RETURN) )	continue;
@@ -450,9 +483,7 @@ tRequestHeader *SyscallRecieve(tRequestHeader *Request, int *ReturnLength)
 		retValueCount ++;
 	}
 	
-	*ReturnLength = sizeof(tRequestHeader)
-		+ retValueCount * sizeof(tRequestValue)
-		+ retDataLen;
+	*ReturnLength = ret->MessageLength;
 	
 	return ret;
 }