From 7468e5f5f4d56552b00177d085ff333af48d5e79 Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Mon, 27 Jan 2025 10:03:23 -0500 Subject: [PATCH 1/2] GP-0: Fixing some javadoc --- .../plugin/languages/sleigh/InputContextScraper.java | 10 +++++----- .../ghidra/program/model/pcode/HighCodeSymbol.java | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/languages/sleigh/InputContextScraper.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/languages/sleigh/InputContextScraper.java index 647becbe51..e2d5910721 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/languages/sleigh/InputContextScraper.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/languages/sleigh/InputContextScraper.java @@ -36,16 +36,16 @@ public class InputContextScraper { } /** - * Get set of all valid input contexts that affect constructor selection. + * {@return the set of all valid input contexts that affect constructor selection.} * *
    - *
  1. Start with mask of the language's default context + *
  2. Start with mask of the language's default context
  3. *
  4. Scrape language for globalset context variables and OR their masks into our - * mask + * mask
  5. *
  6. Flip bits of our mask to get mask of context variables not used as input - * (local/transient) + * (local/transient)
  7. *
  8. Check constructor constraints and use mask to get values of relevant input context - * variables + * variables
  9. *
*/ public Set scrapeInputContexts() { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighCodeSymbol.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighCodeSymbol.java index 46ee5be4dc..e3799cd954 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighCodeSymbol.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighCodeSymbol.java @@ -36,8 +36,6 @@ public class HighCodeSymbol extends HighSymbol { /** * Construct with a backing CodeSymbol. An attempt is made to also find a backing Data object. * @param sym is the backing CodeSymbol - * @param dataType is the (possibly distinct) data-type associated with the new HighSymbol - * @param sz is the storage size, in bytes, of the symbol * @param func is the decompiler function model owning the new HighSymbol */ public HighCodeSymbol(CodeSymbol sym, HighFunction func) { From 749caaf524f51c788ca600852a4e6150a416bdfb Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Mon, 27 Jan 2025 10:19:48 -0500 Subject: [PATCH 2/2] GP-0: Upping gradle wrapper to 8.12.1 --- .../Common/support/gradle/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ghidra/RuntimeScripts/Common/support/gradle/gradle-wrapper.properties b/Ghidra/RuntimeScripts/Common/support/gradle/gradle-wrapper.properties index cea7a793a8..e18bc253b8 100644 --- a/Ghidra/RuntimeScripts/Common/support/gradle/gradle-wrapper.properties +++ b/Ghidra/RuntimeScripts/Common/support/gradle/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME