yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 19:42:36 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1886_d-millar_suppress_updates--SQUASHED'

Browse source
This commit is contained in:
Ryan Kurtz 2022-04-05 16:34:51 -04:00
commit 1b0715a30f
3 changed files with 69 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerObjectsPlugin/DebuggerObjectsPlugin.html
View file

@ -323,6 +323,12 @@
state. Sometimes you may wish to ignore the current state and force the action, as, for
example, when the debugger has lost track of the true state.</P>
<H3><A name="toggle_update_while_running">Update While Running</A></H3>
<P>By default, events are passed to the Objects Viewer even while the target is running.
The resulting changes in the GUI may be distracting for some. To disable updates to the
Objects Viewer, toggle "Updates While Running" off.</P>
<H2><A name="color"></A>Color Options</H2>
<P>The debugger represents different types of objects with different colors. Bear in mind these

56
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/DebuggerObjectsProvider.java
View file

@ -27,7 +27,8 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
import javax.swing.*;
import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.tree.TreePath;
import org.apache.commons.collections4.map.LinkedMap;
@ -79,7 +80,6 @@ import ghidra.util.*;
import ghidra.util.datastruct.PrivatelyQueuedListener;
import ghidra.util.table.GhidraTable;
import ghidra.util.task.TaskMonitor;
import resources.ResourceManager;
public class DebuggerObjectsProvider extends ComponentProviderAdapter
implements ObjectContainerListener {
@ -196,9 +196,6 @@ public class DebuggerObjectsProvider extends ComponentProviderAdapter
)
String extendedStep = "";
private static final Icon ENABLED_ICON = ResourceManager.loadImage("images/enabled.png");
private static final Icon DISABLED_ICON = ResourceManager.loadImage("images/disabled.png");
@SuppressWarnings("unused")
private final AutoOptions.Wiring autoOptionsWiring;
@ -250,6 +247,7 @@ public class DebuggerObjectsProvider extends ComponentProviderAdapter
private ToggleDockingAction actionToggleHideIntrinsics;
private ToggleDockingAction actionToggleSelectionOnly;
private ToggleDockingAction actionToggleIgnoreState;
private ToggleDockingAction actionToggleUpdateWhileRunning;
@AutoConfigStateField
private boolean autoRecord = true;
@ -259,6 +257,8 @@ public class DebuggerObjectsProvider extends ComponentProviderAdapter
private boolean selectionOnly = false;
@AutoConfigStateField
private boolean ignoreState = false;
@AutoConfigStateField
private boolean updateWhileRunning = true;
Set<TargetConfigurable> configurables = new HashSet<>();
private String lastMethod = "";
@ -979,7 +979,18 @@ public class DebuggerObjectsProvider extends ComponentProviderAdapter
.menuGroup(DebuggerResources.GROUP_TARGET, "M" + groupTargetIndex)
.helpLocation(new HelpLocation(plugin.getName(), "toggle_ignore_state"))
.onAction(ctx -> performToggleIgnoreState(ctx))
.selected(selectionOnly)
.selected(ignoreState)
.enabled(true)
.buildAndInstallLocal(this);
groupTargetIndex++;
actionToggleUpdateWhileRunning = new ToggleActionBuilder("Toggle update while running", plugin.getName())
.menuPath("Maintenance","&Update While Running")
.menuGroup(DebuggerResources.GROUP_TARGET, "M" + groupTargetIndex)
.helpLocation(new HelpLocation(plugin.getName(), "toggle_update_while_running"))
.onAction(ctx -> performToggleUpdateWhileRunning(ctx))
.selected(isUpdateWhileRunning())
.enabled(true)
.buildAndInstallLocal(this);
@ -1351,8 +1362,8 @@ public class DebuggerObjectsProvider extends ComponentProviderAdapter
}
public void performToggleAutoupdate(ActionContext context) {
TargetObject object = getObjectFromContext(context);
/*
TargetObject object = getObjectFromContext(context);
if (object instanceof DefaultTargetObject) {
Map<String, ?> attributes = object.listAttributes();
Boolean autoupdate = (Boolean) attributes.get(AUTOUPDATE_ATTRIBUTE_NAME);
@ -1370,7 +1381,6 @@ public class DebuggerObjectsProvider extends ComponentProviderAdapter
}
public void performToggleBase(ActionContext context) {
//Object contextObject = context.getContextObject();
for (TargetConfigurable configurable : configurables) {
Object value = configurable.getCachedAttribute(TargetConfigurable.BASE_ATTRIBUTE_NAME);
if (value != null) {
@ -1411,6 +1421,11 @@ public class DebuggerObjectsProvider extends ComponentProviderAdapter
refresh("");
}
public void performToggleUpdateWhileRunning(ActionContext context) {
updateWhileRunning = actionToggleUpdateWhileRunning.isSelected();
refresh("");
}
protected <T extends TargetObject> void performAction(ActionContext context,
boolean fallbackRoot, Class<T> cls,
Function<T, CompletableFuture<Void>> func, String errorMsg) {
@ -1475,11 +1490,9 @@ public class DebuggerObjectsProvider extends ComponentProviderAdapter
if (obj instanceof TargetAttachable) {
return attacher.attach((TargetAttachable) obj);
}
else {
attachDialog.fetchAndDisplayAttachable();
tool.showDialog(attachDialog);
return AsyncUtils.NIL;
}
attachDialog.fetchAndDisplayAttachable();
tool.showDialog(attachDialog);
return AsyncUtils.NIL;
}, "Couldn't attach");
}
@ -1559,7 +1572,6 @@ public class DebuggerObjectsProvider extends ComponentProviderAdapter
return;
}
PluginTool tool = plugin.getTool();
Project project = tool.getProject();
ProgramLocation currentLocation = listingService.getCurrentLocation();
@ -1657,9 +1669,7 @@ public class DebuggerObjectsProvider extends ComponentProviderAdapter
if (extendedStep.equals("")) {
return s.step(TargetStepKind.EXTENDED);
}
else {
return s.step(Map.of("Command", extendedStep));
}
return s.step(Map.of("Command", extendedStep));
}, "Couldn't step extended(" + extendedStep + ")");
}
@ -1740,6 +1750,10 @@ public class DebuggerObjectsProvider extends ComponentProviderAdapter
public boolean isStopped(ActionContext context) {
TargetObject object = this.getObjectFromContext(context);
return isStopped(object);
}
public boolean isStopped(TargetObject object) {
if (object == null) {
return false;
}
@ -1924,7 +1938,9 @@ public class DebuggerObjectsProvider extends ComponentProviderAdapter
if (focused.getModel() != currentModel) {
return;
}
pane.setFocus(object, focused);
if (isStopped(focused) || isUpdateWhileRunning()) {
pane.setFocus(object, focused);
}
}
public DebuggerTraceManagerService getTraceManager() {
@ -2102,4 +2118,8 @@ public class DebuggerObjectsProvider extends ComponentProviderAdapter
}
return addr;
}
public boolean isUpdateWhileRunning() {
return updateWhileRunning;
}
}

50
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/components/ObjectTree.java
View file

@ -71,20 +71,21 @@ public class ObjectTree implements ObjectPane {
provider.updateActions(container);
TreePath path = e.getPath();
Object last = path.getLastPathComponent();
if (last instanceof ObjectNode) {
ObjectNode node = (ObjectNode) last;
TargetObject targetObject = node.getTargetObject();
if (targetObject != null && !(targetObject instanceof DummyTargetObject) &&
e.getEventOrigin().equals(EventOrigin.USER_GENERATED)) {
DebugModelConventions.requestActivation(targetObject).exceptionally(ex -> {
Msg.error(this, "Could not activate " + targetObject, ex);
return null;
});
DebugModelConventions.requestFocus(targetObject).exceptionally(ex -> {
Msg.error(this, "Could not focus " + targetObject, ex);
return null;
});
}
if (!(last instanceof ObjectNode)) {
throw new RuntimeException("Path terminating in non-ObjectNode");
}
ObjectNode node = (ObjectNode) last;
TargetObject targetObject = node.getTargetObject();
if (targetObject != null && !(targetObject instanceof DummyTargetObject) &&
e.getEventOrigin().equals(EventOrigin.USER_GENERATED)) {
DebugModelConventions.requestActivation(targetObject).exceptionally(ex -> {
Msg.error(this, "Could not activate " + targetObject, ex);
return null;
});
DebugModelConventions.requestFocus(targetObject).exceptionally(ex -> {
Msg.error(this, "Could not focus " + targetObject, ex);
return null;
});
}
provider.getTool().contextChanged(provider);
if (e.getEventOrigin() == EventOrigin.INTERNAL_GENERATED) {
@ -136,11 +137,8 @@ public class ObjectTree implements ObjectPane {
Object last = expandedPath.getLastPathComponent();
if (last instanceof ObjectNode) {
ObjectNode node = (ObjectNode) last;
if (!node.isExpanded()) {
//currentExpandedPaths = tree.getExpandedPaths();
node.markExpanded();
currentExpandedPaths = tree.getExpandedPaths();
}
node.markExpanded();
currentExpandedPaths = tree.getExpandedPaths();
}
}
@ -150,11 +148,8 @@ public class ObjectTree implements ObjectPane {
Object last = collapsedPath.getLastPathComponent();
if (last instanceof ObjectNode) {
ObjectNode node = (ObjectNode) last;
if (node.isExpanded()) {
//currentExpandedPaths = tree.getExpandedPaths();
node.markCollapsed();
currentExpandedPaths = tree.getExpandedPaths();
}
node.markCollapsed();
currentExpandedPaths = tree.getExpandedPaths();
}
}
});
@ -192,6 +187,9 @@ public class ObjectTree implements ObjectPane {
@Override
public TargetObject getSelectedObject() {
TreePath path = tree.getSelectionPath();
if (path == null && currentSelectionPaths.length > 0) {
path = currentSelectionPaths[0];
}
if (path != null) {
Object last = path.getLastPathComponent();
if (last instanceof ObjectNode) {
@ -213,7 +211,9 @@ public class ObjectTree implements ObjectPane {
private void restoreTreeState() {
if (currentExpandedPaths != null) {
tree.expandPaths(currentExpandedPaths);
if (!tree.getExpandedPaths().equals(currentExpandedPaths)) {
tree.expandPaths(currentExpandedPaths);
}
}
if (currentSelectionPaths != null) {
tree.setSelectionPaths(currentSelectionPaths);