diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/AbstractFunctionHasher.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/AbstractFunctionHasher.java similarity index 97% rename from Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/AbstractFunctionHasher.java rename to Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/AbstractFunctionHasher.java index 48f6dcb201..ba952c2078 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/AbstractFunctionHasher.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/AbstractFunctionHasher.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. @@ -14,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package ghidra.app.plugin.prototype.match; +package ghidra.app.plugin.match; import generic.stl.Pair; import ghidra.program.model.address.AddressSet; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/ExactBytesFunctionHasher.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/ExactBytesFunctionHasher.java similarity index 95% rename from Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/ExactBytesFunctionHasher.java rename to Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/ExactBytesFunctionHasher.java index afcc029f4d..daa9c584e2 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/ExactBytesFunctionHasher.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/ExactBytesFunctionHasher.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package ghidra.app.plugin.prototype.match; +package ghidra.app.plugin.match; import java.util.ArrayList; @@ -46,9 +46,8 @@ public class ExactBytesFunctionHasher extends AbstractFunctionHasher { byte[] buffer = new byte[byteCount]; int offset = 0; for (CodeUnit codeUnit : units) { - if (monitor.isCancelled()) { - return 0; - } + monitor.checkCanceled(); + try { codeUnit.getBytesInCodeUnit(buffer, offset); } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/ExactInstructionsFunctionHasher.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/ExactInstructionsFunctionHasher.java similarity index 84% rename from Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/ExactInstructionsFunctionHasher.java rename to Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/ExactInstructionsFunctionHasher.java index 1ad2da7e84..559d7bac57 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/ExactInstructionsFunctionHasher.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/ExactInstructionsFunctionHasher.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package ghidra.app.plugin.prototype.match; +package ghidra.app.plugin.match; import java.util.ArrayList; @@ -22,9 +22,7 @@ import generic.hash.MessageDigest; import generic.stl.Pair; import ghidra.program.model.lang.IncompatibleMaskException; import ghidra.program.model.lang.Mask; -import ghidra.program.model.listing.CodeUnit; -import ghidra.program.model.listing.Function; -import ghidra.program.model.listing.Instruction; +import ghidra.program.model.listing.*; import ghidra.program.model.mem.MemoryAccessException; import ghidra.util.Msg; import ghidra.util.exception.CancelledException; @@ -75,15 +73,14 @@ public class ExactInstructionsFunctionHasher extends AbstractFunctionHasher { byte[] buffer = new byte[byteCount]; int offset = 0; for (CodeUnit codeUnit : units) { - if (monitor.isCancelled()) { - return 0; - } + monitor.checkCanceled(); + try { codeUnit.getBytesInCodeUnit(buffer, offset); applyMask(buffer, offset, codeUnit); } catch (MemoryAccessException e) { - Msg.warn(this, "Could not get code unit bvtes at " + codeUnit.getAddress()); + Msg.warn(this, "Could not get code unit bytes at " + codeUnit.getAddress()); } offset += codeUnit.getLength(); } @@ -98,15 +95,22 @@ public class ExactInstructionsFunctionHasher extends AbstractFunctionHasher { } private static void applyMask(byte[] buffer, int offset, CodeUnit codeUnit) { - if (codeUnit instanceof Instruction) { - Instruction i = (Instruction) codeUnit; - Mask mask = i.getPrototype().getInstructionMask(); - try { - mask.applyMask(buffer, offset, buffer, offset); - } - catch (IncompatibleMaskException e) { - throw new RuntimeException(e); - } + if (!(codeUnit instanceof Instruction)) { + return; } + + Instruction i = (Instruction) codeUnit; + Mask mask = i.getPrototype().getInstructionMask(); + if (mask == null) { + return; + } + + try { + mask.applyMask(buffer, offset, buffer, offset); + } + catch (IncompatibleMaskException e) { + throw new RuntimeException(e); + } + } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/ExactMnemonicsFunctionHasher.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/ExactMnemonicsFunctionHasher.java similarity index 91% rename from Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/ExactMnemonicsFunctionHasher.java rename to Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/ExactMnemonicsFunctionHasher.java index fce4a4ae59..750e414092 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/ExactMnemonicsFunctionHasher.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/ExactMnemonicsFunctionHasher.java @@ -13,16 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package ghidra.app.plugin.prototype.match; +package ghidra.app.plugin.match; + +import java.util.ArrayList; import ghidra.program.model.listing.CodeUnit; import ghidra.program.model.listing.Instruction; import ghidra.program.model.mem.MemoryAccessException; +import ghidra.util.Msg; import ghidra.util.exception.CancelledException; import ghidra.util.task.TaskMonitor; -import java.util.ArrayList; - public class ExactMnemonicsFunctionHasher extends ExactInstructionsFunctionHasher { @SuppressWarnings("hiding") public static final ExactMnemonicsFunctionHasher INSTANCE = new ExactMnemonicsFunctionHasher(); @@ -36,9 +37,8 @@ public class ExactMnemonicsFunctionHasher extends ExactInstructionsFunctionHashe throws MemoryAccessException, CancelledException { StringBuilder sb = new StringBuilder(); for (CodeUnit codeUnit : units) { - if (monitor.isCancelled()) { - return 0; - } + monitor.checkCanceled(); + if (codeUnit instanceof Instruction) { Instruction inst = (Instruction) codeUnit; String mnemonic = inst.getMnemonicString(); @@ -56,7 +56,8 @@ public class ExactMnemonicsFunctionHasher extends ExactInstructionsFunctionHashe } sb.append(chars); } - catch (Exception e) { + catch (MemoryAccessException e) { + Msg.warn(this, "Could not get code unit bytes at " + codeUnit.getAddress()); sb.append(codeUnit.getAddressString(true, true)); } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/FunctionHasher.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/FunctionHasher.java similarity index 93% rename from Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/FunctionHasher.java rename to Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/FunctionHasher.java index 2fa74adf5e..5bb292bfd9 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/FunctionHasher.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/FunctionHasher.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. @@ -14,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package ghidra.app.plugin.prototype.match; +package ghidra.app.plugin.match; import ghidra.program.model.listing.Function; import ghidra.util.exception.CancelledException; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/FunctionMatchSet.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/FunctionMatchSet.java similarity index 98% rename from Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/FunctionMatchSet.java rename to Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/FunctionMatchSet.java index 865c4f12c7..85f3565df7 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/FunctionMatchSet.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/FunctionMatchSet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package ghidra.app.plugin.prototype.match; +package ghidra.app.plugin.match; import java.util.ArrayList; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/Match.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/Match.java similarity index 99% rename from Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/Match.java rename to Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/Match.java index 11808b522b..0e1be75031 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/Match.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/Match.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. @@ -20,7 +19,7 @@ * To change the template for this generated file go to * Window>Preferences>Java>Code Generation>Code and Comments */ -package ghidra.app.plugin.prototype.match; +package ghidra.app.plugin.match; import ghidra.program.model.address.Address; import ghidra.program.model.listing.CodeUnit; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/MatchData.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchData.java similarity index 99% rename from Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/MatchData.java rename to Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchData.java index 536f461935..fd36d2f268 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/MatchData.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchData.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package ghidra.app.plugin.prototype.match; +package ghidra.app.plugin.match; import generic.stl.Pair; import ghidra.program.model.address.*; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/MatchFunctions.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchFunctions.java similarity index 99% rename from Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/MatchFunctions.java rename to Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchFunctions.java index 047bedb324..0cd72b209c 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/MatchFunctions.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchFunctions.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. @@ -14,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package ghidra.app.plugin.prototype.match; +package ghidra.app.plugin.match; import ghidra.program.model.address.Address; import ghidra.program.model.address.AddressSetView; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/MatchSet.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchSet.java similarity index 96% rename from Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/MatchSet.java rename to Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchSet.java index 6ecba43a1a..d66b3d3cff 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/MatchSet.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchSet.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. @@ -20,7 +19,7 @@ * To change the template for this generated file go to * Window>Preferences>Java>Code Generation>Code and Comments */ -package ghidra.app.plugin.prototype.match; +package ghidra.app.plugin.match; import java.util.Arrays; import java.util.HashSet; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/MatchSymbol.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchSymbol.java similarity index 99% rename from Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/MatchSymbol.java rename to Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchSymbol.java index 58e71a932f..03248faad5 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/MatchSymbol.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchSymbol.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package ghidra.app.plugin.prototype.match; +package ghidra.app.plugin.match; import java.util.*; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/MatchedData.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchedData.java similarity index 96% rename from Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/MatchedData.java rename to Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchedData.java index 3c67ebab63..9ac81e7ded 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/MatchedData.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchedData.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. @@ -14,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package ghidra.app.plugin.prototype.match; +package ghidra.app.plugin.match; import ghidra.program.model.address.Address; import ghidra.program.model.listing.Data; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/SubroutineMatch.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/SubroutineMatch.java similarity index 98% rename from Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/SubroutineMatch.java rename to Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/SubroutineMatch.java index 1637d652f9..7b62453bde 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/SubroutineMatch.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/SubroutineMatch.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. @@ -20,7 +19,7 @@ * To change the template for this generated file go to * Window>Preferences>Java>Code Generation>Code and Comments */ -package ghidra.app.plugin.prototype.match; +package ghidra.app.plugin.match; import ghidra.program.model.address.Address; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/SubroutineMatchSet.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/SubroutineMatchSet.java similarity index 98% rename from Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/SubroutineMatchSet.java rename to Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/SubroutineMatchSet.java index 3c250cd959..cfb394f029 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/match/SubroutineMatchSet.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/SubroutineMatchSet.java @@ -19,7 +19,7 @@ * To change the template for this generated file go to * Window>Preferences>Java>Code Generation>Code and Comments */ -package ghidra.app.plugin.prototype.match; +package ghidra.app.plugin.match; import java.util.ArrayList; diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/DataMatchProgramCorrelator.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/DataMatchProgramCorrelator.java index c4ac75c45e..c0b2d0c45d 100644 --- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/DataMatchProgramCorrelator.java +++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/DataMatchProgramCorrelator.java @@ -15,8 +15,8 @@ */ package ghidra.feature.vt.api.correlator.program; -import ghidra.app.plugin.prototype.match.MatchData; -import ghidra.app.plugin.prototype.match.MatchedData; +import ghidra.app.plugin.match.MatchData; +import ghidra.app.plugin.match.MatchedData; import ghidra.feature.vt.api.main.*; import ghidra.feature.vt.api.util.VTAbstractProgramCorrelator; import ghidra.framework.options.ToolOptions; diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/DuplicateFunctionMatchProgramCorrelatorFactory.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/DuplicateFunctionMatchProgramCorrelatorFactory.java index 7d6f6ff6e1..3638dcf8ad 100644 --- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/DuplicateFunctionMatchProgramCorrelatorFactory.java +++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/DuplicateFunctionMatchProgramCorrelatorFactory.java @@ -15,7 +15,7 @@ */ package ghidra.feature.vt.api.correlator.program; -import ghidra.app.plugin.prototype.match.ExactInstructionsFunctionHasher; +import ghidra.app.plugin.match.ExactInstructionsFunctionHasher; import ghidra.feature.vt.api.main.VTProgramCorrelator; import ghidra.feature.vt.api.util.VTAbstractProgramCorrelatorFactory; import ghidra.feature.vt.api.util.VTOptions; diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/ExactMatchBytesProgramCorrelatorFactory.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/ExactMatchBytesProgramCorrelatorFactory.java index 6e0a858615..6f62265f15 100644 --- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/ExactMatchBytesProgramCorrelatorFactory.java +++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/ExactMatchBytesProgramCorrelatorFactory.java @@ -15,7 +15,7 @@ */ package ghidra.feature.vt.api.correlator.program; -import ghidra.app.plugin.prototype.match.ExactBytesFunctionHasher; +import ghidra.app.plugin.match.ExactBytesFunctionHasher; import ghidra.feature.vt.api.main.VTProgramCorrelator; import ghidra.feature.vt.api.util.VTAbstractProgramCorrelatorFactory; import ghidra.feature.vt.api.util.VTOptions; diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/ExactMatchInstructionsProgramCorrelatorFactory.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/ExactMatchInstructionsProgramCorrelatorFactory.java index 71e79d4fe4..019b81b55c 100644 --- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/ExactMatchInstructionsProgramCorrelatorFactory.java +++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/ExactMatchInstructionsProgramCorrelatorFactory.java @@ -15,7 +15,7 @@ */ package ghidra.feature.vt.api.correlator.program; -import ghidra.app.plugin.prototype.match.ExactInstructionsFunctionHasher; +import ghidra.app.plugin.match.ExactInstructionsFunctionHasher; import ghidra.feature.vt.api.main.VTProgramCorrelator; import ghidra.feature.vt.api.util.VTAbstractProgramCorrelatorFactory; import ghidra.feature.vt.api.util.VTOptions; diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/ExactMatchMnemonicsProgramCorrelatorFactory.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/ExactMatchMnemonicsProgramCorrelatorFactory.java index eed32ac556..88626be8e4 100644 --- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/ExactMatchMnemonicsProgramCorrelatorFactory.java +++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/ExactMatchMnemonicsProgramCorrelatorFactory.java @@ -15,7 +15,7 @@ */ package ghidra.feature.vt.api.correlator.program; -import ghidra.app.plugin.prototype.match.ExactMnemonicsFunctionHasher; +import ghidra.app.plugin.match.ExactMnemonicsFunctionHasher; import ghidra.feature.vt.api.main.VTProgramCorrelator; import ghidra.feature.vt.api.util.VTAbstractProgramCorrelatorFactory; import ghidra.feature.vt.api.util.VTOptions; diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/FunctionMatchProgramCorrelator.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/FunctionMatchProgramCorrelator.java index 0b664d0340..3112059da2 100644 --- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/FunctionMatchProgramCorrelator.java +++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/FunctionMatchProgramCorrelator.java @@ -19,9 +19,9 @@ import java.util.ArrayList; import java.util.List; import ghidra.app.plugin.core.entropy.EntropyCalculate; -import ghidra.app.plugin.prototype.match.FunctionHasher; -import ghidra.app.plugin.prototype.match.MatchFunctions; -import ghidra.app.plugin.prototype.match.MatchFunctions.MatchedFunctions; +import ghidra.app.plugin.match.FunctionHasher; +import ghidra.app.plugin.match.MatchFunctions; +import ghidra.app.plugin.match.MatchFunctions.MatchedFunctions; import ghidra.feature.vt.api.main.*; import ghidra.feature.vt.api.util.VTAbstractProgramCorrelator; import ghidra.framework.options.ToolOptions; diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/SymbolNameProgramCorrelator.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/SymbolNameProgramCorrelator.java index 05304fc49b..6e9e8b971f 100644 --- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/SymbolNameProgramCorrelator.java +++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/correlator/program/SymbolNameProgramCorrelator.java @@ -17,8 +17,8 @@ package ghidra.feature.vt.api.correlator.program; import java.util.*; -import ghidra.app.plugin.prototype.match.MatchSymbol; -import ghidra.app.plugin.prototype.match.MatchSymbol.MatchedSymbol; +import ghidra.app.plugin.match.MatchSymbol; +import ghidra.app.plugin.match.MatchSymbol.MatchedSymbol; import ghidra.feature.vt.api.main.*; import ghidra.feature.vt.api.util.VTAbstractProgramCorrelator; import ghidra.framework.options.ToolOptions; diff --git a/gradle/support/jacoco.excludes.src.txt b/gradle/support/jacoco.excludes.src.txt index d90e136f5b..128abe8b9e 100644 --- a/gradle/support/jacoco.excludes.src.txt +++ b/gradle/support/jacoco.excludes.src.txt @@ -93,6 +93,7 @@ ghidra/app/plugin/core/printing/** ghidra/file/formats/** ghidra/file/jad/** ghidra/app/cmd/formats/** +ghidra/app/util/bin/format/** mobiledevices/**