RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 11:48:10 +00:00
Code Issues Activity Actions

LibELF: Move DynamicObject::lookup_symbol() to DynamicLoader

Browse source 
Also simplify it by removing an unreachable code path.
This commit is contained in:
Andreas Kling 2021-02-21 00:29:08 +01:00
parent a43910acc3
commit f23b29f605
4 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Userland/Libraries/LibELF/DynamicLoader.cpp
View file

@ -1,6 +1,7 @@
/*
* Copyright (c) 2019-2020, Andrew Kaster <andrewdkaster@gmail.com>
* Copyright (c) 2020, Itamar S. <itamar8910@gmail.com>
* Copyright (c) 2021, Andreas Kling <kling@serenityos.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -28,6 +29,7 @@
#include <AK/Debug.h>
#include <AK/Optional.h>
#include <AK/StringBuilder.h>
#include <LibELF/DynamicLinker.h>
#include <LibELF/DynamicLoader.h>
#include <LibELF/Validation.h>
#include <assert.h>
@ -570,9 +572,14 @@ void DynamicLoader::call_object_init_functions()
}
}
Optional<DynamicObject::SymbolLookupResult> DynamicLoader::lookup_symbol(const ELF::DynamicObject::Symbol& symbol) const
Optional<DynamicObject::SymbolLookupResult> DynamicLoader::lookup_symbol(const ELF::DynamicObject::Symbol& symbol)
{
return m_dynamic_object->lookup_symbol(symbol);
dbgln_if(DYNAMIC_LOAD_DEBUG, "looking up symbol: {}", symbol.name());
if (symbol.is_undefined() || symbol.bind() == STB_WEAK)
return DynamicLinker::lookup_global_symbol(symbol.name());
dbgln_if(DYNAMIC_LOAD_DEBUG, "symbol is defined in its object");
return DynamicObject::SymbolLookupResult { symbol.value(), symbol.address(), symbol.bind(), &symbol.object() };
}
} // end namespace ELF