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

Merge pull request #110 from shadps4-emu/fixesagain 

Fixesagain
This commit is contained in:
georgemoralis 2024-04-11 11:49:16 +03:00 committed by GitHub
parent 3a7834b821 6ca53f8b99
commit 5ed4891a1f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
externals/sdl3 vendored

@ -1 +1 @@
Subproject commit 70b0d33106e98176bf44de5d301855d49587fa50 Subproject commit c8a066019b686351afc614a44a2111111c42d697

68
src/core/linker.cpp
View File

@ -559,44 +559,48 @@ void Linker::Resolve(const std::string& name, Loader::SymbolType sym_type, Modul
Loader::SymbolRecord* return_info) { Loader::SymbolRecord* return_info) {
// std::scoped_lock lock{m_mutex}; // std::scoped_lock lock{m_mutex};
const auto ids = Common::SplitString(name, '#'); 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");
const auto* library = FindLibrary(*m, ids.at(1)); Loader::SymbolResolver sr{};
const auto* module = FindModule(*m, ids.at(2)); sr.name = ids.at(0);
ASSERT_MSG(library && module, "Unable to find library and module"); sr.library = library->name;
sr.library_version = library->version;
sr.module = module->name;
sr.module_version_major = module->version_major;
sr.module_version_minor = module->version_minor;
sr.type = sym_type;
Loader::SymbolResolver sr{}; const Loader::SymbolRecord* rec = nullptr;
sr.name = ids.at(0);
sr.library = library->name;
sr.library_version = library->version;
sr.module = module->name;
sr.module_version_major = module->version_major;
sr.module_version_minor = module->version_minor;
sr.type = sym_type;
const Loader::SymbolRecord* rec = nullptr; rec = m_hle_symbols.FindSymbol(sr);
if (rec == nullptr) {
rec = m_hle_symbols.FindSymbol(sr); // check if it an export function
if (rec == nullptr) { if (auto* p = FindExportedModule(*module, *library);
// check if it an export function p != nullptr && p->export_sym.GetSize() > 0) {
if (auto* p = FindExportedModule(*module, *library); rec = p->export_sym.FindSymbol(sr);
p != nullptr && p->export_sym.GetSize() > 0) { }
rec = p->export_sym.FindSymbol(sr);
} }
} if (rec != nullptr) {
if (rec != nullptr) { *return_info = *rec;
*return_info = *rec;
} else {
auto aeronid = AeroLib::FindByNid(sr.name.c_str());
if (aeronid) {
return_info->name = aeronid->name;
return_info->virtual_address = AeroLib::GetStub(aeronid->nid);
} else { } else {
return_info->virtual_address = AeroLib::GetStub(sr.name.c_str()); auto aeronid = AeroLib::FindByNid(sr.name.c_str());
return_info->name = "Unknown !!!"; if (aeronid) {
return_info->name = aeronid->name;
return_info->virtual_address = AeroLib::GetStub(aeronid->nid);
} else {
return_info->virtual_address = AeroLib::GetStub(sr.name.c_str());
return_info->name = "Unknown !!!";
}
LOG_ERROR(Core_Linker, "Linker: Stub resolved {} as {} (lib: {}, mod: {})", sr.name,
return_info->name, library->name, module->name);
} }
LOG_ERROR(Core_Linker, "Linker: Stub resolved {} as {} (lib: {}, mod: {})", sr.name, } else {
return_info->name, library->name, module->name); return_info->virtual_address = 0;
return_info->name = name;
LOG_ERROR(Core_Linker, "Not Resolved {}", name);
} }
} }