Ghidra is a software reverse engineering (SRE) framework
Merge remote-tracking branch 'origin/GP-4711_emteere_Rust32bit--SQUASHED' into Ghidra_12.0
Ryan Kurtzef25f046a1a3
diff --cc Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/rust/RustUtilities.javaindex 8b6234c1d3,e11f652a3d..d28b38c40e--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/rust/RustUtilities.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/rust/RustUtilities.java@@@ -68,11 -69,11 +69,11 @@@ public class RustUtilities// can later query and use as a return value for this method.GenericMatchAction<AtomicBoolean> action =new GenericMatchAction<AtomicBoolean>(new AtomicBoolean()) {-- @Override-- public void apply(Program prog, Address addr, Match match) {-- getMatchValue().set(true);-- }-- };++ @Override++ public void apply(Program prog, Address addr, Match match) {++ getMatchValue().set(true);++ }++ };MemoryBytePatternSearcher searcher = new MemoryBytePatternSearcher("Rust signatures");for (byte[] sig : RustConstants.RUST_SIGNATURES) {searcher.addPattern(new GenericByteSequencePattern<AtomicBoolean>(sig, action));@@@ -97,9 -98,11 +98,11 @@@public static int addExtensions(Program program, TaskMonitor monitor, String subPath)throws IOException {- Processor processor = program.getLanguageCompilerSpecPair().getLanguage().getProcessor();- ResourceFile module = Application.getModuleDataSubDirectory(processor.toString(),- RustConstants.RUST_EXTENSIONS_PATH + subPath);- Language language = program.getLanguageCompilerSpecPair().getLanguage();++ Language language = program.getLanguageCompilerSpecPair().getLanguage();+ Processor processor = language.getProcessor();- int bitSize = language.getLanguageDescription().getSize();- String spath = RustConstants.RUST_EXTENSIONS_PATH + subPath+bitSize;- ResourceFile module = Application.getModuleDataSubDirectory(processor.toString(),spath);++ int bitSize = language.getLanguageDescription().getSize();++ String spath = RustConstants.RUST_EXTENSIONS_PATH + subPath + bitSize;++ ResourceFile module = Application.getModuleDataSubDirectory(processor.toString(), spath);int extensionCount = 0;