yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

GP-5266: Only track on user click or address change.

Browse source
This commit is contained in:
Dan 2025-01-15 13:56:40 -05:00 • committed by Ryan Kurtz
parent 2a628178b3
commit 5d71f073f4
10 changed files with 135 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/action/DebuggerTrackLocationTrait.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -52,6 +52,10 @@ public class DebuggerTrackLocationTrait {
protected static final AutoConfigState.ClassHandler<DebuggerTrackLocationTrait> CONFIG_STATE_HANDLER =
AutoConfigState.wireHandler(DebuggerTrackLocationTrait.class, MethodHandles.lookup());
public enum TrackCause {
USER, DB_CHANGE, NAVIGATION, EMU_PATCH, SPEC_CHANGE_API;
}
protected class ForTrackingListener extends TraceDomainObjectListener {
public ForTrackingListener() {
@ -68,7 +72,7 @@ public class DebuggerTrackLocationTrait {
if (!tracker.affectedByBytesChange(space, range, current)) {
return;
}
doTrack();
doTrack(TrackCause.DB_CHANGE);
}
private void stackChanged(TraceStack stack) {
@ -79,7 +83,7 @@ public class DebuggerTrackLocationTrait {
if (!tracker.affectedByStackChange(stack, current)) {
return;
}
doTrack();
doTrack(TrackCause.DB_CHANGE);
}
}
@ -188,11 +192,11 @@ public class DebuggerTrackLocationTrait {
public void setSpec(LocationTrackingSpec spec) {
if (action == null) {
// It might if the client doesn't need a new button, e.g., TraceDiff
doSetSpec(spec);
doSetSpec(spec, TrackCause.SPEC_CHANGE_API);
}
else if (!hasSpec(spec)) {
Msg.warn(this, "No action state for given tracking spec: " + spec);
doSetSpec(spec);
doSetSpec(spec, TrackCause.SPEC_CHANGE_API);
}
else {
action.setCurrentActionStateByUserData(spec);
@ -234,21 +238,21 @@ public class DebuggerTrackLocationTrait {
}
protected void clickedSpecButton(ActionContext ctx) {
doTrack();
doTrack(TrackCause.USER);
}
protected void clickedSpecMenu(ActionState<LocationTrackingSpec> newState,
EventTrigger trigger) {
doSetSpec(newState.getUserData());
doSetSpec(newState.getUserData(), TrackCause.USER);
}
protected void doSetSpec(LocationTrackingSpec spec) {
protected void doSetSpec(LocationTrackingSpec spec, TrackCause cause) {
if (this.spec != spec) {
this.spec = spec;
this.tracker = spec.getTracker();
specChanged(spec);
}
doTrack();
doTrack(cause);
}
protected ProgramLocation computeTrackedLocation() {
@ -282,9 +286,15 @@ public class DebuggerTrackLocationTrait {
return spec.getLocationLabel() + " = " + trackedLocation.getByteAddress();
}
protected void doTrack() {
protected void doTrack(TrackCause cause) {
try {
trackedLocation = computeTrackedLocation();
ProgramLocation newLocation = computeTrackedLocation();
if (Objects.equals(newLocation, trackedLocation)) {
if (cause == TrackCause.DB_CHANGE || cause == TrackCause.EMU_PATCH) {
return;
}
}
trackedLocation = newLocation;
locationTracked();
}
catch (Throwable ex) {
@ -315,11 +325,12 @@ public class DebuggerTrackLocationTrait {
if (doListeners) {
removeOldListeners();
}
boolean isPatch = current.differsOnlyByPatch(coordinates);
current = coordinates;
if (doListeners) {
addNewListeners();
}
doTrack();
doTrack(isPatch ? TrackCause.EMU_PATCH : TrackCause.NAVIGATION);
}
public void writeConfigState(SaveState saveState) {

2
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingProvider.java
View file

@ -235,7 +235,7 @@ public class DebuggerListingProvider extends CodeViewerProvider {
super(DebuggerListingProvider.this.tool, DebuggerListingProvider.this.plugin,
DebuggerListingProvider.this);
getListingPanel().addIndexMapChangeListener(e -> this.doTrack());
getListingPanel().addIndexMapChangeListener(e -> this.doTrack(TrackCause.DB_CHANGE));
}
@Override

6
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/AbstractQueryTablePanel.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -90,7 +90,7 @@ public abstract class AbstractQueryTablePanel<T, M extends AbstractQueryTableMod
}
public void goToCoordinates(DebuggerCoordinates coords) {
if (DebuggerCoordinates.equalsIgnoreRecorderAndView(current, coords)) {
if (DebuggerCoordinates.equalsIgnoreTargetAndView(current, coords)) {
return;
}
DebuggerCoordinates previous = current;

2
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/ObjectsTreePanel.java
View file

@ -234,7 +234,7 @@ public class ObjectsTreePanel extends JPanel {
}
public void goToCoordinates(DebuggerCoordinates coords) {
if (DebuggerCoordinates.equalsIgnoreRecorderAndView(current, coords)) {
if (DebuggerCoordinates.equalsIgnoreTargetAndView(current, coords)) {
return;
}
previous = current;