diff --git a/Base/etc/posixshrc b/Base/etc/posixshrc index 732489a910..57d9c8c59e 100644 --- a/Base/etc/posixshrc +++ b/Base/etc/posixshrc @@ -19,7 +19,6 @@ alias sdb=Debugger alias sm=SystemMonitor alias pv=Profiler alias ws=WebServer -alias ue=UserspaceEmulator alias fe=FontEditor alias ss=Spreadsheet alias vp=VideoPlayer diff --git a/Base/etc/shellrc b/Base/etc/shellrc index b4efefe32b..bdd7b90307 100644 --- a/Base/etc/shellrc +++ b/Base/etc/shellrc @@ -19,7 +19,6 @@ alias sdb=Debugger alias sm=SystemMonitor alias pv=Profiler alias ws=WebServer -alias ue=UserspaceEmulator alias fe=FontEditor alias ss=Spreadsheet alias vp=VideoPlayer diff --git a/Base/root/generate_manpages.sh b/Base/root/generate_manpages.sh index 67a793afdb..2d7ffdae14 100755 --- a/Base/root/generate_manpages.sh +++ b/Base/root/generate_manpages.sh @@ -20,7 +20,6 @@ exit_for_error() rm -rf generated_manpages 2> "$ERROR_FILE" || exit_for_error -# FIXME: Add `UserspaceEmulator 1` back to this list after UE is functional on x86_64. for i in ( \ (config 1) \ (fortune 1) \ diff --git a/Base/usr/share/man/man1/UserspaceEmulator.md b/Base/usr/share/man/man1/UserspaceEmulator.md deleted file mode 100644 index 913a4b0d7b..0000000000 --- a/Base/usr/share/man/man1/UserspaceEmulator.md +++ /dev/null @@ -1,24 +0,0 @@ -## Name - -UserspaceEmulator - -## Synopsis - -```sh -$ UserspaceEmulator [--report-to-debug] [--pause] [--profile] [--profile-interval num_instructions] [--profile-file path] [--roi] -``` - -## Options - -* `--report-to-debug`: Write reports to the debug log -* `-p`, `--pause`: Pause on startup -* `--profile`: Generate a ProfileViewer-compatible profile -* `-i num_instructions`, `--profile-interval num_instructions`: Set the profile instruction capture interval, 128 by default -* `--profile-file path`: File path for profile dump -* `--roi`: Enable Region-of-Interest mode for profiling - -## Arguments - -* `command`: Command to emulate - - diff --git a/Base/usr/share/man/man1/crash.md b/Base/usr/share/man/man1/crash.md index 4c0f9c1328..59ea72a702 100644 --- a/Base/usr/share/man/man1/crash.md +++ b/Base/usr/share/man/man1/crash.md @@ -10,9 +10,8 @@ $ /usr/Tests/Kernel/crash [options] ## Description -This program is used to test how the Serenity kernel or UserspaceEmulator -handle userspace crashes, and can be used to simulate many different kinds -of crashes. +This program is used to test how the Serenity kernel handles userspace crashes, +and can be used to simulate many different kinds of crashes. ## Options diff --git a/Meta/serenity.sh b/Meta/serenity.sh index ff1fb13b9c..1577a905f2 100755 --- a/Meta/serenity.sh +++ b/Meta/serenity.sh @@ -48,8 +48,6 @@ Usage: $NAME COMMAND [TARGET] [TOOLCHAIN] [ARGS...] Examples: $NAME run x86_64 GNU smp=on Runs the image in QEMU passing "smp=on" to the kernel command line - $NAME run x86_64 GNU 'init=/bin/UserspaceEmulator init_args=/bin/SystemServer' - Runs the image in QEMU, and run the entire system through UserspaceEmulator (not fully supported yet) $NAME run Runs the image for the default TARGET x86_64 in QEMU $NAME run lagom js -A diff --git a/README.md b/README.md index 6e9e88236a..62fed557f4 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ You can watch videos of the system being developed on YouTube: * Good POSIX compatibility ([LibC](Userland/Libraries/LibC/), Shell, syscalls, signals, pseudoterminals, filesystem notifications, standard Unix [utilities](Userland/Utilities/), ...) * POSIX-like virtual file systems (/proc, /dev, /sys, /tmp, ...) and ext2 file system * Network stack and applications with support for IPv4, TCP, UDP; DNS, HTTP, Gemini, IMAP, NTP -* Profiling, debugging and other development tools (Kernel-supported profiling, detailed program analysis with software emulation in UserspaceEmulator, CrashReporter, interactive GUI playground, HexEditor, HackStudio IDE for C++ and more) +* Profiling, debugging and other development tools (Kernel-supported profiling, CrashReporter, interactive GUI playground, HexEditor, HackStudio IDE for C++ and more) * [Libraries](Userland/Libraries/) for everything from cryptography to OpenGL, audio, JavaScript, GUI, playing chess, ... * Support for many common and uncommon file formats (PNG, JPEG, GIF, MP3, WAV, FLAC, ZIP, TAR, PDF, QOI, Gemini, ...) * Unified style and design philosophy, flexible theming system, [custom (bitmap and vector) fonts](https://fonts.serenityos.net/font-family) diff --git a/Tests/UserspaceEmulator/test-run-ls.cpp b/Tests/UserspaceEmulator/test-run-ls.cpp deleted file mode 100644 index 2c1b3c27f9..0000000000 --- a/Tests/UserspaceEmulator/test-run-ls.cpp +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright (c) 2021, Leon Albrecht - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#include - -int main() { return system("UserspaceEmulator ls"); } diff --git a/Userland/Libraries/LibCoredump/Reader.cpp b/Userland/Libraries/LibCoredump/Reader.cpp index 293f48b355..b774936276 100644 --- a/Userland/Libraries/LibCoredump/Reader.cpp +++ b/Userland/Libraries/LibCoredump/Reader.cpp @@ -295,7 +295,7 @@ Reader::LibraryData const* Reader::library_containing(FlatPtr address) const ByteString Reader::resolve_object_path(StringView name) const { // TODO: There are other places where similar method is implemented or would be useful. - // (e.g. UserspaceEmulator, LibSymbolication, Profiler, and DynamicLinker itself) + // (e.g. LibSymbolication, Profiler, and DynamicLinker itself) // We should consider creating unified implementation in the future. if (name.starts_with('/') || !FileSystem::looks_like_shared_library(name)) {