From c7326e626feec0d03c53d363bf75106c4378985f Mon Sep 17 00:00:00 2001 From: Sour Date: Mon, 25 Mar 2019 23:48:20 -0400 Subject: [PATCH] Debugger: Fixed PC value for event viewer tooltips --- Core/EventManager.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Core/EventManager.cpp b/Core/EventManager.cpp index bff289a..197d417 100644 --- a/Core/EventManager.cpp +++ b/Core/EventManager.cpp @@ -22,7 +22,9 @@ void EventManager::AddEvent(DebugEventType type, MemoryOperationInfo &operation, evt.Scanline = _ppu->GetScanline(); evt.Cycle = _ppu->GetCycle(); evt.BreakpointId = breakpointId; - evt.ProgramCounter = _cpu->GetState().PC; + + CpuState state = _cpu->GetState(); + evt.ProgramCounter = (state.K << 16) | state.PC; _debugEvents.push_back(evt); } @@ -33,7 +35,10 @@ void EventManager::AddEvent(DebugEventType type) evt.Type = type; evt.Scanline = _ppu->GetScanline(); evt.Cycle = _ppu->GetCycle(); - evt.ProgramCounter = _cpu->GetState().PC; + + CpuState state = _cpu->GetState(); + evt.ProgramCounter = (state.K << 16) | state.PC; + _debugEvents.push_back(evt); }