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

Merge remote-tracking branch 'origin/Ghidra_11.3'

Browse source
This commit is contained in:
Ryan Kurtz 2025-01-27 10:23:27 -05:00
commit 21893b10f6
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/languages/sleigh/InputContextScraper.java
View file

@ -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.}
* *
* <ol> * <ol>
* <li>Start with mask of the language's default context * <li>Start with mask of the language's default context</li>
* <li>Scrape language for <code>globalset</code> context variables and OR their masks into our * <li>Scrape language for <code>globalset</code> context variables and OR their masks into our
* mask * mask</li>
* <li>Flip bits of our mask to get mask of context variables not used as input * <li>Flip bits of our mask to get mask of context variables not used as input
* (local/transient) * (local/transient)</li>
* <li>Check constructor constraints and use mask to get values of relevant input context * <li>Check constructor constraints and use mask to get values of relevant input context
* variables * variables</li>
* </ol> * </ol>
*/ */
public Set<AssemblyPatternBlock> scrapeInputContexts() { public Set<AssemblyPatternBlock> scrapeInputContexts() {

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighCodeSymbol.java
View file

@ -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. * Construct with a backing CodeSymbol. An attempt is made to also find a backing Data object.
* @param sym is the backing CodeSymbol * @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 * @param func is the decompiler function model owning the new HighSymbol
*/ */
public HighCodeSymbol(CodeSymbol sym, HighFunction func) { public HighCodeSymbol(CodeSymbol sym, HighFunction func) {

2
Ghidra/RuntimeScripts/Common/support/gradle/gradle-wrapper.properties
View file

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME