catto
/
shadPS4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improved LoadSymbols for export support

This commit is contained in:
georgemoralis 2024-03-26 14:05:18 +02:00
parent f70fbcac19
commit 7dbe258edc
1 changed files with 54 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
src/core/linker.cpp
View File

@ -379,101 +379,67 @@ const LibraryInfo* Linker::FindLibrary(const Module& m, const std::string& id) {
} }
void Linker::LoadSymbols(Module* m) { void Linker::LoadSymbols(Module* m) {
if (m->dynamic_info.symbol_table == nullptr || m->dynamic_info.str_table == nullptr ||
m->dynamic_info.symbol_table_total_size == 0) {
LOG_INFO(Core_Linker, "Symbol table not found!");
return;
}
for (auto* sym = m->dynamic_info.symbol_table; const auto symbol_database = [this](Module* m, Loader::SymbolsResolver* symbol,
reinterpret_cast<uint8_t*>(sym) < bool export_func) {
reinterpret_cast<uint8_t*>(m->dynamic_info.symbol_table) + if (m->dynamic_info.symbol_table == nullptr || m->dynamic_info.str_table == nullptr ||
m->dynamic_info.symbol_table_total_size; m->dynamic_info.symbol_table_total_size == 0) {
sym++) { LOG_INFO(Core_Linker, "Symbol table not found!");
std::string id = std::string(m->dynamic_info.str_table + sym->st_name); return;
const auto ids = Common::SplitString(id, '#'); }
if (ids.size() == 3) // symbols are 3 parts name , library , module for (auto* sym = m->dynamic_info.symbol_table;
{ reinterpret_cast<u8*>(sym) < reinterpret_cast<u8*>(m->dynamic_info.symbol_table) +
const auto* library = FindLibrary(*m, ids.at(1)); m->dynamic_info.symbol_table_total_size;
const auto* module = FindModule(*m, ids.at(2)); sym++) {
std::string id = std::string(m->dynamic_info.str_table + sym->st_name);
auto bind = sym->GetBind(); auto bind = sym->GetBind();
auto type = sym->GetType(); auto type = sym->GetType();
auto visibility = sym->GetVisibility(); auto visibility = sym->GetVisibility();
if (library != nullptr || module != nullptr) { const auto ids = Common::SplitString(id, '#');
switch (bind) { if (ids.size() == 3) {
case STB_GLOBAL: const auto* library = FindLibrary(*m, ids.at(1));
case STB_WEAK: const auto* module = FindModule(*m, ids.at(2));
break; ASSERT_MSG(library && module, "Unable to find library and module");
default: if ((bind == STB_GLOBAL || bind == STB_WEAK) &&
LOG_INFO(Core_Linker, "Unsupported bind {} for name symbol {}", bind, (type == STT_FUN || type == STT_OBJECT) &&
ids.at(0)); export_func == (sym->st_value != 0)) {
continue; std::string nidName = "";
auto aeronid = AeroLib::FindByNid(ids.at(0).c_str());
if (aeronid != nullptr) {
nidName = aeronid->name;
} else {
nidName = "UNK";
}
Loader::SymbolResolver sym_r{};
sym_r.name = ids.at(0);
sym_r.nidName = nidName;
sym_r.library = library->name;
sym_r.library_version = library->version;
sym_r.module = module->name;
sym_r.module_version_major = module->version_major;
sym_r.module_version_minor = module->version_minor;
switch (type) {
case STT_NOTYPE:
sym_r.type = Loader::SymbolType::NoType;
break;
case STT_FUN:
sym_r.type = Loader::SymbolType::Function;
break;
case STT_OBJECT:
sym_r.type = Loader::SymbolType::Object;
break;
default:
sym_r.type = Loader::SymbolType::Unknown;
break;
}
symbol->AddSymbol(sym_r,
(export_func ? sym->st_value + m->base_virtual_addr : 0));
} }
switch (type) {
case STT_OBJECT:
case STT_FUN:
break;
default:
LOG_INFO(Core_Linker, "Unsupported type {} for name symbol {}", type,
ids.at(0));
continue;
}
switch (visibility) {
case STV_DEFAULT:
break;
default:
LOG_INFO(Core_Linker, "Unsupported visibility {} for name symbol {}",
visibility, ids.at(0));
continue;
}
// if st_value!=0 then it's export symbol
bool is_sym_export = sym->st_value != 0;
std::string nidName = "";
auto aeronid = AeroLib::FindByNid(ids.at(0).c_str());
if (aeronid != nullptr) {
nidName = aeronid->name;
} else {
nidName = "UNK";
}
Loader::SymbolResolver sym_r{};
sym_r.name = ids.at(0);
sym_r.nidName = nidName;
sym_r.library = library->name;
sym_r.library_version = library->version;
sym_r.module = module->name;
sym_r.module_version_major = module->version_major;
sym_r.module_version_minor = module->version_minor;
switch (type) {
case STT_NOTYPE:
sym_r.type = Loader::SymbolType::NoType;
break;
case STT_FUN:
sym_r.type = Loader::SymbolType::Function;
break;
case STT_OBJECT:
sym_r.type = Loader::SymbolType::Object;
break;
default:
sym_r.type = Loader::SymbolType::Unknown;
break;
}
if (is_sym_export) {
m->export_sym.AddSymbol(sym_r, sym->st_value + m->base_virtual_addr);
} else {
m->import_sym.AddSymbol(sym_r, 0);
}
LOG_INFO(Core_Linker,
"name = {}, function = {}, library = {}, module = {}, bind = {}, type = "
"{}, visibility = {}",
ids.at(0), nidName, library->name, module->name, bind, type, visibility);
} }
} }
} };
symbol_database(m, &m->export_sym, true);
symbol_database(m, &m->import_sym, false);
} }
void Linker::Relocate(Module* m) { void Linker::Relocate(Module* m) {