X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Fld-acess_src%2Fsyscalls.c;h=34132c62a67b8fcff968252965992e3a8829f32a;hb=336ba8b200f6ca1d5d25f09a9d7ddac2e59b26d9;hp=02a59b90587be63906b9d2e4a8cfbd7cc2331cc0;hpb=9143c184873d0b55444dc1c1084f3e9f3f2614bf;p=tpg%2Facess2.git diff --git a/AcessNative/ld-acess_src/syscalls.c b/AcessNative/ld-acess_src/syscalls.c index 02a59b90..34132c62 100644 --- a/AcessNative/ld-acess_src/syscalls.c +++ b/AcessNative/ld-acess_src/syscalls.c @@ -1,19 +1,35 @@ /* */ -#include "../../Usermode/include/acess/sys.h" +#define DONT_INCLUDE_SYSCALL_NAMES 1 #include "common.h" #include #include #include #include #include +#include +#include +#ifndef __WIN32__ +# include // posix_spawn +#endif #include "request.h" -#include "../syscalls.h" + +#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 === +// === GLOBALS === +FILE *gaSyscall_LocalFPs[MAX_FPS]; + // === CODE === const char *ReadEntry(tRequestValue *Dest, void *DataDest, void **PtrDest, const char *ArgTypes, va_list *Args) { @@ -22,11 +38,13 @@ const char *ReadEntry(tRequestValue *Dest, void *DataDest, void **PtrDest, const int direction = 0; // 0: Invalid, 1: Out, 2: In, 3: Out char *str; int len; - + // Eat whitespace while(*ArgTypes && *ArgTypes == ' ') ArgTypes ++; if( *ArgTypes == '\0' ) return ArgTypes; +// DEBUG("ArgTypes = '%s'", ArgTypes); + // Get direction switch(*ArgTypes) { @@ -48,12 +66,11 @@ 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; } val32 = va_arg(*Args, uint32_t); - printf("val32 = 0x%x\n", val32); Dest->Type = ARG_TYPE_INT32; Dest->Length = sizeof(uint32_t); @@ -71,7 +88,6 @@ const char *ReadEntry(tRequestValue *Dest, void *DataDest, void **PtrDest, const } val64 = va_arg(*Args, uint64_t); - printf("val64 = 0x%llx\n", val64); Dest->Type = ARG_TYPE_INT64; Dest->Length = sizeof(uint64_t); @@ -88,7 +104,6 @@ const char *ReadEntry(tRequestValue *Dest, void *DataDest, void **PtrDest, const } str = va_arg(*Args, char*); - printf("str = %p '%s'\n", str, str); Dest->Type = ARG_TYPE_STRING; Dest->Length = strlen(str) + 1; @@ -101,17 +116,15 @@ const char *ReadEntry(tRequestValue *Dest, void *DataDest, void **PtrDest, const break; // Data (special handling) case 'd': - len = va_arg(*Args, int); + len = va_arg(*Args, size_t); str = va_arg(*Args, char*); - printf("len = %i, str = %p\n", len, str); - // Save the pointer for later if( PtrDest ) *PtrDest = str; // Create parameter block Dest->Type = ARG_TYPE_DATA; - Dest->Length = len; + Dest->Length = str ? len : 0; Dest->Flags = 0; if( direction & 2 ) Dest->Flags |= ARG_FLAG_RETURN; @@ -119,7 +132,7 @@ const char *ReadEntry(tRequestValue *Dest, void *DataDest, void **PtrDest, const // Has data? if( direction & 1 ) { - if( DataDest ) + if( DataDest && str ) memcpy(DataDest, str, len); } else @@ -151,7 +164,7 @@ 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; @@ -159,6 +172,11 @@ uint64_t _Syscall(int SyscallID, const char *ArgTypes, ...) uint64_t retValue; int i; + // DEBUG! +// printf("&tRequestHeader->Params = %i\n", offsetof(tRequestHeader, Params)); +// printf("&tRequestValue->Flags = %i\n", offsetof(tRequestValue, Flags)); +// printf("&tRequestValue->Length = %i\n", offsetof(tRequestValue, Length)); + // Get data size va_start(args, ArgTypes); str = ArgTypes; @@ -196,6 +214,7 @@ uint64_t _Syscall(int SyscallID, const char *ArgTypes, ...) req->ClientID = 0; //< Filled later req->CallID = SyscallID; req->NParams = paramCount; + req->MessageLength = dataLength; dataPtr = &req->Params[paramCount]; // Fill `output` and `input` @@ -218,138 +237,114 @@ uint64_t _Syscall(int SyscallID, const char *ArgTypes, ...) } va_end(args); - // Send syscall request - if( SendRequest(req, dataLength) < 0 ) { + // --- 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; - } - } + dataPtr = (void*)&req->Params[req->NParams]; + assert(req->NParams >= 2); + // 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 - va_start(args, ArgTypes); - for( i = 1; i < req->NParams; i ++ ) + 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 = 2; i < req->NParams; i ++ ) { - memcpy( retPtrs[i-1], dataPtr, req->Params[i].Length ); + #if 0 + int j; + printf("Return Data %i: (%i)", i, req->Params[i].Length); + for( j = 0; j < req->Params[i].Length; j ++ ) + 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; } - va_end(args); free( req ); + free( retPtrs ); - return 0; -} - -// --- VFS Calls -int open(const char *Path, int Flags) { - return _Syscall(SYS_OPEN, ">s >i", Path, Flags); -} - -void close(int FD) { - _Syscall(SYS_CLOSE, ">i", FD); -} - -int reopen(int FD, const char *Path, int Flags) { - return _Syscall(SYS_REOPEN, ">i >s >i", FD, Path, Flags); -} - -size_t read(int FD, size_t Bytes, void *Dest) { - return _Syscall(SYS_READ, "i >i i >i >d", FD, Bytes, Bytes, Src); -} - -int seek(int FD, int64_t Ofs, int Dir) { - return _Syscall(SYS_SEEK, ">i >I >i", FD, Ofs, Dir); + SYSTRACE(": %i 0x%llx", SyscallID, retValue); + + return retValue; } -uint64_t tell(int FD) { - return _Syscall(SYS_TELL, ">i", FD); -} -int ioctl(int fd, int id, void *data) { - // NOTE: 1024 byte size is a hack - return _Syscall(SYS_IOCTL, ">i >i ?d", fd, id, 1024, data); -} -int finfo(int fd, t_sysFInfo *info, int maxacls) { - return _Syscall(SYS_FINFO, ">i i", - fd, - sizeof(t_sysFInfo)+maxacls*sizeof(t_sysACL), info, - maxacls); +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; + // TODO: Handle directories + gaSyscall_LocalFPs[ret] = fopen(&Path[4], "r+"); + if(!gaSyscall_LocalFPs[ret]) return -1; + return ret; } -int readdir(int fd, char *dest) { - return _Syscall(SYS_READDIR, ">i i >s >i", fd, name, flags); +size_t native_read(int FD, void *Dest, size_t Bytes) +{ + return fread( Dest, Bytes, 1, gaSyscall_LocalFPs[FD] ); } -int _SysGetACL(int fd, t_sysACL *dest) { - return _Syscall(SYS_GETACL, "i s >s >s >s", Device, Directory, Type, Options); +int native_seek(int FD, int64_t Ofs, int Dir) +{ + if(Dir == 0) + return fseek( gaSyscall_LocalFPs[FD], Ofs, SEEK_CUR ); + else if(Dir > 0) + return fseek( gaSyscall_LocalFPs[FD], Ofs, SEEK_SET ); + else + return fseek( gaSyscall_LocalFPs[FD], Ofs, SEEK_END ); } - -// --- Error Handler -int _SysSetFaultHandler(int (*Handler)(int)) { - return 0; +uint64_t native_tell(int FD) +{ + return ftell( gaSyscall_LocalFPs[FD] ); } -// --- Memory Management --- -uint64_t _SysAllocate(uint vaddr) +int native_execve(const char *filename, const char *const argv[], const char *const envp[]) { - if( AllocateMemory(vaddr, 0x1000) == -1 ) // Allocate a page - return 0; - return vaddr; // Just ignore the need for paddrs :) + int ret; + ret = execve(filename, (void*)argv, (void*)envp); + perror("native_execve"); + return ret; } - -// === Symbol List === -#define DEFSYM(name) {#name, name} -const tSym caBuiltinSymbols[] = { - {"_exit", exit}, - - DEFSYM(open), - DEFSYM(close), - DEFSYM(reopen), - DEFSYM(read), - DEFSYM(write), - DEFSYM(seek), - DEFSYM(tell), - DEFSYM(ioctl), - DEFSYM(finfo), - DEFSYM(readdir), - DEFSYM(_SysOpenChild), - DEFSYM(_SysGetACL), - DEFSYM(_SysMount), +int native_spawn(const char *filename, const char *const argv[], const char *const envp[]) +{ + int rv; - DEFSYM(_SysAllocate), + #if __WIN32__ + rv = _spawnve(_P_NOWAIT, filename, argv, envp); + #else + rv = posix_spawn(NULL, filename, NULL, NULL, (void*)argv, (void*)envp); + #endif - {"_SysSetFaultHandler", _SysSetFaultHandler} -}; - -const int ciNumBuiltinSymbols = sizeof(caBuiltinSymbols)/sizeof(caBuiltinSymbols[0]); - + return rv; +}