Merge pull request #12480 from AdmiralCurtiss/codetrace-system
Core/CodeTrace: Take address from given instruction in GetInstructionAttributes().
This commit is contained in:
commit
9c91b5edca
|
@ -73,13 +73,11 @@ void CodeTrace::SetRegTracked(const std::string& reg)
|
||||||
|
|
||||||
InstructionAttributes CodeTrace::GetInstructionAttributes(const TraceOutput& instruction) const
|
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
|
// 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.
|
// decision has to be made, otherwise used afterwards on a log file.
|
||||||
InstructionAttributes tmp_attributes;
|
InstructionAttributes tmp_attributes;
|
||||||
tmp_attributes.instruction = instruction.instruction;
|
tmp_attributes.instruction = instruction.instruction;
|
||||||
tmp_attributes.address = system.GetPPCState().pc;
|
tmp_attributes.address = instruction.address;
|
||||||
std::string instr = instruction.instruction;
|
std::string instr = instruction.instruction;
|
||||||
std::smatch match;
|
std::smatch match;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue