diff options
| author | Léo Lam <leo@leolam.fr> | 2021-10-13 01:40:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-13 01:40:07 +0200 |
| commit | 6c1a625f0d50f15a0a3d76ec8fa9a3e6d765fa5a (patch) | |
| tree | 65e67aae8acafb1332ae81657f2adc416e2c573f /Source/Core | |
| parent | 6bf467ff4bd200078f3f5edcfd3ed39e0d70fc7e (diff) | |
| parent | 97a5a7be24d9ccd4b8b3c5fcd24ff68f67c13a6b (diff) | |
Merge pull request #10159 from JosJuice/print-callstack-log
Core: Use log variant of PrintCallstack, not print variant
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Debugger/Debugger_SymbolMap.cpp | 22 | ||||
| -rw-r--r-- | Source/Core/Core/Debugger/Debugger_SymbolMap.h | 1 | ||||
| -rw-r--r-- | Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp | 2 |
3 files changed, 1 insertions, 24 deletions
diff --git a/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp b/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp index 34fdb4c691..725bc23985 100644 --- a/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp +++ b/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp @@ -97,28 +97,6 @@ bool GetCallstack(std::vector<CallstackEntry>& output) return true; } -void PrintCallstack() -{ - fmt::print("== STACK TRACE - SP = {:08x} ==", PowerPC::ppcState.gpr[1]); - - if (LR == 0) - { - fmt::print(" LR = 0 - this is bad"); - } - - if (g_symbolDB.GetDescription(PC) != g_symbolDB.GetDescription(LR)) - { - fmt::print(" * {} [ LR = {:08x} ]", g_symbolDB.GetDescription(LR), LR); - } - - WalkTheStack([](u32 func_addr) { - std::string func_desc = g_symbolDB.GetDescription(func_addr); - if (func_desc.empty() || func_desc == "Invalid") - func_desc = "(unknown)"; - fmt::print(" * {} [ addr = {:08x} ]", func_desc, func_addr); - }); -} - void PrintCallstack(Common::Log::LOG_TYPE type, Common::Log::LOG_LEVELS level) { GENERIC_LOG_FMT(type, level, "== STACK TRACE - SP = {:08x} ==", PowerPC::ppcState.gpr[1]); diff --git a/Source/Core/Core/Debugger/Debugger_SymbolMap.h b/Source/Core/Core/Debugger/Debugger_SymbolMap.h index cbceab8ae6..a8c3cd854d 100644 --- a/Source/Core/Core/Debugger/Debugger_SymbolMap.h +++ b/Source/Core/Core/Debugger/Debugger_SymbolMap.h @@ -19,7 +19,6 @@ struct CallstackEntry }; bool GetCallstack(std::vector<CallstackEntry>& output); -void PrintCallstack(); void PrintCallstack(Common::Log::LOG_TYPE type, Common::Log::LOG_LEVELS level); void PrintDataBuffer(Common::Log::LOG_TYPE type, const u8* data, size_t size, std::string_view title); diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp index 32b4eb09cc..9d110ffddd 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp @@ -340,7 +340,7 @@ void Interpreter::unknown_instruction(UGeckoInstruction inst) const u32 opcode = PowerPC::HostRead_U32(last_pc); const std::string disasm = Common::GekkoDisassembler::Disassemble(opcode, last_pc); NOTICE_LOG_FMT(POWERPC, "Last PC = {:08x} : {}", last_pc, disasm); - Dolphin_Debugger::PrintCallstack(); + Dolphin_Debugger::PrintCallstack(Common::Log::POWERPC, Common::Log::LNOTICE); NOTICE_LOG_FMT( POWERPC, "\nIntCPU: Unknown instruction {:08x} at PC = {:08x} last_PC = {:08x} LR = {:08x}\n", |