3131import ghidra .trace .database .DBTraceUtils ;
3232import ghidra .trace .model .Trace ;
3333import ghidra .trace .model .program .TraceProgramView ;
34+ import ghidra .trace .model .stack .TraceObjectStackFrame ;
35+ import ghidra .trace .model .target .TraceObject ;
36+ import ghidra .trace .model .target .TraceObjectKeyPath ;
37+ import ghidra .trace .model .thread .TraceObjectThread ;
3438import ghidra .trace .model .thread .TraceThread ;
3539import ghidra .trace .model .time .TraceSnapshot ;
3640import ghidra .trace .model .time .schedule .TraceSchedule ;
4044import ghidra .util .NotOwnerException ;
4145
4246public class DebuggerCoordinates {
47+
4348 public static final DebuggerCoordinates NOWHERE =
44- new DebuggerCoordinates (null , null , null , null , TraceSchedule .ZERO , 0 ) {
45- @ Override
46- public void writeDataState (PluginTool tool , SaveState saveState , String key ) {
47- // Write nothing
48- }
49- };
49+ new DebuggerCoordinates (null , null , null , null , TraceSchedule .ZERO , 0 , null );
5050
5151 private static final String KEY_TRACE_PROJ_LOC = "TraceProjLoc" ;
5252 private static final String KEY_TRACE_PROJ_NAME = "TraceProjName" ;
@@ -55,35 +55,38 @@ public void writeDataState(PluginTool tool, SaveState saveState, String key) {
5555 private static final String KEY_THREAD_KEY = "ThreadKey" ;
5656 private static final String KEY_TIME = "Time" ;
5757 private static final String KEY_FRAME = "Frame" ;
58+ private static final String KEY_OBJ_PATH = "ObjectPath" ;
5859
5960 public static DebuggerCoordinates all (Trace trace , TraceRecorder recorder , TraceThread thread ,
60- TraceProgramView view , TraceSchedule time , Integer frame ) {
61+ TraceProgramView view , TraceSchedule time , Integer frame , TraceObject object ) {
6162 if (trace == NOWHERE .trace && recorder == NOWHERE .recorder && thread == NOWHERE .thread &&
62- view == NOWHERE .view && time == NOWHERE .time && frame == NOWHERE .frame ) {
63+ view == NOWHERE .view && time == NOWHERE .time && frame == NOWHERE .frame &&
64+ object == NOWHERE .object ) {
6365 return NOWHERE ;
6466 }
65- return new DebuggerCoordinates (trace , recorder , thread , view , time , frame );
67+ return new DebuggerCoordinates (trace , recorder , thread , view , time , frame , object );
6668 }
6769
6870 public static DebuggerCoordinates trace (Trace trace ) {
6971 if (trace == null ) {
7072 return NOWHERE ;
7173 }
72- return all (trace , null , null , null , null , null );
74+ return all (trace , null , null , null , null , null , null );
7375 }
7476
7577 public static DebuggerCoordinates recorder (TraceRecorder recorder ) {
7678 return all (recorder == null ? null : recorder .getTrace (), recorder ,
77- null , null , recorder == null ? null : TraceSchedule .snap (recorder .getSnap ()), null );
79+ null , null , recorder == null ? null : TraceSchedule .snap (recorder .getSnap ()), null ,
80+ null );
7881 }
7982
8083 public static DebuggerCoordinates thread (TraceThread thread ) {
81- return all (thread == null ? null : thread .getTrace (), null , thread ,
82- null , null , null );
84+ return all (thread == null ? null : thread .getTrace (), null , thread , null , null , null , null );
8385 }
8486
8587 public static DebuggerCoordinates rawView (TraceProgramView view ) {
86- return all (view .getTrace (), null , null , view , TraceSchedule .snap (view .getSnap ()), null );
88+ return all (view .getTrace (), null , null , view , TraceSchedule .snap (view .getSnap ()), null ,
89+ null );
8790 }
8891
8992 public static DebuggerCoordinates view (TraceProgramView view ) {
@@ -107,24 +110,39 @@ public static DebuggerCoordinates view(TraceProgramView view) {
107110 }
108111
109112 public static DebuggerCoordinates snap (long snap ) {
110- return all (null , null , null , null , TraceSchedule .snap (snap ), null );
113+ return all (null , null , null , null , TraceSchedule .snap (snap ), null , null );
111114 }
112115
113116 public static DebuggerCoordinates time (String time ) {
114117 return time (TraceSchedule .parse (time ));
115118 }
116119
117120 public static DebuggerCoordinates time (TraceSchedule time ) {
118- return all (null , null , null , null , time , null );
121+ return all (null , null , null , null , time , null , null );
119122 }
120123
121124 public static DebuggerCoordinates frame (int frame ) {
122- return all (null , null , null , null , null , frame );
125+ return all (null , null , null , null , null , frame , null );
126+ }
127+
128+ public static DebuggerCoordinates object (TraceObject object ) {
129+ if (object == null ) {
130+ return NOWHERE ;
131+ }
132+ TraceObjectThread thread = object .queryCanonicalAncestorsInterface (TraceObjectThread .class )
133+ .findFirst ()
134+ .orElse (null );
135+ TraceObjectStackFrame frame =
136+ object .queryCanonicalAncestorsInterface (TraceObjectStackFrame .class )
137+ .findFirst ()
138+ .orElse (null );
139+ return all (object .getTrace (), null , thread , null , null ,
140+ frame == null ? null : frame .getLevel (), object );
123141 }
124142
125143 public static DebuggerCoordinates threadSnap (TraceThread thread , long snap ) {
126144 return all (thread == null ? null : thread .getTrace (), null , thread , null ,
127- TraceSchedule .snap (snap ), null );
145+ TraceSchedule .snap (snap ), null , null );
128146 }
129147
130148 public static boolean equalsIgnoreRecorderAndView (DebuggerCoordinates a ,
@@ -150,29 +168,31 @@ public static boolean equalsIgnoreRecorderAndView(DebuggerCoordinates a,
150168 private final TraceProgramView view ;
151169 private final TraceSchedule time ;
152170 private final Integer frame ;
171+ private final TraceObject object ;
153172
154173 private final int hash ;
155174
156175 private Long viewSnap ;
157176 private DefaultTraceTimeViewport viewport ;
158177
159178 protected DebuggerCoordinates (Trace trace , TraceRecorder recorder , TraceThread thread ,
160- TraceProgramView view , TraceSchedule time , Integer frame ) {
179+ TraceProgramView view , TraceSchedule time , Integer frame , TraceObject object ) {
161180 this .trace = trace ;
162181 this .recorder = recorder ;
163182 this .thread = thread ;
164183 this .view = view ;
165184 this .time = time ;
166185 this .frame = frame ;
186+ this .object = object ;
167187
168- this .hash = Objects .hash (trace , recorder , thread , view , time , frame );
188+ this .hash = Objects .hash (trace , recorder , thread , view , time , frame , object );
169189 }
170190
171191 @ Override
172192 public String toString () {
173193 return String .format (
174- "Coords(trace=%s,recorder=%s,thread=%s,view=%s,time=%s,frame=%d)" ,
175- trace , recorder , thread , view , time , frame );
194+ "Coords(trace=%s,recorder=%s,thread=%s,view=%s,time=%s,frame=%d,object=%d )" ,
195+ trace , recorder , thread , view , time , frame , object );
176196 }
177197
178198 @ Override
@@ -199,6 +219,10 @@ public boolean equals(Object obj) {
199219 if (!Objects .equals (this .frame , that .frame )) {
200220 return false ;
201221 }
222+ if (!Objects .equals (this .object , that .object )) {
223+ return false ;
224+ }
225+
202226 return true ;
203227 }
204228
@@ -216,7 +240,7 @@ public TraceRecorder getRecorder() {
216240 }
217241
218242 public DebuggerCoordinates withRecorder (TraceRecorder newRecorder ) {
219- return all (trace , newRecorder , thread , view , time , frame );
243+ return all (trace , newRecorder , thread , view , time , frame , object );
220244 }
221245
222246 public TraceThread getThread () {
@@ -235,7 +259,7 @@ public DebuggerCoordinates withReFoundThread() {
235259 }
236260
237261 public DebuggerCoordinates withThread (TraceThread newThread ) {
238- return all (trace , recorder , newThread , view , time , frame );
262+ return all (trace , recorder , newThread , view , time , frame , object );
239263 }
240264
241265 public TraceProgramView getView () {
@@ -254,15 +278,19 @@ public Long getSnap() {
254278 */
255279 public DebuggerCoordinates withSnap (Long newSnap ) {
256280 return all (trace , recorder , thread , view ,
257- newSnap == null ? time : TraceSchedule .snap (newSnap ), frame );
281+ newSnap == null ? time : TraceSchedule .snap (newSnap ), frame , object );
258282 }
259283
260284 public DebuggerCoordinates withTime (TraceSchedule newTime ) {
261- return all (trace , recorder , thread , view , newTime , frame );
285+ return all (trace , recorder , thread , view , newTime , frame , object );
262286 }
263287
264288 public DebuggerCoordinates withView (TraceProgramView newView ) {
265- return all (trace , recorder , thread , newView , time , frame );
289+ return all (trace , recorder , thread , newView , time , frame , object );
290+ }
291+
292+ public DebuggerCoordinates withObject (TraceObject newObject ) {
293+ return all (trace , recorder , thread , view , time , frame , newObject );
266294 }
267295
268296 public TraceSchedule getTime () {
@@ -273,6 +301,10 @@ public Integer getFrame() {
273301 return frame ;
274302 }
275303
304+ public TraceObject getObject () {
305+ return object ;
306+ }
307+
276308 public synchronized long getViewSnap () {
277309 if (viewSnap != null ) {
278310 return viewSnap ;
@@ -304,6 +336,9 @@ public synchronized TraceTimeViewport getViewport() {
304336 }
305337
306338 public void writeDataState (PluginTool tool , SaveState saveState , String key ) {
339+ if (this == NOWHERE ) {
340+ return ;
341+ }
307342 SaveState coordState = new SaveState ();
308343 // for NOWHERE, key should be completely omitted
309344 if (trace != null ) {
@@ -410,9 +445,21 @@ public static DebuggerCoordinates readDataState(PluginTool tool, SaveState saveS
410445 if (coordState .hasValue (KEY_FRAME )) {
411446 frame = coordState .getInt (KEY_FRAME , 0 );
412447 }
448+ TraceObject object = null ;
449+ if (trace != null && coordState .hasValue (KEY_OBJ_PATH )) {
450+ String pathString = coordState .getString (KEY_OBJ_PATH , "" );
451+ try {
452+ TraceObjectKeyPath path = TraceObjectKeyPath .parse (pathString );
453+ object = trace .getObjectManager ().getObjectByCanonicalPath (path );
454+ }
455+ catch (Exception e ) {
456+ Msg .error (DebuggerCoordinates .class , "Could not restore object: " + pathString , e );
457+ object = trace .getObjectManager ().getRootObject ();
458+ }
459+ }
413460
414461 DebuggerCoordinates coords =
415- DebuggerCoordinates .all (trace , null , thread , null , time , frame );
462+ DebuggerCoordinates .all (trace , null , thread , null , time , frame , object );
416463 if (!resolve ) {
417464 return coords ;
418465 }
0 commit comments