mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-6603_Dan_navigateToEventThread'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-07-02 12:35:09 -04:00
parent 4ba1b76884 38a0378c68
commit 3edd318635
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/tracemgr/DebuggerCoordinates.java
View File

@@ -40,6 +40,7 @@ import ghidra.trace.model.target.TraceObject;
import ghidra.trace.model.target.path.KeyPath; import ghidra.trace.model.target.path.KeyPath;
import ghidra.trace.model.thread.TraceThread; import ghidra.trace.model.thread.TraceThread;
import ghidra.trace.model.time.TraceSnapshot; import ghidra.trace.model.time.TraceSnapshot;
import ghidra.trace.model.time.TraceTimeManager;
import ghidra.trace.model.time.schedule.TraceSchedule; import ghidra.trace.model.time.schedule.TraceSchedule;
import ghidra.trace.model.time.schedule.TraceSchedule.TimeRadix; import ghidra.trace.model.time.schedule.TraceSchedule.TimeRadix;
import ghidra.util.Msg; import ghidra.util.Msg;
@@ -172,6 +173,10 @@ public class DebuggerCoordinates {
} }
private static TraceThread resolveThread(Trace trace, TraceSchedule time) { private static TraceThread resolveThread(Trace trace, TraceSchedule time) {
TraceThread eventThread = getEventThread(trace, time);
if (eventThread != null) {
return eventThread;
}
long snap = time.getSnap(); long snap = time.getSnap();
return trace.getThreadManager() return trace.getThreadManager()
.getLiveThreads(snap) .getLiveThreads(snap)
@@ -403,6 +408,15 @@ public class DebuggerCoordinates {
return new DebuggerCoordinates(trace, platform, target, thread, view, newTime, frame, path); return new DebuggerCoordinates(trace, platform, target, thread, view, newTime, frame, path);
} }
private static TraceThread getEventThread(Trace trace, TraceSchedule time) {
long snap = time.getSnap();
TraceTimeManager manager = trace.getTimeManager();
TraceSnapshot snapshot = time.isSnapOnly()
? manager.getSnapshot(snap, false)
: manager.findScratchSnapshot(time);
return snapshot == null ? null : snapshot.getEventThread();
}
/** /**
* Get these same coordinates with time replaced by the given schedule * Get these same coordinates with time replaced by the given schedule
* *
@@ -417,8 +431,13 @@ public class DebuggerCoordinates {
return NOWHERE; return NOWHERE;
} }
long snap = newTime.getSnap(); long snap = newTime.getSnap();
TraceThread eventThread = getEventThread(trace, newTime);
boolean isThreadValid = thread == null ? false : thread.isValid(snap); boolean isThreadValid = thread == null ? false : thread.isValid(snap);
TraceThread newThread = isThreadValid ? thread : resolveThread(trace, target, newTime); TraceThread newThread = eventThread != null
? eventThread
: isThreadValid
? thread
: resolveThread(trace, target, newTime);
// This will cause the frame to reset to 0 on every snap change. That's fair.... // This will cause the frame to reset to 0 on every snap change. That's fair....
Integer newFrame = resolveFrame(newThread, newTime); Integer newFrame = resolveFrame(newThread, newTime);
KeyPath threadOrFramePath = resolvePath(newThread, newFrame, newTime); KeyPath threadOrFramePath = resolvePath(newThread, newFrame, newTime);