RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-18 20:35:06 +00:00
Code Issues Activity Actions

UserspaceEmulator: Add the getpgid() and waitid() syscalls

Browse source 
With this, you can now kinda sorta run the shell in UserspaceEmulator!
This commit is contained in:
Andreas Kling 2020-08-07 16:51:08 +02:00
parent 93b1e54237
commit 5a5b687014
2 changed files with 35 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

33
DevTools/UserspaceEmulator/Emulator.cpp
View file

@ -253,12 +253,16 @@ u32 Emulator::virt_syscall(u32 function, u32 arg1, u32 arg2, u32 arg3)
switch (function) { switch (function) {
case SC_access: case SC_access:
return virt$access(arg1, arg2, arg3); return virt$access(arg1, arg2, arg3);
case SC_waitid:
return virt$waitid(arg1);
case SC_getcwd: case SC_getcwd:
return virt$getcwd(arg1, arg2); return virt$getcwd(arg1, arg2);
case SC_ttyname: case SC_ttyname:
return virt$ttyname(arg1, arg2, arg3); return virt$ttyname(arg1, arg2, arg3);
case SC_getpgrp: case SC_getpgrp:
return virt$getpgrp(); return virt$getpgrp();
case SC_getpgid:
return virt$getpgid(arg1);
case SC_setpgid: case SC_setpgid:
return virt$setpgid(arg1, arg2); return virt$setpgid(arg1, arg2);
case SC_execve: case SC_execve:
@ -1269,6 +1273,11 @@ int Emulator::virt$getpgrp()
return syscall(SC_getpgrp); return syscall(SC_getpgrp);
} }
int Emulator::virt$getpgid(pid_t pid)
{
return syscall(SC_getpgid, pid);
}
int Emulator::virt$setpgid(pid_t pid, pid_t pgid) int Emulator::virt$setpgid(pid_t pid, pid_t pgid)
{ {
return syscall(SC_setpgid, pid, pgid); return syscall(SC_setpgid, pid, pgid);
@ -1300,4 +1309,28 @@ int Emulator::virt$access(FlatPtr path, size_t path_length, int type)
return syscall(SC_access, host_path.data(), host_path.size(), type); return syscall(SC_access, host_path.data(), host_path.size(), type);
} }
int Emulator::virt$waitid(FlatPtr params_addr)
{
Syscall::SC_waitid_params params;
mmu().copy_from_vm(&params, params_addr, sizeof(params));
Syscall::SC_waitid_params host_params = params;
siginfo info;
host_params.infop = &info;
int rc = syscall(SC_waitid, &host_params);
if (rc < 0)
return rc;
if (info.si_addr) {
// FIXME: Translate this somehow.
TODO();
}
if (params.infop)
mmu().copy_to_vm(params.infop, &info, sizeof(info));
return rc;
}
} }

2
DevTools/UserspaceEmulator/Emulator.h
View file

@ -138,9 +138,11 @@ private:
ssize_t virt$getrandom(FlatPtr buffer, size_t buffer_size, unsigned int flags); ssize_t virt$getrandom(FlatPtr buffer, size_t buffer_size, unsigned int flags);
int virt$sleep(unsigned); int virt$sleep(unsigned);
int virt$getpgrp(); int virt$getpgrp();
int virt$getpgid(pid_t);
int virt$setpgid(pid_t pid, pid_t pgid); int virt$setpgid(pid_t pid, pid_t pgid);
int virt$ttyname(int fd, FlatPtr buffer, size_t buffer_size); int virt$ttyname(int fd, FlatPtr buffer, size_t buffer_size);
int virt$getcwd(FlatPtr buffer, size_t buffer_size); int virt$getcwd(FlatPtr buffer, size_t buffer_size);
int virt$waitid(FlatPtr);
FlatPtr allocate_vm(size_t size, size_t alignment); FlatPtr allocate_vm(size_t size, size_t alignment);