summaryrefslogtreecommitdiff
path: root/Userland/DevTools/UserspaceEmulator
diff options
context:
space:
mode:
authorLiav A <liavalb@gmail.com>2022-12-15 20:38:19 +0200
committerAndrew Kaster <andrewdkaster@gmail.com>2022-12-16 01:02:00 -0700
commit6c0486277e9bc8238ae82ee857a70014c9397db9 (patch)
treed0a599c10308e18709c1fefc33f726de489f7dcc /Userland/DevTools/UserspaceEmulator
parent1b5a565e5587bcf58d8801601a2c519771c1e971 (diff)
downloadserenity-6c0486277e9bc8238ae82ee857a70014c9397db9.zip
Kernel: Reintroduce the msyscall syscall as the annotate_mapping syscall
This syscall will be used later on to ensure we can declare virtual memory mappings as immutable (which means that the underlying Region is basically immutable for both future annotations or changing the protection bits of it).
Diffstat (limited to 'Userland/DevTools/UserspaceEmulator')
-rw-r--r--Userland/DevTools/UserspaceEmulator/Emulator.h2
-rw-r--r--Userland/DevTools/UserspaceEmulator/Emulator_syscalls.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/Userland/DevTools/UserspaceEmulator/Emulator.h b/Userland/DevTools/UserspaceEmulator/Emulator.h
index 5139c8ad07..3ba4225ec2 100644
--- a/Userland/DevTools/UserspaceEmulator/Emulator.h
+++ b/Userland/DevTools/UserspaceEmulator/Emulator.h
@@ -204,7 +204,7 @@ private:
u32 virt$mount(u32);
u32 virt$mprotect(FlatPtr, size_t, int);
FlatPtr virt$mremap(FlatPtr);
- int virt$msyscall(FlatPtr);
+ int virt$annotate_mapping(FlatPtr);
u32 virt$munmap(FlatPtr address, size_t size);
u32 virt$open(u32);
FlatPtr virt$perf_event(int type, FlatPtr arg1, FlatPtr arg2);
diff --git a/Userland/DevTools/UserspaceEmulator/Emulator_syscalls.cpp b/Userland/DevTools/UserspaceEmulator/Emulator_syscalls.cpp
index 92454f0965..f4dbe20730 100644
--- a/Userland/DevTools/UserspaceEmulator/Emulator_syscalls.cpp
+++ b/Userland/DevTools/UserspaceEmulator/Emulator_syscalls.cpp
@@ -46,6 +46,8 @@ u32 Emulator::virt_syscall(u32 function, u32 arg1, u32 arg2, u32 arg3)
return virt$allocate_tls(arg1, arg2);
case SC_anon_create:
return virt$anon_create(arg1, arg2);
+ case SC_annotate_mapping:
+ return virt$annotate_mapping(arg1);
case SC_beep:
return virt$beep();
case SC_bind:
@@ -165,8 +167,6 @@ u32 Emulator::virt_syscall(u32 function, u32 arg1, u32 arg2, u32 arg3)
return virt$mprotect(arg1, arg2, arg3);
case SC_mremap:
return virt$mremap(arg1);
- case SC_msyscall:
- return virt$msyscall(arg1);
case SC_munmap:
return virt$munmap(arg1, arg2);
case SC_open:
@@ -1635,7 +1635,7 @@ u32 Emulator::virt$sysconf(u32 name)
return syscall(SC_sysconf, name);
}
-int Emulator::virt$msyscall(FlatPtr)
+int Emulator::virt$annotate_mapping(FlatPtr)
{
// FIXME: Implement this.
return 0;