RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-02 23:32:06 +00:00
Code Issues Activity Actions

Everywhere: Move shared library checks into a common function

Browse source 
While we're at it, unify the various different conditions that are
scattered accross the codebase.
This commit is contained in:
Tim Schumacher 2021-11-03 12:05:23 +01:00 • committed by Andreas Kling
parent 31c634be5a
commit 80cb44afae
7 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/DevTools/UserspaceEmulator/Emulator.cpp
View file

@ -15,6 +15,7 @@
#include <AK/LexicalPath.h>
#include <AK/MappedFile.h>
#include <AK/StringUtils.h>
#include <LibCore/File.h>
#include <LibELF/AuxiliaryVector.h>
#include <LibELF/Image.h>
#include <LibELF/Validation.h>
@ -395,7 +396,7 @@ MmapRegion const* Emulator::load_library_from_address(FlatPtr address)
return {};
String lib_path = lib_name;
if (lib_name.ends_with(".so"))
if (Core::File::looks_like_shared_library(lib_name))
lib_path = String::formatted("/usr/lib/{}", lib_path);
if (!m_dynamic_library_cache.contains(lib_path)) {
@ -432,7 +433,10 @@ Optional<Emulator::SymbolInfo> Emulator::symbol_at(FlatPtr address)
auto lib_name = address_region->lib_name();
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.ends_with(".so"sv) ? String::formatted("/usr/lib/{}", lib_name) : lib_name;
auto lib_path = lib_name;
if (Core::File::looks_like_shared_library(lib_name)) {
lib_path = String::formatted("/usr/lib/{}", lib_name);
}
auto it = m_dynamic_library_cache.find(lib_path);
auto const& elf = it->value.debug_info->elf();