X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Fld-acess_src%2Fsyscalls.c;h=965cc4aedd0edac99aacb0112ac8ef3b51c1c09b;hb=63895b4261593e7891a28db441a54615d0374c8b;hp=5c268702edbb42cd24191c8743f50cca7b50ec01;hpb=c366e1c60e7c6c3fc12be52583dda26ca9fd2b00;p=tpg%2Facess2.git

diff --git a/AcessNative/ld-acess_src/syscalls.c b/AcessNative/ld-acess_src/syscalls.c
index 5c268702..965cc4ae 100644
--- a/AcessNative/ld-acess_src/syscalls.c
+++ b/AcessNative/ld-acess_src/syscalls.c
@@ -9,15 +9,24 @@
 #include <string.h>
 #include <stddef.h>
 #include <unistd.h>
+#ifndef __WIN32__
+# include <spawn.h>	// posix_spawn
+#endif
 #include "request.h"
 
-#define DEBUG(str, x...)	Debug(str, x)
+#define assert(cnd) do{ \
+	if( !(cnd) ) { \
+		fprintf(stderr, "%s:%i - assert failed - " #cnd"\n", __FILE__, __LINE__);\
+		exit(-1); \
+	} \
+}while(0)
 
 #define	MAX_FPS	16
 
 // === Types ===
 
 // === IMPORTS ===
+extern int	gbSyscallDebugEnabled;
 
 // === GLOBALS ===
 FILE	*gaSyscall_LocalFPs[MAX_FPS];
@@ -156,13 +165,12 @@ uint64_t _Syscall(int SyscallID, const char *ArgTypes, ...)
 {
 	va_list	args;
 	 int	paramCount, dataLength;
-	 int	retCount = 1, retLength = sizeof(uint64_t);
+	 int	retCount = 2, retLength = sizeof(uint64_t) + sizeof(uint32_t);
 	void	**retPtrs;	// Pointers to return buffers
 	const char	*str;
 	tRequestHeader	*req;
 	void	*dataPtr;
 	uint64_t	retValue;
-	 int	i;
 	
 	// DEBUG!
 //	printf("&tRequestHeader->Params = %i\n", offsetof(tRequestHeader, Params));
@@ -229,38 +237,36 @@ uint64_t _Syscall(int SyscallID, const char *ArgTypes, ...)
 	}
 	va_end(args);
 	
-	// Send syscall request
+	// --- Send syscall request
 	if( SendRequest(req, dataLength, retLength) < 0 ) {
 		fprintf(stderr, "syscalls.c: SendRequest failed (SyscallID = %i)\n", SyscallID);
 		exit(127);
 	}
 	
-	// Parse return value
-	dataPtr = &req->Params[req->NParams];
-	retValue = 0;
-	if( req->NParams >= 1 )
-	{
-		switch(req->Params[0].Type)
-		{
-		case ARG_TYPE_INT64:
-			retValue = *(uint64_t*)dataPtr;
-			dataPtr += req->Params[0].Length;
-			break;
-		case ARG_TYPE_INT32:
-			retValue = *(uint32_t*)dataPtr;
-			dataPtr += req->Params[0].Length;
-			break;
-		}	
+	if( !(req->NParams >= 2) ) {
+		fprintf(stderr, "syscalls.c: Too few return params (%i)", req->NParams);
+		exit(127);
 	}
+	dataPtr = (void*)&req->Params[req->NParams];
+	// return
+	assert(req->Params[0].Type == ARG_TYPE_INT64);
+	assert(req->Params[0].Length == sizeof(uint64_t));
+	retValue = *(uint64_t*)dataPtr;
+	dataPtr += sizeof(uint64_t);
+	// errno
+	assert(req->Params[1].Type == ARG_TYPE_INT32);
+	assert(req->Params[1].Length == sizeof(uint32_t));
+	acess__errno = *(uint32_t*)dataPtr;
+	dataPtr += sizeof(uint32_t);
 	
 	// Write changes to buffers
-	if( req->NParams - 1 != retCount ) {
+	if( req->NParams - 2 != retCount ) {
 		fprintf(stderr, "syscalls.c: Return count inbalance (%i - 1 != exp %i) [Call %i]\n",
 			req->NParams, retCount, SyscallID);
 		exit(127);
 	}
 	retCount = 0;
-	for( i = 1; i < req->NParams; i ++ )
+	for( unsigned int i = 2; i < req->NParams; i ++ )
 	{
 		#if 0
 		 int	 j;
@@ -269,6 +275,7 @@ uint64_t _Syscall(int SyscallID, const char *ArgTypes, ...)
 			printf(" %02x", ((uint8_t*)dataPtr)[j]);
 		printf("\n");
 		#endif
+		assert( req->Params[i].Type == ARG_TYPE_DATA );
 		memcpy( retPtrs[retCount++], dataPtr, req->Params[i].Length );
 		dataPtr += req->Params[i].Length;
 	}
@@ -276,23 +283,47 @@ uint64_t _Syscall(int SyscallID, const char *ArgTypes, ...)
 	free( req );
 	free( retPtrs );
 	
-	DEBUG(": %i 0x%llx", SyscallID, retValue);
+	if( gbSyscallDebugEnabled ) {
+		SYSTRACE(": %i 0x%llx", SyscallID, retValue);
+	}
 	
 	return retValue;
 }
 
+int native_int_getfd(void)
+{
+	for(int ret = 0; ret < MAX_FPS; ret ++ )
+		if( gaSyscall_LocalFPs[ret] == NULL )
+			return ret;
+	return -1;
+}
 
 int native_open(const char *Path, int Flags)
 {
-	int	ret;
-       for(ret = 0; ret < MAX_FPS && gaSyscall_LocalFPs[ret]; ret ++ )	;
-       if(ret == MAX_FPS)	return -1;
+	int	ret = native_int_getfd();
+	if(ret == -1)	return -1;
        // TODO: Handle directories
-       gaSyscall_LocalFPs[ret] = fopen(&Path[4], "r+");
+       gaSyscall_LocalFPs[ret] = fopen(Path, "r+");
        if(!gaSyscall_LocalFPs[ret])	return -1;
        return ret;
 }
 
+int native_shm(const char *Tag, int Flags)
+{
+	// int ret = native_int_getfd();
+	//if(ret == -1)	return -1;
+	//if( strcmp(Tag, "anon") == 0 )
+	//	path = "/AcessNative/anon/RAND";
+	//	FD = shm_open(path, O_RDWD);
+	//shm_unlink(path);
+	//else
+	//	path = "/Acessnative/named/<TAG>";
+	// int FD = shm_open(path, O_RDWD);
+	//shm_unlink(path);
+	//gaSyscall_LocalFPs[ret] = 
+	return -1;
+}
+
 void native_close(int FD)
 {
 	fclose( gaSyscall_LocalFPs[FD] );
@@ -331,3 +362,22 @@ int native_execve(const char *filename, const char *const argv[], const char *co
 	perror("native_execve");
 	return ret;
 }
+
+int native_spawn(const char *filename, const char *const argv[], const char *const envp[])
+{
+	int rv;
+
+	fprintf(stderr, "native_spawn('%s')\n", filename);
+
+	#if __WIN32__
+	rv = _spawnve(_P_NOWAIT, filename, argv, envp);
+	#else
+	rv = posix_spawn(NULL, filename, NULL, NULL, (void*)argv, (void*)envp);
+	#endif
+	
+	if( rv == 0 ) {
+		perror("native_spawn");
+	}
+	
+	return rv;
+}