*/
#define DEBUG 0
-#include <common.h>
+#include <acess.h>
#include <syscalls.h>
#include <proc.h>
#include <errno.h>
extern int Threads_SetName(char *NewName);
extern int Threads_GetPID();
extern int Threads_GetTID();
-extern int Threads_GetUID();
-extern int Threads_GetGID();
+extern tUID Threads_GetUID();
+extern int Threads_SetUID(Uint *errno, tUID ID);
+extern tGID Threads_GetGID();
+extern int Threads_SetGID(Uint *errno, tGID ID);
+extern int Threads_SetFaultHandler(Uint Handler);
// === PROTOTYPES ===
int Syscall_ValidString(Uint Addr);
void SyscallHandler(tSyscallRegs *Regs)
{
Uint64 ret = 0;
- Uint err = 0;
+ Uint err = -EOK;
ENTER("iThread iNum", Threads_GetTID(), Regs->Num);
if(Regs->Num < NUM_SYSCALLS)
LOG("Syscall %s", cSYSCALL_NAMES[Regs->Num]);
LOG("Arg1: 0x%x, Arg2: 0x%x, Arg3: 0x%x, Arg4: 0x%x", Regs->Arg1, Regs->Arg2, Regs->Arg3, Regs->Arg4);
- //#endif
switch(Regs->Num)
{
// -- Yield current timeslice
case SYS_YIELD: Threads_Yield(); break;
+ // -- Set Error Handler
+ case SYS_SETFAULTHANDLER:
+ Threads_SetFaultHandler(Regs->Arg1);
+ break;
+
// -- Clone the current thread
case SYS_CLONE:
// Call clone system call
case SYS_GETGID: ret = Threads_GetGID(); break;
// -- Set User/Group IDs
- case SYS_SETUID: Log("Setting User ID to %i", Regs->Arg1); break;
- case SYS_SETGID: Log("Setting Group ID to %i", Regs->Arg1); break;
+ case SYS_SETUID: ret = Threads_SetUID(&err, Regs->Arg1); break;
+ case SYS_SETGID: ret = Threads_SetGID(&err, Regs->Arg1); break;
// -- Send Message
case SYS_SENDMSG:
// -- Check for messages
case SYS_GETMSG:
CHECK_NUM_NULLOK(Regs->Arg1, sizeof(Uint));
- //NOTE: Uncertain due to length being unknown
- // (Proc_GetMessage should check itself)
- CHECK_NUM_NULLOK(Regs->Arg2, sizeof(Uint)*4);
+ if( Regs->Arg2 && Regs->Arg2 != -1 && !MM_IsUser(Regs->Arg2) )
+ {
+ err = -EINVAL; ret = -1; break;
+ }
// *Source, *Data
ret = Proc_GetMessage(&err, (Uint*)Regs->Arg1, (void*)Regs->Arg2);
break;
}
}
}
+ LEAVE('s', "Assuming 0");
// Path, **Argv, **Envp
ret = Proc_Execve((char*)Regs->Arg1, (char**)Regs->Arg2, (char**)Regs->Arg3);
break;
if( !Syscall_ValidString(Regs->Arg1)
|| !Syscall_Valid(sizeof(Uint), Regs->Arg2) ) {
err = -EINVAL;
- ret = -1;
+ ret = 0;
break;
}
// Path, *Entrypoint
break;
case SYS_SEEK:
+ #if BITS == 64
ret = VFS_Seek( Regs->Arg1, Regs->Arg2, Regs->Arg3 );
+ #else
+ ret = VFS_Seek( Regs->Arg1, Regs->Arg2|((Uint64)Regs->Arg3<<64), Regs->Arg4 );
+ #endif
break;
case SYS_TELL:
ret = VFS_ReadDir( Regs->Arg1, (void*)Regs->Arg2 );
break;
+ // Open a file that is a entry in an open directory
+ case SYS_OPENCHILD:
+ if( !Syscall_ValidString(Regs->Arg2) ) {
+ err = -EINVAL;
+ ret = -1;
+ break;
+ }
+ ret = VFS_OpenChild( &err, Regs->Arg1, (char*)Regs->Arg2, Regs->Arg3);
+ break;
+
// Change Directory
case SYS_CHDIR:
if( !Syscall_ValidString(Regs->Arg1) ) {
Regs->Error = err;
#if DEBUG
LOG("err = %i", err);
- LEAVE('x', ret);
+ if(Regs->Num != SYS_EXECVE)
+ LEAVE('x', ret);
+ else
+ LOG("Actual %i", ret);
#endif
}