git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ATA Fixes, Module compilation fixups
[tpg/acess2.git]
/
Kernel
/
syscalls.c
diff --git
a/Kernel/syscalls.c
b/Kernel/syscalls.c
index
ba9051a
..
02b9008
100644
(file)
--- a/
Kernel/syscalls.c
+++ b/
Kernel/syscalls.c
@@
-26,10
+26,9
@@
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 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();
+extern int Threads_SetUID(Uint *errno, tUID ID);
+extern int Threads_SetGID(Uint *errno, tGID ID);
+extern int Threads_SetFaultHandler(Uint Handler);
// === PROTOTYPES ===
int Syscall_ValidString(Uint Addr);
// === PROTOTYPES ===
int Syscall_ValidString(Uint Addr);
@@
-40,7
+39,7
@@
extern int Threads_GetGID();
void SyscallHandler(tSyscallRegs *Regs)
{
Uint64 ret = 0;
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)
ENTER("iThread iNum", Threads_GetTID(), Regs->Num);
if(Regs->Num < NUM_SYSCALLS)
@@
-58,6
+57,11
@@
void SyscallHandler(tSyscallRegs *Regs)
// -- Yield current timeslice
case SYS_YIELD: Threads_Yield(); break;
// -- 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
// -- Clone the current thread
case SYS_CLONE:
// Call clone system call
@@
-104,8
+108,8
@@
void SyscallHandler(tSyscallRegs *Regs)
case SYS_GETGID: ret = Threads_GetGID(); break;
// -- Set User/Group IDs
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:
// -- Send Message
case SYS_SENDMSG:
@@
-116,13
+120,18
@@
void SyscallHandler(tSyscallRegs *Regs)
// -- Check for messages
case SYS_GETMSG:
CHECK_NUM_NULLOK(Regs->Arg1, sizeof(Uint));
// -- 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;
// *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);
// -- Set the thread's name
case SYS_SETNAME:
CHECK_STR_NONULL(Regs->Arg1);
@@
-132,9
+141,10
@@
void SyscallHandler(tSyscallRegs *Regs)
// ---
// Binary Control
// ---
// ---
// Binary Control
// ---
+ // -- Replace the current process with another
case SYS_EXECVE:
CHECK_STR_NONULL(Regs->Arg1);
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;
{
int i;
char **tmp = (char**)Regs->Arg2;
@@
-161,11
+171,12
@@
void SyscallHandler(tSyscallRegs *Regs)
// Path, **Argv, **Envp
ret = Proc_Execve((char*)Regs->Arg1, (char**)Regs->Arg2, (char**)Regs->Arg3);
break;
// Path, **Argv, **Envp
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;
case SYS_LOADBIN:
if( !Syscall_ValidString(Regs->Arg1)
|| !Syscall_Valid(sizeof(Uint), Regs->Arg2) ) {
err = -EINVAL;
- ret =
-1
;
+ ret =
0
;
break;
}
// Path, *Entrypoint
break;
}
// Path, *Entrypoint
@@
-189,7
+200,11
@@
void SyscallHandler(tSyscallRegs *Regs)
break;
case SYS_SEEK:
break;
case SYS_SEEK:
+ #if BITS == 64
ret = VFS_Seek( Regs->Arg1, Regs->Arg2, Regs->Arg3 );
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:
break;
case SYS_TELL:
@@
-232,6
+247,16
@@
void SyscallHandler(tSyscallRegs *Regs)
ret = VFS_ReadDir( Regs->Arg1, (void*)Regs->Arg2 );
break;
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) ) {
// Change Directory
case SYS_CHDIR:
if( !Syscall_ValidString(Regs->Arg1) ) {
UCC
git Repository :: git.ucc.asn.au