X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=AcessNative%2Fld-acess_src%2Fsyscalls.c;h=546095612b70875b86a9ff91eb6fc267ebbd7f43;hb=d48818efad07523eba505813b60a82d13b35499a;hp=5882435111969aaa682ebc2c0d9ac6009a5ec3b8;hpb=a2b49f92646ef666e17172faf72a9dcc0d18942a;p=tpg%2Facess2.git

diff --git a/AcessNative/ld-acess_src/syscalls.c b/AcessNative/ld-acess_src/syscalls.c
index 58824351..54609561 100644
--- a/AcessNative/ld-acess_src/syscalls.c
+++ b/AcessNative/ld-acess_src/syscalls.c
@@ -12,7 +12,7 @@
 #include "request.h"
 #include "../syscalls.h"
 
-#define DEBUG(x...)	printf(x)
+#define DEBUG(str, x...)	Debug(str, x)
 
 #define NATIVE_FILE_MASK	0x40000000
 #define	MAX_FPS	16
@@ -59,7 +59,7 @@ const char *ReadEntry(tRequestValue *Dest, void *DataDest, void **PtrDest, const
 	case 'i':
 		
 		if( direction != 1 ) {
-			fprintf(stderr, "ReadEntry: Recieving an integer is not defined\n");
+			Warning("ReadEntry: Recieving an integer is not defined");
 			return NULL;
 		}
 		
@@ -271,12 +271,17 @@ uint64_t _Syscall(int SyscallID, const char *ArgTypes, ...)
 	free( req );
 	free( retPtrs );
 	
-	DEBUG(": %llx\n", retValue);
+	DEBUG(": %llx", retValue);
 	
 	return retValue;
 }
 
 // --- VFS Calls
+int acess_chdir(const char *Path)
+{
+	return _Syscall(SYS_CHDIR, ">s", Path);
+}
+
 int acess_open(const char *Path, int Flags)
 {
 	if( strncmp(Path, "$$$$", 4) == 0 )
@@ -318,7 +323,7 @@ size_t acess_read(int FD, size_t Bytes, void *Dest) {
 size_t acess_write(int FD, size_t Bytes, void *Src) {
 	if(FD & NATIVE_FILE_MASK)
 		return fwrite( Src, Bytes, 1, gaSyscall_LocalFPs[FD & (NATIVE_FILE_MASK-1)] );
-	DEBUG("write(0x%x, 0x%x, %p(\"%.*s\"))", FD, Bytes, Src, Bytes, (char*)Src);
+	DEBUG("write(0x%x, 0x%x, %p\"%.*s\")", FD, Bytes, Src, Bytes, (char*)Src);
 	return _Syscall(SYS_WRITE, ">i >i >d", FD, Bytes, Bytes, Src);
 }
 
@@ -344,6 +349,7 @@ uint64_t acess_tell(int FD) {
 
 int acess_ioctl(int fd, int id, void *data) {
 	// NOTE: 1024 byte size is a hack
+	DEBUG("ioctl(%i, %i, %p)", fd, id, data);
 	return _Syscall(SYS_IOCTL, ">i >i ?d", fd, id, 1024, data);
 }
 int acess_finfo(int fd, t_sysFInfo *info, int maxacls) {
@@ -354,9 +360,21 @@ int acess_finfo(int fd, t_sysFInfo *info, int maxacls) {
 }
 
 int acess_readdir(int fd, char *dest) {
+	DEBUG("readdir(%i, %p)", fd, dest);
 	return _Syscall(SYS_READDIR, ">i <d", fd, 256, dest);
 }
 
+int acess_select(int nfds, fd_set *read, fd_set *write, fd_set *error, time_t *timeout)
+{
+	DEBUG("select(%i, %p, %p, %p, %p)", nfds, read, write, error, timeout);
+	return _Syscall(SYS_SELECT, ">i ?d ?d ?d >d", nfds,
+		read ? (nfds+7)/8 : 0, read,
+		write ? (nfds+7)/8 : 0, write,
+		error ? (nfds+7)/8 : 0, error,
+		sizeof(*timeout), timeout
+		);
+}
+
 int acess__SysOpenChild(int fd, char *name, int flags) {
 	return _Syscall(SYS_OPENCHILD, ">i >s >i", fd, name, flags);
 }
@@ -372,6 +390,7 @@ int acess__SysMount(const char *Device, const char *Directory, const char *Type,
 
 // --- Error Handler
 int	acess__SysSetFaultHandler(int (*Handler)(int)) {
+	printf("TODO: Set fault handler (asked to set to %p)\n", Handler);
 	return 0;
 }
 
@@ -402,7 +421,7 @@ int acess_clone(int flags, void *stack)
 			return 0;
 		}
 		
-		// TODO: Return the acess TID instead
+		// Return the acess TID instead
 		return kernel_tid;
 	}
 	else
@@ -416,11 +435,11 @@ int acess_execve(char *path, char **argv, char **envp)
 {
 	 int	i, argc;
 	
-	printf("acess_execve: (path='%s', argv=%p, envp=%p)\n", path, argv, envp);
+	DEBUG("acess_execve: (path='%s', argv=%p, envp=%p)", path, argv, envp);
 	
 	// Get argument count
 	for( argc = 0; argv[argc]; argc ++ ) ;
-	printf(" acess_execve: argc = %i\n", argc);
+	DEBUG(" acess_execve: argc = %i", argc);
 	
 	char	*new_argv[5+argc+1];
 	char	key[11];
@@ -464,6 +483,19 @@ int acess_setgid(int ID)
 	return _Syscall(SYS_SETGID, ">i", ID);
 }
 
+int acess_SysSendMessage(int DestTID, int Length, void *Data)
+{
+	return _Syscall(SYS_SENDMSG, ">i >d", DestTID, Length, Data);
+}
+
+int acess_SysGetMessage(int *SourceTID, void *Data)
+{
+	return _Syscall(SYS_GETMSG, "<d <d",
+		SourceTID ? sizeof(int) : 0, SourceTID,
+		Data ? 4096 : 0, Data
+		);
+}
+
 // --- Logging
 void acess__SysDebug(const char *Format, ...)
 {
@@ -471,7 +503,7 @@ void acess__SysDebug(const char *Format, ...)
 	
 	va_start(args, Format);
 	
-	printf("[_SysDebug] ");
+	printf("[_SysDebug %i]", giSyscall_ClientID);
 	vprintf(Format, args);
 	printf("\n");
 	
@@ -480,6 +512,7 @@ void acess__SysDebug(const char *Format, ...)
 
 void acess__exit(int Status)
 {
+	DEBUG("_exit(%i)", Status);
 	_Syscall(SYS_EXIT, ">i", Status);
 	exit(Status);
 }
@@ -490,6 +523,7 @@ void acess__exit(int Status)
 const tSym	caBuiltinSymbols[] = {
 	DEFSYM(_exit),
 	
+	DEFSYM(chdir),
 	DEFSYM(open),
 	DEFSYM(close),
 	DEFSYM(reopen),
@@ -500,6 +534,7 @@ const tSym	caBuiltinSymbols[] = {
 	DEFSYM(ioctl),
 	DEFSYM(finfo),
 	DEFSYM(readdir),
+	DEFSYM(select),
 	DEFSYM(_SysOpenChild),
 	DEFSYM(_SysGetACL),
 	DEFSYM(_SysMount),
@@ -511,6 +546,9 @@ const tSym	caBuiltinSymbols[] = {
 	DEFSYM(waittid),
 	DEFSYM(setuid),
 	DEFSYM(setgid),
+
+	DEFSYM(SysSendMessage),
+	DEFSYM(SysGetMessage),
 	
 	DEFSYM(_SysAllocate),
 	DEFSYM(_SysDebug),