commit
5ed4891a1f
|
@ -1 +1 @@
|
|||
Subproject commit 70b0d33106e98176bf44de5d301855d49587fa50
|
||||
Subproject commit c8a066019b686351afc614a44a2111111c42d697
|
|
@ -559,8 +559,7 @@ void Linker::Resolve(const std::string& name, Loader::SymbolType sym_type, Modul
|
|||
Loader::SymbolRecord* return_info) {
|
||||
// std::scoped_lock lock{m_mutex};
|
||||
const auto ids = Common::SplitString(name, '#');
|
||||
ASSERT_MSG(ids.size() == 3, "Symbols must be 3 parts name, library, module");
|
||||
|
||||
if (ids.size() == 3) {
|
||||
const auto* library = FindLibrary(*m, ids.at(1));
|
||||
const auto* module = FindModule(*m, ids.at(2));
|
||||
ASSERT_MSG(library && module, "Unable to find library and module");
|
||||
|
@ -598,6 +597,11 @@ void Linker::Resolve(const std::string& name, Loader::SymbolType sym_type, Modul
|
|||
LOG_ERROR(Core_Linker, "Linker: Stub resolved {} as {} (lib: {}, mod: {})", sr.name,
|
||||
return_info->name, library->name, module->name);
|
||||
}
|
||||
} else {
|
||||
return_info->virtual_address = 0;
|
||||
return_info->name = name;
|
||||
LOG_ERROR(Core_Linker, "Not Resolved {}", name);
|
||||
}
|
||||
}
|
||||
|
||||
u64 Linker::GetProcParam() {
|
||||
|
|
Loading…
Reference in New Issue