From 0be476cfafd49ca431dc8c53b67dfee2414b2121 Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Thu, 4 Jan 2024 21:44:33 +0100 Subject: [PATCH] Core/CodeTrace: Take address from given instruction in GetInstructionAttributes(). In all instance this method is called, the instruction comes from SaveCurrentInstruction(), which already sets the address to the PC. --- Source/Core/Core/Debugger/CodeTrace.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Source/Core/Core/Debugger/CodeTrace.cpp b/Source/Core/Core/Debugger/CodeTrace.cpp index 1329b82c7c..d334e49cc3 100644 --- a/Source/Core/Core/Debugger/CodeTrace.cpp +++ b/Source/Core/Core/Debugger/CodeTrace.cpp @@ -73,13 +73,11 @@ void CodeTrace::SetRegTracked(const std::string& reg) InstructionAttributes CodeTrace::GetInstructionAttributes(const TraceOutput& instruction) const { - auto& system = Core::System::GetInstance(); - // Slower process of breaking down saved instruction. Only used when stepping through code if a // decision has to be made, otherwise used afterwards on a log file. InstructionAttributes tmp_attributes; tmp_attributes.instruction = instruction.instruction; - tmp_attributes.address = system.GetPPCState().pc; + tmp_attributes.address = instruction.address; std::string instr = instruction.instruction; std::smatch match;