1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-28 02:45:07 +00:00

UserspaceEmulator: Support sys$mremap()

This makes UE able to run dynamically linked executables once again.
This commit is contained in:
Andreas Kling 2020-12-31 14:22:56 +01:00
parent fbf8751485
commit e27d281bf1
2 changed files with 21 additions and 0 deletions

View file

@ -410,6 +410,8 @@ u32 Emulator::virt_syscall(u32 function, u32 arg1, u32 arg2, u32 arg3)
return virt$mount(arg1); return virt$mount(arg1);
case SC_munmap: case SC_munmap:
return virt$munmap(arg1, arg2); return virt$munmap(arg1, arg2);
case SC_mremap:
return virt$mremap(arg1);
case SC_gettid: case SC_gettid:
return virt$gettid(); return virt$gettid();
case SC_getpid: case SC_getpid:
@ -1037,6 +1039,24 @@ u32 Emulator::virt$mmap(u32 params_addr)
return final_address; return final_address;
} }
FlatPtr Emulator::virt$mremap(FlatPtr params_addr)
{
Syscall::SC_mremap_params params;
mmu().copy_from_vm(&params, params_addr, sizeof(params));
if (auto* region = mmu().find_region({ m_cpu.ds(), params.old_address })) {
if (!region->is_mmap())
return -EINVAL;
ASSERT(region->size() == params.old_size);
auto& mmap_region = *(MmapRegion*)region;
auto* ptr = mremap(mmap_region.data(), mmap_region.size(), mmap_region.size(), params.flags);
if (ptr == MAP_FAILED)
return -errno;
return (FlatPtr)ptr;
}
return -EINVAL;
}
u32 Emulator::virt$mount(u32 params_addr) u32 Emulator::virt$mount(u32 params_addr)
{ {
Syscall::SC_mount_params params; Syscall::SC_mount_params params;

View file

@ -103,6 +103,7 @@ private:
int virt$disown(pid_t); int virt$disown(pid_t);
int virt$purge(int mode); int virt$purge(int mode);
u32 virt$mmap(u32); u32 virt$mmap(u32);
FlatPtr virt$mremap(FlatPtr);
u32 virt$mount(u32); u32 virt$mount(u32);
u32 virt$munmap(FlatPtr address, u32 size); u32 virt$munmap(FlatPtr address, u32 size);
u32 virt$gettid(); u32 virt$gettid();