diff options
| author | Cameron Youell <cameronyouell@gmail.com> | 2023-03-22 02:35:30 +1100 |
|---|---|---|
| committer | Linus Groh <mail@linusgroh.de> | 2023-03-21 19:03:21 +0000 |
| commit | 1d24f394c61d8e2af216c95303014d0554165f72 (patch) | |
| tree | e577780754109c9b38a81cfc815d35f19c68eb9d /Userland/DevTools/UserspaceEmulator | |
| parent | edab0cbf41d80e805fe93ee0c4cc5021a1e599c1 (diff) | |
| download | serenity-1d24f394c61d8e2af216c95303014d0554165f72.zip | |
Everywhere: Use `LibFileSystem` where trivial
Diffstat (limited to 'Userland/DevTools/UserspaceEmulator')
| -rw-r--r-- | Userland/DevTools/UserspaceEmulator/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Userland/DevTools/UserspaceEmulator/Emulator.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Userland/DevTools/UserspaceEmulator/CMakeLists.txt b/Userland/DevTools/UserspaceEmulator/CMakeLists.txt index 73b4daa3bd..7135ba09af 100644 --- a/Userland/DevTools/UserspaceEmulator/CMakeLists.txt +++ b/Userland/DevTools/UserspaceEmulator/CMakeLists.txt @@ -23,4 +23,4 @@ set(SOURCES add_compile_options(-mmmx -Wno-psabi -frounding-math) serenity_bin(UserspaceEmulator) -target_link_libraries(UserspaceEmulator PRIVATE LibX86 LibDebug LibCore LibLine LibSystem) +target_link_libraries(UserspaceEmulator PRIVATE LibX86 LibDebug LibCore LibFileSystem LibLine LibSystem) diff --git a/Userland/DevTools/UserspaceEmulator/Emulator.cpp b/Userland/DevTools/UserspaceEmulator/Emulator.cpp index a0207c4acf..b73082053e 100644 --- a/Userland/DevTools/UserspaceEmulator/Emulator.cpp +++ b/Userland/DevTools/UserspaceEmulator/Emulator.cpp @@ -17,6 +17,7 @@ #include <LibELF/AuxiliaryVector.h> #include <LibELF/Image.h> #include <LibELF/Validation.h> +#include <LibFileSystem/FileSystem.h> #include <LibX86/ELFSymbolProvider.h> #include <fcntl.h> #include <syscall.h> @@ -423,7 +424,7 @@ MmapRegion const* Emulator::load_library_from_address(FlatPtr address) return {}; DeprecatedString lib_path = lib_name; - if (Core::DeprecatedFile::looks_like_shared_library(lib_name)) + if (FileSystem::looks_like_shared_library(lib_name)) lib_path = DeprecatedString::formatted("/usr/lib/{}", lib_path); if (!m_dynamic_library_cache.contains(lib_path)) { @@ -461,7 +462,7 @@ Optional<Emulator::SymbolInfo> Emulator::symbol_at(FlatPtr address) auto const* first_region = (lib_name.is_null() || lib_name.is_empty()) ? address_region : first_region_for_object(lib_name); VERIFY(first_region); auto lib_path = lib_name; - if (Core::DeprecatedFile::looks_like_shared_library(lib_name)) { + if (FileSystem::looks_like_shared_library(lib_name)) { lib_path = DeprecatedString::formatted("/usr/lib/{}", lib_name); } |