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

improved symbols_resolver and output

This commit is contained in:
georgemoralis 2024-03-25 09:46:36 +02:00
parent 540c21d382
commit f2f04142b0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/loader/symbols_resolver.cpp
View File

@ -11,10 +11,9 @@
namespace Core::Loader { namespace Core::Loader {
void SymbolsResolver::AddSymbol(const SymbolResolver& s, u64 virtual_addr) { void SymbolsResolver::AddSymbol(const SymbolResolver& s, u64 virtual_addr) {
SymbolRecord r{}; SymbolRecord& r = m_symbols.emplace_back();
r.name = GenerateName(s); r.name = GenerateName(s);
r.virtual_address = virtual_addr; r.virtual_address = virtual_addr;
m_symbols.push_back(r);
} }
std::string SymbolsResolver::GenerateName(const SymbolResolver& s) { std::string SymbolsResolver::GenerateName(const SymbolResolver& s) {
@ -25,7 +24,7 @@ std::string SymbolsResolver::GenerateName(const SymbolResolver& s) {
const SymbolRecord* SymbolsResolver::FindSymbol(const SymbolResolver& s) const { const SymbolRecord* SymbolsResolver::FindSymbol(const SymbolResolver& s) const {
const std::string name = GenerateName(s); const std::string name = GenerateName(s);
for (u32 i = 0; i < m_symbols.size(); i++) { for (u32 i = 0; i < m_symbols.size(); i++) {
if (m_symbols[i].name.compare(name) == 0) { if (m_symbols[i].name == name) {
return &m_symbols[i]; return &m_symbols[i];
} }
} }
@ -46,7 +45,7 @@ void SymbolsResolver::DebugDump(const std::filesystem::path& file_name) {
} else { } else {
nidName = "UNK"; nidName = "UNK";
} }
f.WriteString(fmt::format("{:<20} {:<16} {:<60} {:<30} {:<2} {:<30} {:<2} {:<2} {:<10}\n", f.WriteString(fmt::format("0x{:<20x} {:<16} {:<60} {:<30} {:<2} {:<30} {:<2} {:<2} {:<10}\n",
symbol.virtual_address, ids.at(0), nidName, ids.at(1), ids.at(2), symbol.virtual_address, ids.at(0), nidName, ids.at(1), ids.at(2),
ids.at(3), ids.at(4), ids.at(5), ids.at(6))); ids.at(3), ids.at(4), ids.at(5), ids.at(6)));
} }

3
src/main.cpp
View File

@ -58,8 +58,9 @@ int main(int argc, char* argv[]) {
if (std::filesystem::exists(sce_module_folder)) { if (std::filesystem::exists(sce_module_folder)) {
for (const auto& entry : std::filesystem::directory_iterator(sce_module_folder)) { for (const auto& entry : std::filesystem::directory_iterator(sce_module_folder)) {
if (entry.path().filename() == "libc.prx") { if (entry.path().filename() == "libc.prx") {
// found = true; found = true;
printf("%s\n", entry.path().string().c_str()); printf("%s\n", entry.path().string().c_str());
linker->LoadModule(entry.path().string().c_str());
} }
} }
} }