diff --git a/Ghidra/Features/Decompiler/certification.manifest b/Ghidra/Features/Decompiler/certification.manifest index 3328c543bc..bfb6006c00 100644 --- a/Ghidra/Features/Decompiler/certification.manifest +++ b/Ghidra/Features/Decompiler/certification.manifest @@ -1,4 +1,5 @@ ##VERSION: 2.0 +##MODULE IP: Crystal Clear Icons - LGPL 2.1 ##MODULE IP: FAMFAMFAM Icons - CC 2.5 ##MODULE IP: Oxygen Icons - LGPL 3.0 ##MODULE IP: Tango Icons - Public Domain @@ -53,4 +54,6 @@ src/main/help/help/topics/DecompilePlugin/images/Structnotapplied.png||GHIDRA||| src/main/help/help/topics/DecompilePlugin/images/camera-photo.png||Tango Icons - Public Domain|||Tango|END| src/main/help/help/topics/DecompilePlugin/images/decompileFunction.gif||GHIDRA||reviewed||END| src/main/help/help/topics/DecompilePlugin/images/page_edit.png||FAMFAMFAM Icons - CC 2.5||||END| +src/main/help/help/topics/DecompilePlugin/images/page_white_copy.png||FAMFAMFAM Icons - CC 2.5||||END| +src/main/help/help/topics/DecompilePlugin/images/reload3.png||Crystal Clear Icons - LGPL 2.1||||END| src/main/resources/images/decompileFunction.gif||GHIDRA||reviewed||END| diff --git a/Ghidra/Features/Decompiler/src/main/doc/decompileplugin.xml b/Ghidra/Features/Decompiler/src/main/doc/decompileplugin.xml index d732acd4c7..48dcc113e4 100644 --- a/Ghidra/Features/Decompiler/src/main/doc/decompileplugin.xml +++ b/Ghidra/Features/Decompiler/src/main/doc/decompileplugin.xml @@ -3367,6 +3367,15 @@ generally where the variable is on the left-hand side of an assignment expression, is highlighted in a different color. If the variable is written on multiple merging control-flow paths, no written token is highlighted. + + + In the following example, the token representing the first write to the + variable a is selected when Def-Use is chosen. + + + + + diff --git a/Ghidra/Features/Decompiler/src/main/doc/decompileplugin_html.xsl b/Ghidra/Features/Decompiler/src/main/doc/decompileplugin_html.xsl index ac7773d335..c714eb520b 100644 --- a/Ghidra/Features/Decompiler/src/main/doc/decompileplugin_html.xsl +++ b/Ghidra/Features/Decompiler/src/main/doc/decompileplugin_html.xsl @@ -52,5 +52,5 @@ - + diff --git a/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/images/page_white_copy.png b/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/images/page_white_copy.png new file mode 100644 index 0000000000..a9f31a278e Binary files /dev/null and b/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/images/page_white_copy.png differ diff --git a/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/images/reload3.png b/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/images/reload3.png new file mode 100644 index 0000000000..b80c72091f Binary files /dev/null and b/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/images/reload3.png differ diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/comments/DecompilerCommentsActionFactory.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/comments/DecompilerCommentsActionFactory.java index f744caf862..b6a0f80089 100644 --- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/comments/DecompilerCommentsActionFactory.java +++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/comments/DecompilerCommentsActionFactory.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,19 +15,19 @@ */ package ghidra.app.plugin.core.comments; -import ghidra.app.context.ListingActionContext; -import ghidra.app.context.ProgramLocationActionContext; -import ghidra.app.decompiler.DecompilerLocation; -import ghidra.app.plugin.core.decompile.DecompilerActionContext; -import ghidra.program.model.address.Address; -import ghidra.program.model.listing.CodeUnit; -import ghidra.program.util.*; -import ghidra.util.HelpLocation; - import java.awt.event.KeyEvent; import docking.ActionContext; import docking.action.*; +import ghidra.app.context.ListingActionContext; +import ghidra.app.context.ProgramLocationActionContext; +import ghidra.app.decompiler.DecompilerLocation; +import ghidra.app.plugin.core.decompile.DecompilerActionContext; +import ghidra.app.util.HelpTopics; +import ghidra.program.model.address.Address; +import ghidra.program.model.listing.CodeUnit; +import ghidra.program.util.*; +import ghidra.util.HelpLocation; public class DecompilerCommentsActionFactory extends CommentsActionFactory { @@ -64,7 +63,7 @@ public class DecompilerCommentsActionFactory extends CommentsActionFactory { this.commentType = commentType; setPopupMenuData(new MenuData(new String[] { "Comments", actionName + "..." }, "comments")); - setHelpLocation(new HelpLocation("CommentsPlugin", "Edit_Comments")); + setHelpLocation(new HelpLocation(HelpTopics.DECOMPILER, "ActionComments")); } protected int getEditCommentType(ActionContext context) { diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/DecompilerProvider.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/DecompilerProvider.java index af595de985..ce18481026 100644 --- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/DecompilerProvider.java +++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/DecompilerProvider.java @@ -172,7 +172,7 @@ public class DecompilerProvider extends NavigatableComponentProviderAdapter setWindowMenuGroup("Decompile"); setDefaultWindowPosition(WindowPosition.RIGHT); createActions(isConnected); - setHelpLocation(new HelpLocation(plugin.getName(), "Decompiler")); + setHelpLocation(new HelpLocation(HelpTopics.DECOMPILER, "DecompilerIntro")); addToTool(); redecompileUpdater = new SwingUpdateManager(500, 5000, () -> doRefresh()); diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/OverridePrototypeAction.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/OverridePrototypeAction.java index d8f6bd5355..39ddda0173 100644 --- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/OverridePrototypeAction.java +++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/OverridePrototypeAction.java @@ -260,7 +260,6 @@ public class OverridePrototypeAction extends AbstractDecompilerAction { String signature = generateSignature(op, name); PluginTool tool = context.getTool(); ProtoOverrideDialog dialog = new ProtoOverrideDialog(tool, func, signature, conv); - // dialog.setHelpLocation( new HelpLocation( getOwner(), "Edit_Function_Signature" ) ); tool.showDialog(dialog); FunctionDefinition fdef = dialog.getFunctionDefinition(); if (fdef == null) {