ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PPCSymbolDB: Eliminate Redundant Member 

This can be accessed through the CPUThreadGuard.
This commit is contained in:
mitaclaw 2024-03-03 18:21:31 -08:00
parent 8f6fd912f7
commit 0f36654d2b
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/PowerPC/PPCSymbolDB.cpp
View File

@ -28,9 +28,7 @@
PPCSymbolDB g_symbolDB; PPCSymbolDB g_symbolDB;
PPCSymbolDB::PPCSymbolDB() : debugger{&Core::System::GetInstance().GetPowerPC().GetDebugInterface()} PPCSymbolDB::PPCSymbolDB() = default;
{
}
PPCSymbolDB::~PPCSymbolDB() = default; PPCSymbolDB::~PPCSymbolDB() = default;
@ -510,6 +508,8 @@ bool PPCSymbolDB::SaveCodeMap(const Core::CPUThreadGuard& guard, const std::stri
// Write ".text" at the top // Write ".text" at the top
f.WriteString(".text\n"); f.WriteString(".text\n");
const auto& ppc_debug_interface = guard.GetSystem().GetPowerPC().GetDebugInterface();
u32 next_address = 0; u32 next_address = 0;
for (const auto& function : m_functions) for (const auto& function : m_functions)
{ {
@ -530,7 +530,7 @@ bool PPCSymbolDB::SaveCodeMap(const Core::CPUThreadGuard& guard, const std::stri
// Write the code // Write the code
for (u32 address = symbol.address; address < next_address; address += 4) for (u32 address = symbol.address; address < next_address; address += 4)
{ {
const std::string disasm = debugger->Disassemble(&guard, address); const std::string disasm = ppc_debug_interface.Disassemble(&guard, address);
f.WriteString(fmt::format("{0:08x} {1:<{2}.{3}} {4}\n", address, symbol.name, f.WriteString(fmt::format("{0:08x} {1:<{2}.{3}} {4}\n", address, symbol.name,
SYMBOL_NAME_LIMIT, SYMBOL_NAME_LIMIT, disasm)); SYMBOL_NAME_LIMIT, SYMBOL_NAME_LIMIT, disasm));
} }

4
Source/Core/Core/PowerPC/PPCSymbolDB.h
View File

@ -11,7 +11,6 @@
namespace Core namespace Core
{ {
class CPUThreadGuard; class CPUThreadGuard;
class DebugInterface;
} // namespace Core } // namespace Core
// This has functionality overlapping Debugger_Symbolmap. Should merge that stuff in here later. // This has functionality overlapping Debugger_Symbolmap. Should merge that stuff in here later.
@ -39,9 +38,6 @@ public:
void PrintCalls(u32 funcAddr) const; void PrintCalls(u32 funcAddr) const;
void PrintCallers(u32 funcAddr) const; void PrintCallers(u32 funcAddr) const;
void LogFunctionCall(u32 addr); void LogFunctionCall(u32 addr);
private:
Core::DebugInterface* debugger;
}; };
extern PPCSymbolDB g_symbolDB; extern PPCSymbolDB g_symbolDB;