#include <syscalls.h>
#include <proc.h>
#include <errno.h>
+#include <threads.h>
#define CHECK_NUM_NULLOK(v,size) \
if((v)&&!Syscall_Valid((size),(Uint)(v))){ret=-1;err=-EINVAL;break;}
if(!(v)||!Syscall_ValidString((Uint)(v))){ret=-1;err=-EINVAL;break;}
// === IMPORTS ===
-extern int Proc_Clone(Uint *Err, Uint Flags);
-extern int Threads_WaitTID(int TID, int *status);
-extern Uint Proc_SendMessage(Uint *Err, Uint Dest, Uint Length, void *Data);
-extern int Proc_GetMessage(Uint *Err, Uint *Source, void *Buffer);
extern int Proc_Execve(char *File, char **ArgV, char **EnvP);
extern Uint Binary_Load(char *file, Uint *entryPoint);
-extern int Threads_SetName(char *NewName);
-extern int Threads_GetPID();
-extern int Threads_GetTID();
-extern int Threads_GetUID();
-extern int Threads_GetGID();
// === PROTOTYPES ===
+void SyscallHandler(tSyscallRegs *Regs);
int Syscall_ValidString(Uint Addr);
int Syscall_Valid(int Size, Uint Addr);
void SyscallHandler(tSyscallRegs *Regs)
{
Uint64 ret = 0;
- Uint err = 0;
+ Uint err = -EOK;
+ int callNum = Regs->Num;
- ENTER("iThread iNum", Threads_GetTID(), Regs->Num);
- if(Regs->Num < NUM_SYSCALLS)
- LOG("Syscall %s", cSYSCALL_NAMES[Regs->Num]);
+ #if DEBUG < 2
+ if(callNum != SYS_READ && callNum != SYS_WRITE) {
+ #endif
+ ENTER("iThread iNum", Threads_GetTID(), callNum);
+ if(callNum < NUM_SYSCALLS)
+ LOG("Syscall %s", cSYSCALL_NAMES[callNum]);
LOG("Arg1: 0x%x, Arg2: 0x%x, Arg3: 0x%x, Arg4: 0x%x", Regs->Arg1, Regs->Arg2, Regs->Arg3, Regs->Arg4);
+ #if DEBUG < 2
+ }
+ #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;
+ // -- Get the current timestamp
+ case SYS_GETTIME:
+ ret = now();
+ break;
+
// -- Set the thread's name
case SYS_SETNAME:
CHECK_STR_NONULL(Regs->Arg1);
// ---
// Binary Control
// ---
+ // -- Replace the current process with another
case SYS_EXECVE:
CHECK_STR_NONULL(Regs->Arg1);
- //Log(" Regs = {Arg2: %x, Arg3: %x}", Regs->Arg2, Regs->Arg3);
+ // Check the argument arrays
{
int i;
char **tmp = (char**)Regs->Arg2;
}
LEAVE('s', "Assuming 0");
// Path, **Argv, **Envp
- ret = Proc_Execve((char*)Regs->Arg1, (char**)Regs->Arg2, (char**)Regs->Arg3);
+ ret = Proc_Execve( (char*)Regs->Arg1, (char**)Regs->Arg2, (char**)Regs->Arg3 );
break;
+ // -- Load a binary into the current process
case SYS_LOADBIN:
if( !Syscall_ValidString(Regs->Arg1)
|| !Syscall_Valid(sizeof(Uint), Regs->Arg2) ) {
err = -EINVAL;
- ret = -1;
+ ret = 0;
break;
}
// Path, *Entrypoint
ret = -1;
break;
}
+ LOG("VFS_Open(\"%s\", 0x%x)", (char*)Regs->Arg1, Regs->Arg2 | VFS_OPENFLAG_USER);
ret = VFS_Open((char*)Regs->Arg1, Regs->Arg2 | VFS_OPENFLAG_USER);
break;
case SYS_CLOSE:
+ LOG("VFS_Close(%i)", Regs->Arg1);
VFS_Close( Regs->Arg1 );
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)<<32), Regs->Arg4 );
+ #endif
break;
case SYS_TELL:
// Read Directory
case SYS_READDIR:
+ // TODO: What if the filename is longer?
+ // Maybe force it to be a 256 byte buffer
if( !Syscall_Valid(8, Regs->Arg2) ) {
err = -EINVAL;
ret = -1;
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) ) {
(char*)Regs->Arg4 // Options
);
break;
+
+ // Wait on a set of handles
+ case SYS_SELECT:
+ // Sanity checks
+ if( (Regs->Arg2 && !Syscall_Valid(sizeof(fd_set), Regs->Arg2))
+ || (Regs->Arg3 && !Syscall_Valid(sizeof(fd_set), Regs->Arg3))
+ || (Regs->Arg4 && !Syscall_Valid(sizeof(fd_set), Regs->Arg4))
+ || (Regs->Arg5 && !Syscall_Valid(sizeof(tTime), Regs->Arg5)) )
+ {
+ err = -EINVAL;
+ ret = -1;
+ break;
+ }
+ // Perform the call
+ ret = VFS_Select(
+ Regs->Arg1, // Max handle
+ (fd_set *)Regs->Arg2, // Read
+ (fd_set *)Regs->Arg3, // Write
+ (fd_set *)Regs->Arg4, // Errors
+ (tTime *)Regs->Arg5, // Timeout
+ 0 // User handles
+ );
+ break;
// -- Debug
//#if DEBUG_BUILD
case SYS_DEBUG:
- Log((char*)Regs->Arg1,
+ LogF("Log: [%i] ", Threads_GetTID());
+ LogF((char*)Regs->Arg1,
Regs->Arg2, Regs->Arg3, Regs->Arg4, Regs->Arg5, Regs->Arg6);
+ LogF("\n");
break;
//#endif
#endif
Regs->Error = err;
#if DEBUG
+ # if DEBUG < 2
+ if( callNum != SYS_READ && callNum != SYS_WRITE ) {
+ # endif
LOG("err = %i", err);
if(Regs->Num != SYS_EXECVE)
LEAVE('x', ret);
else
LOG("Actual %i", ret);
+ # if DEBUG < 2
+ }
+ # endif
#endif
}
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au