From 9e1910cd462de15920a83f03e678b522f0bf15be Mon Sep 17 00:00:00 2001 From: Amber Brault Date: Sat, 2 Nov 2024 16:55:07 -0400 Subject: [PATCH] Readd missed changes --- Source/Core/Core/Boot/DolReader.h | 3 ++- Source/Core/Core/Debugger/RSO.cpp | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Boot/DolReader.h b/Source/Core/Core/Boot/DolReader.h index 0c04d67b5d00..1ff37e352e0c 100644 --- a/Source/Core/Core/Boot/DolReader.h +++ b/Source/Core/Core/Boot/DolReader.h @@ -27,7 +27,8 @@ class DolReader final : public BootExecutableReader bool IsAncast() const { return m_is_ancast; } u32 GetEntryPoint() const override { return m_dolheader.entryPoint; } bool LoadIntoMemory(Core::System& system, bool only_in_mem1 = false) const override; - bool LoadSymbols(const Core::CPUThreadGuard& guard, PPCSymbolDB& ppc_symbol_db) const override + bool LoadSymbols(const Core::CPUThreadGuard& guard, PPCSymbolDB& ppc_symbol_db, + const std::string& filename) const override { return false; } diff --git a/Source/Core/Core/Debugger/RSO.cpp b/Source/Core/Core/Debugger/RSO.cpp index 71070f21a93d..84d1658856a2 100644 --- a/Source/Core/Core/Debugger/RSO.cpp +++ b/Source/Core/Core/Debugger/RSO.cpp @@ -375,6 +375,7 @@ void RSOView::LoadAll(const Core::CPUThreadGuard& guard, u32 address) void RSOView::Apply(const Core::CPUThreadGuard& guard, PPCSymbolDB* symbol_db) const { + const std::string rso_name = GetName(); for (const RSOExport& rso_export : GetExports()) { u32 address = GetExportAddress(rso_export); @@ -389,15 +390,17 @@ void RSOView::Apply(const Core::CPUThreadGuard& guard, PPCSymbolDB* symbol_db) c { // Function symbol symbol->Rename(export_name); + symbol->object_name = rso_name; } else { // Data symbol - symbol_db->AddKnownSymbol(guard, address, 0, export_name, Common::Symbol::Type::Data); + symbol_db->AddKnownSymbol(guard, address, 0, export_name, + rso_name, Common::Symbol::Type::Data); } } } - DEBUG_LOG_FMT(SYMBOLS, "RSO({}): {} symbols applied", GetName(), GetExportsCount()); + DEBUG_LOG_FMT(SYMBOLS, "RSO({}): {} symbols applied", rso_name, GetExportsCount()); } u32 RSOView::GetNextEntry() const