mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 17:37:34 +00:00
Change syscall naming scheme.
This commit is contained in:
Andreas Kling
parent
46f0c28a4a
commit
3024167cbd
12 changed files with 156 additions and 148 deletions
|
|
@ -47,106 +47,106 @@ static DWORD handle(RegisterDump& regs, DWORD function, DWORD arg1, DWORD arg2,
|
|||
{
|
||||
ASSERT_INTERRUPTS_ENABLED();
|
||||
switch (function) {
|
||||
case Syscall::Yield:
|
||||
case Syscall::SC_yield:
|
||||
yield();
|
||||
break;
|
||||
case Syscall::PutCharacter:
|
||||
case Syscall::SC_putch:
|
||||
Console::the().putChar(arg1 & 0xff);
|
||||
break;
|
||||
case Syscall::Sleep:
|
||||
case Syscall::SC_sleep:
|
||||
return current->sys$sleep(arg1);
|
||||
case Syscall::PosixGettimeofday:
|
||||
case Syscall::SC_gettimeofday:
|
||||
return current->sys$gettimeofday((timeval*)arg1);
|
||||
case Syscall::Spawn:
|
||||
case Syscall::SC_spawn:
|
||||
return current->sys$spawn((const char*)arg1, (const char**)arg2, (const char**)arg3);
|
||||
case Syscall::GetDirEntries:
|
||||
case Syscall::SC_get_dir_entries:
|
||||
return current->sys$get_dir_entries((int)arg1, (void*)arg2, (size_t)arg3);
|
||||
case Syscall::PosixLstat:
|
||||
case Syscall::SC_lstat:
|
||||
return current->sys$lstat((const char*)arg1, (Unix::stat*)arg2);
|
||||
case Syscall::PosixStat:
|
||||
case Syscall::SC_stat:
|
||||
return current->sys$stat((const char*)arg1, (Unix::stat*)arg2);
|
||||
case Syscall::PosixGetcwd:
|
||||
case Syscall::SC_getcwd:
|
||||
return current->sys$getcwd((char*)arg1, (size_t)arg2);
|
||||
case Syscall::PosixOpen:
|
||||
case Syscall::SC_open:
|
||||
return current->sys$open((const char*)arg1, (int)arg2);
|
||||
case Syscall::PosixWrite:
|
||||
case Syscall::SC_write:
|
||||
return current->sys$write((int)arg1, (const void*)arg2, (size_t)arg3);
|
||||
case Syscall::PosixClose:
|
||||
case Syscall::SC_close:
|
||||
//kprintf("syscall: close(%d)\n", arg1);
|
||||
return current->sys$close((int)arg1);
|
||||
case Syscall::PosixRead:
|
||||
case Syscall::SC_read:
|
||||
//kprintf("syscall: read(%d, %p, %u)\n", arg1, arg2, arg3);
|
||||
return current->sys$read((int)arg1, (void*)arg2, (size_t)arg3);
|
||||
case Syscall::PosixLseek:
|
||||
case Syscall::SC_lseek:
|
||||
return current->sys$lseek((int)arg1, (off_t)arg2, (int)arg3);
|
||||
case Syscall::PosixKill:
|
||||
case Syscall::SC_kill:
|
||||
return current->sys$kill((pid_t)arg1, (int)arg2);
|
||||
case Syscall::PosixGetuid:
|
||||
case Syscall::SC_getuid:
|
||||
return current->sys$getuid();
|
||||
case Syscall::PosixGetgid:
|
||||
case Syscall::SC_getgid:
|
||||
return current->sys$getgid();
|
||||
case Syscall::PosixGetpid:
|
||||
case Syscall::SC_getpid:
|
||||
return current->sys$getpid();
|
||||
case Syscall::PosixWaitpid:
|
||||
case Syscall::SC_waitpid:
|
||||
return current->sys$waitpid((pid_t)arg1, (int*)arg2, (int)arg3);
|
||||
case Syscall::PosixMmap:
|
||||
case Syscall::SC_mmap:
|
||||
return (dword)current->sys$mmap((void*)arg1, (size_t)arg2);
|
||||
case Syscall::PosixMunmap:
|
||||
case Syscall::SC_munmap:
|
||||
return current->sys$munmap((void*)arg1, (size_t)arg2);
|
||||
case Syscall::PosixGethostname:
|
||||
case Syscall::SC_gethostname:
|
||||
return current->sys$gethostname((char*)arg1, (size_t)arg2);
|
||||
case Syscall::PosixExit:
|
||||
case Syscall::SC_exit:
|
||||
cli();
|
||||
current->sys$exit((int)arg1);
|
||||
ASSERT_NOT_REACHED();
|
||||
return 0;
|
||||
case Syscall::GetArguments:
|
||||
case Syscall::SC_get_arguments:
|
||||
return current->sys$get_arguments((int*)arg1, (char***)arg2);
|
||||
case Syscall::GetEnvironment:
|
||||
case Syscall::SC_get_environment:
|
||||
return current->sys$get_environment((char***)arg1);
|
||||
case Syscall::PosixChdir:
|
||||
case Syscall::SC_chdir:
|
||||
return current->sys$chdir((const char*)arg1);
|
||||
case Syscall::PosixUname:
|
||||
case Syscall::SC_uname:
|
||||
return current->sys$uname((utsname*)arg1);
|
||||
case Syscall::SetMmapName:
|
||||
case Syscall::SC_set_mmap_name:
|
||||
return current->sys$set_mmap_name((void*)arg1, (size_t)arg2, (const char*)arg3);
|
||||
case Syscall::PosixReadlink:
|
||||
case Syscall::SC_readlink:
|
||||
return current->sys$readlink((const char*)arg1, (char*)arg2, (size_t)arg3);
|
||||
case Syscall::PosixTtynameR:
|
||||
case Syscall::SC_ttyname_r:
|
||||
return current->sys$ttyname_r((int)arg1, (char*)arg2, (size_t)arg3);
|
||||
case Syscall::PosixSetsid:
|
||||
case Syscall::SC_setsid:
|
||||
return current->sys$setsid();
|
||||
case Syscall::PosixGetsid:
|
||||
case Syscall::SC_getsid:
|
||||
return current->sys$getsid((pid_t)arg1);
|
||||
case Syscall::PosixSetpgid:
|
||||
case Syscall::SC_setpgid:
|
||||
return current->sys$setpgid((pid_t)arg1, (pid_t)arg2);
|
||||
case Syscall::PosixGetpgid:
|
||||
case Syscall::SC_getpgid:
|
||||
return current->sys$getpgid((pid_t)arg1);
|
||||
case Syscall::PosixGetpgrp:
|
||||
case Syscall::SC_getpgrp:
|
||||
return current->sys$getpgrp();
|
||||
case Syscall::PosixTcgetpgrp:
|
||||
case Syscall::SC_tcgetpgrp:
|
||||
return current->sys$tcgetpgrp((int)arg1);
|
||||
case Syscall::PosixTcsetpgrp:
|
||||
case Syscall::SC_tcsetpgrp:
|
||||
return current->sys$tcsetpgrp((int)arg1, (pid_t)arg2);
|
||||
case Syscall::PosixFork:
|
||||
case Syscall::SC_fork:
|
||||
return current->sys$fork(regs);
|
||||
case Syscall::PosixExecve:
|
||||
case Syscall::SC_execve:
|
||||
return current->sys$execve((const char*)arg1, (const char**)arg2, (const char**)arg3);
|
||||
case Syscall::PosixGeteuid:
|
||||
case Syscall::SC_geteuid:
|
||||
return current->sys$geteuid();
|
||||
case Syscall::PosixGetegid:
|
||||
case Syscall::SC_getegid:
|
||||
return current->sys$getegid();
|
||||
case Syscall::PosixSignal:
|
||||
case Syscall::SC_signal:
|
||||
return (dword)current->sys$signal((int)arg1, (Unix::sighandler_t)arg2);
|
||||
case Syscall::PosixIsatty:
|
||||
case Syscall::SC_isatty:
|
||||
return current->sys$isatty((int)arg1);
|
||||
case Syscall::Getdtablesize:
|
||||
case Syscall::SC_getdtablesize:
|
||||
return current->sys$getdtablesize();
|
||||
case Syscall::Dup:
|
||||
case Syscall::SC_dup:
|
||||
return current->sys$dup((int)arg1);
|
||||
case Syscall::Dup2:
|
||||
case Syscall::SC_dup2:
|
||||
return current->sys$dup2((int)arg1, (int)arg2);
|
||||
case Syscall::Sigaction:
|
||||
case Syscall::SC_sigaction:
|
||||
return current->sys$sigaction((int)arg1, (const Unix::sigaction*)arg2, (Unix::sigaction*)arg3);
|
||||
default:
|
||||
kprintf("<%u> int0x80: Unknown function %x requested {%x, %x, %x}\n", current->pid(), function, arg1, arg2, arg3);
|
||||
|
|
|
|||
111
Kernel/Syscall.h
111
Kernel/Syscall.h
|
|
@ -2,6 +2,56 @@
|
|||
|
||||
#include <AK/Types.h>
|
||||
|
||||
#define ENUMERATE_SYSCALLS \
|
||||
__ENUMERATE_SYSCALL(spawn) \
|
||||
__ENUMERATE_SYSCALL(sleep) \
|
||||
__ENUMERATE_SYSCALL(yield) \
|
||||
__ENUMERATE_SYSCALL(putch) \
|
||||
__ENUMERATE_SYSCALL(open) \
|
||||
__ENUMERATE_SYSCALL(close) \
|
||||
__ENUMERATE_SYSCALL(read) \
|
||||
__ENUMERATE_SYSCALL(lseek) \
|
||||
__ENUMERATE_SYSCALL(kill) \
|
||||
__ENUMERATE_SYSCALL(getuid) \
|
||||
__ENUMERATE_SYSCALL(exit) \
|
||||
__ENUMERATE_SYSCALL(getgid) \
|
||||
__ENUMERATE_SYSCALL(getpid) \
|
||||
__ENUMERATE_SYSCALL(waitpid) \
|
||||
__ENUMERATE_SYSCALL(mmap) \
|
||||
__ENUMERATE_SYSCALL(munmap) \
|
||||
__ENUMERATE_SYSCALL(get_dir_entries) \
|
||||
__ENUMERATE_SYSCALL(lstat) \
|
||||
__ENUMERATE_SYSCALL(getcwd) \
|
||||
__ENUMERATE_SYSCALL(gettimeofday) \
|
||||
__ENUMERATE_SYSCALL(gethostname) \
|
||||
__ENUMERATE_SYSCALL(get_arguments) \
|
||||
__ENUMERATE_SYSCALL(chdir) \
|
||||
__ENUMERATE_SYSCALL(uname) \
|
||||
__ENUMERATE_SYSCALL(set_mmap_name) \
|
||||
__ENUMERATE_SYSCALL(readlink) \
|
||||
__ENUMERATE_SYSCALL(write) \
|
||||
__ENUMERATE_SYSCALL(ttyname_r) \
|
||||
__ENUMERATE_SYSCALL(stat) \
|
||||
__ENUMERATE_SYSCALL(get_environment) \
|
||||
__ENUMERATE_SYSCALL(getsid) \
|
||||
__ENUMERATE_SYSCALL(setsid) \
|
||||
__ENUMERATE_SYSCALL(getpgid) \
|
||||
__ENUMERATE_SYSCALL(setpgid) \
|
||||
__ENUMERATE_SYSCALL(getpgrp) \
|
||||
__ENUMERATE_SYSCALL(tcsetpgrp) \
|
||||
__ENUMERATE_SYSCALL(tcgetpgrp) \
|
||||
__ENUMERATE_SYSCALL(fork) \
|
||||
__ENUMERATE_SYSCALL(execve) \
|
||||
__ENUMERATE_SYSCALL(geteuid) \
|
||||
__ENUMERATE_SYSCALL(getegid) \
|
||||
__ENUMERATE_SYSCALL(signal) \
|
||||
__ENUMERATE_SYSCALL(isatty) \
|
||||
__ENUMERATE_SYSCALL(getdtablesize) \
|
||||
__ENUMERATE_SYSCALL(dup) \
|
||||
__ENUMERATE_SYSCALL(dup2) \
|
||||
__ENUMERATE_SYSCALL(sigaction) \
|
||||
|
||||
|
||||
#define DO_SYSCALL_A0(function) Syscall::invoke((dword)(function))
|
||||
#define DO_SYSCALL_A1(function, arg1) Syscall::invoke((dword)(function), (dword)(arg1))
|
||||
#define DO_SYSCALL_A2(function, arg1, arg2) Syscall::invoke((dword)(function), (dword)(arg1), (dword)(arg2))
|
||||
|
|
@ -10,55 +60,22 @@
|
|||
namespace Syscall {
|
||||
|
||||
enum Function {
|
||||
Spawn = 0x1981,
|
||||
Sleep = 0x1982,
|
||||
Yield = 0x1983,
|
||||
PutCharacter = 0x1984,
|
||||
PosixOpen = 0x1985,
|
||||
PosixClose = 0x1986,
|
||||
PosixRead = 0x1987,
|
||||
PosixLseek = 0x1988,
|
||||
PosixKill = 0x1989,
|
||||
PosixGetuid = 0x1990,
|
||||
PosixExit = 0x1991,
|
||||
PosixGetgid = 0x1992,
|
||||
PosixGetpid = 0x1993,
|
||||
PosixWaitpid = 0x1994,
|
||||
PosixMmap = 0x1995,
|
||||
PosixMunmap = 0x1996,
|
||||
GetDirEntries = 0x1997,
|
||||
PosixLstat = 0x1998,
|
||||
PosixGetcwd = 0x1999,
|
||||
PosixGettimeofday = 0x2000,
|
||||
PosixGethostname = 0x2001,
|
||||
GetArguments = 0x2002,
|
||||
PosixChdir = 0x2003,
|
||||
PosixUname = 0x2004,
|
||||
SetMmapName = 0x2005,
|
||||
PosixReadlink = 0x2006,
|
||||
PosixWrite = 0x2007,
|
||||
PosixTtynameR = 0x2008,
|
||||
PosixStat = 0x2009,
|
||||
GetEnvironment = 0x2010,
|
||||
PosixGetsid = 0x2011,
|
||||
PosixSetsid = 0x2012,
|
||||
PosixGetpgid = 0x2013,
|
||||
PosixSetpgid = 0x2014,
|
||||
PosixGetpgrp = 0x2015,
|
||||
PosixTcsetpgrp = 0x2016,
|
||||
PosixTcgetpgrp = 0x2017,
|
||||
PosixFork = 0x2018,
|
||||
PosixExecve = 0x2019,
|
||||
PosixGeteuid = 0x2020,
|
||||
PosixGetegid = 0x2021,
|
||||
PosixSignal = 0x2022,
|
||||
PosixIsatty = 0x2023,
|
||||
Getdtablesize = 0x2024,
|
||||
Dup = 0x2025,
|
||||
Dup2 = 0x2026,
|
||||
Sigaction = 0x2027,
|
||||
#undef __ENUMERATE_SYSCALL
|
||||
#define __ENUMERATE_SYSCALL(x) SC_ ##x ,
|
||||
ENUMERATE_SYSCALLS
|
||||
#undef __ENUMERATE_SYSCALL
|
||||
};
|
||||
|
||||
inline constexpr const char* toString(Function function)
|
||||
{
|
||||
switch (function) {
|
||||
#undef __ENUMERATE_SYSCALL
|
||||
#define __ENUMERATE_SYSCALL(x) case SC_ ##x: return #x;
|
||||
ENUMERATE_SYSCALLS
|
||||
#undef __ENUMERATE_SYSCALL
|
||||
}
|
||||
}
|
||||
|
||||
void initialize();
|
||||
|
||||
inline dword invoke(dword function)
|
||||
|
|
|
|||
|
|
@ -252,15 +252,6 @@ static void init_stage2()
|
|||
Process::createKernelProcess(spawn_stress, "spawn_stress");
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
// It would be nice to exit this process, but right now it instantiates all kinds of things.
|
||||
// At the very least it needs to be made sure those things stick around as appropriate.
|
||||
DO_SYSCALL_A1(Syscall::PosixExit, 413);
|
||||
|
||||
kprintf("uh, we're still going after calling sys$exit...\n");
|
||||
HANG;
|
||||
#endif
|
||||
|
||||
for (;;) {
|
||||
//sleep(3600 * TICKS_PER_SECOND);
|
||||
asm("hlt");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue