X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Facesskernel_src%2Fsyscalls.c;h=a46927769e462648c2b83e1475702e6c4a08a08c;hb=43c4f4db78b98e0427a04dc4b281359580591915;hp=ec874161b671d465665a30e34131dd712cf3c581;hpb=717454930aa0e255517c68c837927deac49bd78e;p=tpg%2Facess2.git diff --git a/AcessNative/acesskernel_src/syscalls.c b/AcessNative/acesskernel_src/syscalls.c index ec874161..a4692776 100644 --- a/AcessNative/acesskernel_src/syscalls.c +++ b/AcessNative/acesskernel_src/syscalls.c @@ -4,6 +4,7 @@ * * Syscall Distribution */ +#define DEBUG 1 #include #include #include "../syscalls.h" @@ -15,6 +16,29 @@ extern int Threads_Fork(void); // AcessNative only function typedef int (*tSyscallHandler)(Uint *Errno, const char *Format, void *Args, int *Sizes); // === MACROS === +#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;\ + 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);\ + _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;\ + 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);\ + LOG("SYSCALL5 '%s' %p %p %p %p %p", Fmt, (intptr_t)a0,(intptr_t)a1,(intptr_t)a2,(intptr_t)a3,(intptr_t)a4);\ + _call\ +} #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;\ @@ -22,6 +46,7 @@ typedef int (*tSyscallHandler)(Uint *Errno, const char *Format, void *Args, int a1 = *(_t1*)Args;Args+=sizeof(_t1);\ a2 = *(_t2*)Args;Args+=sizeof(_t2);\ a3 = *(_t3*)Args;Args+=sizeof(_t3);\ + LOG("SYSCALL4 '%s' %p %p %p %p", Fmt, (intptr_t)a0,(intptr_t)a1,(intptr_t)a2,(intptr_t)a3);\ _call\ } @@ -31,6 +56,7 @@ typedef int (*tSyscallHandler)(Uint *Errno, const char *Format, void *Args, int a0 = *(_t0*)Args;Args+=sizeof(_t0);\ a1 = *(_t1*)Args;Args+=sizeof(_t1);\ a2 = *(_t2*)Args;Args+=sizeof(_t2);\ + LOG("SYSCALL3 '%s' %p %p %p", Fmt, (intptr_t)a0,(intptr_t)a1,(intptr_t)a2);\ _call\ } @@ -39,6 +65,7 @@ typedef int (*tSyscallHandler)(Uint *Errno, const char *Format, void *Args, int if(strcmp(Fmt,_fmtstr)!=0)return 0;\ a0 = *(_t0*)Args;Args+=sizeof(_t0);\ a1 = *(_t1*)Args;Args+=sizeof(_t1);\ + LOG("SYSCALL2 '%s' %p %p", Fmt, (intptr_t)a0,(intptr_t)a1);\ _call;\ } @@ -46,11 +73,13 @@ typedef int (*tSyscallHandler)(Uint *Errno, const char *Format, void *Args, int _t0 a0;\ if(strcmp(Fmt,_fmtstr)!=0)return 0;\ 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;\ + LOG("SYSCALL0");\ _call;\ } @@ -94,8 +123,12 @@ SYSCALL3(Syscall_IOCtl, "iid", int, int, void *, return VFS_IOCtl(a0, a1, a2); ); SYSCALL3(Syscall_FInfo, "idi", int, void *, int, - if( Sizes[1] < sizeof(tFInfo)+a2*sizeof(tVFS_ACL)) + if( Sizes[1] < sizeof(tFInfo)+a2*sizeof(tVFS_ACL)) { + LOG("offsetof(size) = %i", offsetof(tFInfo, size)); + LOG("Bad size %i < %i", Sizes[1], sizeof(tFInfo)+a2*sizeof(tVFS_ACL)); + *Errno = -EINVAL; return -1; + } return VFS_FInfo(a0, a1, a2); ); SYSCALL2(Syscall_ReadDir, "id", int, char *, @@ -103,8 +136,11 @@ SYSCALL2(Syscall_ReadDir, "id", int, char *, return -1; return VFS_ReadDir(a0, a1); ); +SYSCALL6(Syscall_select, "iddddi", int, fd_set *, fd_set *, fd_set *, time_t *, unsigned int, + return VFS_Select(a0, a1, a2, a3, a4, a5, 0); +); SYSCALL3(Syscall_OpenChild, "isi", int, const char *, int, - return VFS_OpenChild(NULL, a0, a1, a2|VFS_OPENFLAG_USER); + return VFS_OpenChild(a0, a1, a2|VFS_OPENFLAG_USER); ); SYSCALL2(Syscall_GetACL, "id", int, void *, if(Sizes[1] < sizeof(tVFS_ACL)) @@ -131,18 +167,26 @@ SYSCALL1(Syscall_SetUID, "i", int, *Errno = -EINVAL; // TODO: Better message return -1; } - return Threads_SetUID(Errno, a0); + return Threads_SetUID(a0); ); SYSCALL1(Syscall_SetGID, "i", int, if(Sizes[0] < sizeof(int)) { *Errno = -EINVAL; // TODO: Better message return -1; } - return Threads_SetGID(Errno, a0); + return Threads_SetGID(a0); ); -SYSCALL0(Syscall_Fork, - return Threads_Fork(); +SYSCALL0(Syscall_GetTID, return Threads_GetTID()); +SYSCALL0(Syscall_GetPID, return Threads_GetPID()); +SYSCALL0(Syscall_GetUID, return Threads_GetUID()); +SYSCALL0(Syscall_GetGID, return Threads_GetGID()); + +SYSCALL1(Syscall_AN_Fork, "d", int *, + if(Sizes[0] < sizeof(int)) + return -1; + *a0 = Threads_Fork(); + return *a0; ); const tSyscallHandler caSyscalls[] = { @@ -167,8 +211,17 @@ const tSyscallHandler caSyscalls[] = { Syscall_SetUID, Syscall_SetGID, + Syscall_GetTID, + Syscall_GetPID, + Syscall_GetUID, + Syscall_GetGID, + Syscall_Sleep, - Syscall_Fork + Syscall_AN_Fork, + + NULL, + NULL, + Syscall_select }; const int ciNumSyscalls = sizeof(caSyscalls)/sizeof(caSyscalls[0]); /** @@ -229,7 +282,7 @@ tRequestHeader *SyscallRecieve(tRequestHeader *Request, int *ReturnLength) } formatString[i] = '\0'; - LOG("Request %i(%s) '%s'", Request->CallID, casSYSCALL_NAMES[Request->CallID], formatString); + //LOG("Request %i(%s) '%s'", Request->CallID, casSYSCALL_NAMES[Request->CallID], formatString); { char argListData[argListLen]; @@ -243,19 +296,19 @@ tRequestHeader *SyscallRecieve(tRequestHeader *Request, int *ReturnLength) case ARG_TYPE_VOID: break; case ARG_TYPE_INT32: - LOG("Syscalls", "%i INT32: 0x%x", i, *(Uint32*)inData); + //LOG("%i INT32: 0x%x", i, *(Uint32*)inData); *(Uint32*)&argListData[argListLen] = *(Uint32*)inData; argListLen += sizeof(Uint32); inData += sizeof(Uint32); break; case ARG_TYPE_INT64: - LOG("Syscalls", "%i INT64: 0x%llx", i, *(Uint64*)inData); + //LOG("%i INT64: 0x%llx", i, *(Uint64*)inData); *(Uint64*)&argListData[argListLen] = *(Uint64*)inData; argListLen += sizeof(Uint64); inData += sizeof(Uint64); break; case ARG_TYPE_STRING: - LOG("Syscalls", "%i STR: '%s'", i, (char*)inData); + //LOG("%i STR: '%s'", i, (char*)inData); *(char**)&argListData[argListLen] = (char*)inData; argListLen += sizeof(void*); inData += Request->Params[i].Length; @@ -276,16 +329,16 @@ tRequestHeader *SyscallRecieve(tRequestHeader *Request, int *ReturnLength) { // Allocate and zero the buffer returnData[i] = calloc(1, Request->Params[i].Length); - LOG("Syscalls", "%i ZDAT: %i %p", i, - Request->Params[i].Length, returnData[i]); + //LOG("%i ZDAT: %i %p", i, + // Request->Params[i].Length, returnData[i]); *(void**)&argListData[argListLen] = returnData[i]; argListLen += sizeof(void*); } else { returnData[i] = (void*)inData; - LOG("Syscalls", "%i DATA: %i %p", i, - Request->Params[i].Length, returnData[i]); + //LOG("%i DATA: %i %p", i, + // Request->Params[i].Length, returnData[i]); *(void**)&argListData[argListLen] = (void*)inData; argListLen += sizeof(void*); inData += Request->Params[i].Length;