diff --git a/Ghidra/Debug/Debugger-isf/src/main/java/ghidra/program/model/data/ISF/IsfDataTypeWriter.java b/Ghidra/Debug/Debugger-isf/src/main/java/ghidra/program/model/data/ISF/IsfDataTypeWriter.java index 73a72e55ea..de19527332 100644 --- a/Ghidra/Debug/Debugger-isf/src/main/java/ghidra/program/model/data/ISF/IsfDataTypeWriter.java +++ b/Ghidra/Debug/Debugger-isf/src/main/java/ghidra/program/model/data/ISF/IsfDataTypeWriter.java @@ -263,7 +263,7 @@ public class IsfDataTypeWriter { int cnt = 0; for (String key : keylist) { DataType dataType = map.get(key); - monitor.checkCanceled(); + monitor.checkCancelled(); if (key.contains(".conflict")) { continue; } diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/copying/DebuggerCopyPlan.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/copying/DebuggerCopyPlan.java index 72dd6647e8..818067afff 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/copying/DebuggerCopyPlan.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/copying/DebuggerCopyPlan.java @@ -68,7 +68,7 @@ public class DebuggerCopyPlan { byte[] buf = new byte[4096]; AddressRangeChunker chunker = new AddressRangeChunker(fromRange, buf.length); for (AddressRange chunk : chunker) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address addr = chunk.getMinAddress(); int len = (int) chunk.getLength(); from.getMemory().getBytes(addr, buf, 0, len); @@ -124,7 +124,7 @@ public class DebuggerCopyPlan { Listing intoListing = into.getListing(); for (Instruction ins : from.getListing() .getInstructions(new AddressSet(fromRange), true)) { - monitor.checkCanceled(); + monitor.checkCancelled(); if (!ins.getPrototype().getLanguage().equals(into.getLanguage())) { // Filter out "guest" instructions continue; @@ -148,7 +148,7 @@ public class DebuggerCopyPlan { Listing intoListing = into.getListing(); for (Data data : from.getListing() .getDefinedData(new AddressSet(fromRange), true)) { - monitor.checkCanceled(); + monitor.checkCancelled(); long off = data.getMinAddress().subtract(fromRange.getMinAddress()); Address dest = intoAddress.add(off); DataType dt = data.getDataType(); @@ -170,7 +170,7 @@ public class DebuggerCopyPlan { Listing intoListing = into.getListing(); for (Data data : from.getListing() .getDefinedData(new AddressSet(fromRange), true)) { - monitor.checkCanceled(); + monitor.checkCancelled(); long off = data.getMinAddress().subtract(fromRange.getMinAddress()); Address dest = intoAddress.add(off); DataType dt = data.getDataType(); @@ -187,7 +187,7 @@ public class DebuggerCopyPlan { SymbolTable intoTable = into.getSymbolTable(); for (Symbol label : from.getSymbolTable() .getSymbols(new AddressSet(fromRange), SymbolType.LABEL, true)) { - monitor.checkCanceled(); + monitor.checkCancelled(); if (label.getSource() == SourceType.DEFAULT) { continue; } @@ -222,7 +222,7 @@ public class DebuggerCopyPlan { for (TraceBreakpoint bpt : from.getTrace() .getBreakpointManager() .getBreakpointsIntersecting(Lifespan.at(from.getSnap()), fromRange)) { - monitor.checkCanceled(); + monitor.checkCancelled(); long off = bpt.getMinAddress().subtract(fromRange.getMinAddress()); Address dest = intoAddress.add(off); ProgramBreakpoint pb = @@ -245,7 +245,7 @@ public class DebuggerCopyPlan { Iterator bit = from.getBookmarkManager().getBookmarksIterator(fromRange.getMinAddress(), true); while (bit.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Bookmark bm = bit.next(); if (bm.getAddress().compareTo(fromRange.getMaxAddress()) > 0) { break; @@ -270,7 +270,7 @@ public class DebuggerCopyPlan { ReferenceManager intoRefs = into.getReferenceManager(); for (Reference ref : from.getReferenceManager() .getReferenceIterator(fromRange.getMinAddress())) { - monitor.checkCanceled(); + monitor.checkCancelled(); if (ref.getFromAddress().compareTo(fromRange.getMaxAddress()) > 0) { break; } @@ -304,7 +304,7 @@ public class DebuggerCopyPlan { Listing intoListing = into.getListing(); for (Address addr : fromListing.getCommentAddressIterator(new AddressSet(fromRange), true)) { - monitor.checkCanceled(); + monitor.checkCancelled(); long off = addr.subtract(fromRange.getMinAddress()); Address dest = intoAddress.add(off); // Ugly, but there's not MAX/MIN_COMMENT_TYPE diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/AbstractQueryTableModel.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/AbstractQueryTableModel.java index b0c8c0da1d..a2d9d32a43 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/AbstractQueryTableModel.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/AbstractQueryTableModel.java @@ -305,7 +305,7 @@ public abstract class AbstractQueryTableModel extends ThreadedTableModel) streamRows(trace, query, span)::iterator) { accumulator.add(t); - monitor.checkCanceled(); + monitor.checkCancelled(); } } diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/components/ObjectNode.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/components/ObjectNode.java index 8f9e71f451..7b1fd5f6e9 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/components/ObjectNode.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/components/ObjectNode.java @@ -129,7 +129,7 @@ public class ObjectNode extends GTreeSlowLoadingNode { //extends GTreeNode List children = children(); monitor = new TreeTaskMonitor(monitor, children.size()); for (GTreeNode child : children) { - monitor.checkCanceled(); + monitor.checkCancelled(); count += child.loadAll(monitor); monitor.incrementProgress(1); } diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/modules/DebuggerStaticMappingServicePlugin.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/modules/DebuggerStaticMappingServicePlugin.java index 7a374de7a1..f34be8d5a9 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/modules/DebuggerStaticMappingServicePlugin.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/modules/DebuggerStaticMappingServicePlugin.java @@ -762,7 +762,7 @@ public class DebuggerStaticMappingServicePlugin extends Plugin protected static void doAddMappings(Trace trace, Collection> entries, TaskMonitor monitor, boolean truncateExisting) throws CancelledException { for (MapEntry ent : entries) { - monitor.checkCanceled(); + monitor.checkCancelled(); try { DebuggerStaticMappingUtils.addMapping(ent, truncateExisting); } diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/stack/UnwindAnalysis.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/stack/UnwindAnalysis.java index ee3a056d77..4756986759 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/stack/UnwindAnalysis.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/stack/UnwindAnalysis.java @@ -244,7 +244,7 @@ public class UnwindAnalysis { public void executeSet(SymPcodeExecutor exec, AddressSetView set) throws CancelledException { for (Instruction i : program.getListing().getInstructions(set, true)) { - monitor.checkCanceled(); + monitor.checkCancelled(); exec.execute(PcodeProgram.fromInstruction(i, true), PcodeUseropLibrary.nil()); } } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/AbstractBaseDBTraceDefinedUnitsView.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/AbstractBaseDBTraceDefinedUnitsView.java index c0e65045d9..7d4558f160 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/AbstractBaseDBTraceDefinedUnitsView.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/AbstractBaseDBTraceDefinedUnitsView.java @@ -312,7 +312,7 @@ public abstract class AbstractBaseDBTraceDefinedUnitsView it = protoStore.asMap().values().iterator(); it .hasNext();) { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); DBTraceCodePrototypeEntry protoEnt = it.next(); if (protoEnt.prototype.getLanguage() != guest.getLanguage()) { diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceCodeSpace.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceCodeSpace.java index 2ea63f9f74..4055d999fb 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceCodeSpace.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceCodeSpace.java @@ -188,7 +188,7 @@ public class DBTraceCodeSpace implements TraceCodeSpace, DBTraceSpaceBased { for (DBTraceInstruction instruction : instructionMapSpace.reduce( TraceAddressSnapRangeQuery.intersecting(range, span)).values()) { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); if (instruction.platform != guest) { continue; @@ -200,7 +200,7 @@ public class DBTraceCodeSpace implements TraceCodeSpace, DBTraceSpaceBased { monitor.setMaximum(dataMapSpace.size()); // This is OK for (DBTraceData dataUnit : dataMapSpace.reduce( TraceAddressSnapRangeQuery.intersecting(range, span)).values()) { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); if (dataUnit.platform != guest) { continue; diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/AbstractDBTraceProgramViewListing.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/AbstractDBTraceProgramViewListing.java index 4fe10894b2..3a7ccd3573 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/AbstractDBTraceProgramViewListing.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/AbstractDBTraceProgramViewListing.java @@ -658,7 +658,7 @@ public abstract class AbstractDBTraceProgramViewListing implements TraceProgramV AddressSet result = new AddressSet(); for (AddressRange range : getUndefinedRangeIterator(set, true)) { result.add(range); - monitor.checkCanceled(); + monitor.checkCancelled(); } return result; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramViewBookmarkManager.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramViewBookmarkManager.java index ba1c5bb32b..4adf6d5c6a 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramViewBookmarkManager.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramViewBookmarkManager.java @@ -153,7 +153,7 @@ public class DBTraceProgramViewBookmarkManager implements TraceProgramViewBookma Collection bookmarks = bookmarkManager.getBookmarksByType(type); monitor.initialize(bookmarks.size()); for (DBTraceBookmark bm : bookmarks) { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); if (!bm.getLifespan().contains(program.snap)) { continue; @@ -171,7 +171,7 @@ public class DBTraceProgramViewBookmarkManager implements TraceProgramViewBookma try (LockHold hold = program.trace.lockWrite()) { monitor.initialize(set.getNumAddresses()); for (AddressRange rng : set) { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(rng.getLength()); DBTraceBookmarkSpace space = bookmarkManager.getBookmarkSpace(rng.getAddressSpace(), false); @@ -180,7 +180,7 @@ public class DBTraceProgramViewBookmarkManager implements TraceProgramViewBookma } for (TraceBookmark bm : space.getBookmarksIntersecting(Lifespan.at(program.snap), rng)) { - monitor.checkCanceled(); + monitor.checkCancelled(); if (!bm.getLifespan().contains(program.snap)) { continue; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramViewFunctionManager.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramViewFunctionManager.java index 8381a53d49..216cf677c0 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramViewFunctionManager.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramViewFunctionManager.java @@ -269,7 +269,7 @@ public class DBTraceProgramViewFunctionManager implements FunctionManager { Iterator it = getFunctionsInRange(new AddressRangeImpl(startAddr, endAddr), true); while (it.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); it.next().delete(); } } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramViewListing.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramViewListing.java index 5b4aff776b..1a0d08de61 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramViewListing.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramViewListing.java @@ -50,7 +50,7 @@ public class DBTraceProgramViewListing extends AbstractDBTraceProgramViewListing for (AddressRange range : program.getAddressFactory() .getAddressSet(startAddr, endAddr)) { - monitor.checkCanceled(); + monitor.checkCancelled(); codeOperations.definedUnits() .clear(Lifespan.at(program.snap), range, clearContext, monitor); } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/Scheduler.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/Scheduler.java index ee3b55aa27..c06f53b58c 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/Scheduler.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/Scheduler.java @@ -122,7 +122,7 @@ public interface Scheduler { emuThread.finishInstruction(); } for (int i = 0; i < slice.tickCount; i++) { - monitor.checkCanceled(); + monitor.checkCancelled(); emuThread.stepInstruction(); completedTicks++; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/SkipStep.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/SkipStep.java index e877115c3d..207015d501 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/SkipStep.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/SkipStep.java @@ -70,7 +70,7 @@ public class SkipStep extends AbstractStep { throws CancelledException { for (int i = 0; i < tickCount; i++) { monitor.incrementProgress(1); - monitor.checkCanceled(); + monitor.checkCancelled(); stepper.skip(emuThread); } } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/TickStep.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/TickStep.java index b552a7e7a3..274c1e98f4 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/TickStep.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/TickStep.java @@ -70,7 +70,7 @@ public class TickStep extends AbstractStep { throws CancelledException { for (int i = 0; i < tickCount; i++) { monitor.incrementProgress(1); - monitor.checkCanceled(); + monitor.checkCancelled(); stepper.tick(emuThread); } } diff --git a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/framework/data/DBDomainObjectSupport.java b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/framework/data/DBDomainObjectSupport.java index 0288f349af..2502e1ae39 100644 --- a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/framework/data/DBDomainObjectSupport.java +++ b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/framework/data/DBDomainObjectSupport.java @@ -78,7 +78,7 @@ public abstract class DBDomainObjectSupport extends DomainObjectAdapterDB { protected T createManager(String managerName, ManagerSupplier supplier) throws CancelledException, IOException { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.setMessage("Creating " + managerName); try { return supplier.create(openMode, monitor); diff --git a/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/FunctionStartClassifier.java b/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/FunctionStartClassifier.java index 434485a5b4..af6014a0bf 100644 --- a/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/FunctionStartClassifier.java +++ b/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/FunctionStartClassifier.java @@ -94,7 +94,7 @@ public class FunctionStartClassifier { results = classifyQ.waitForResults(); } catch (InterruptedException e) { - monitor.checkCanceled(); + monitor.checkCancelled(); Msg.error(this, "Exception while classifying functions: " + e.getMessage()); } long end = System.nanoTime(); diff --git a/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/FunctionStartRFParams.java b/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/FunctionStartRFParams.java index dd940cc704..3a2c07b09a 100644 --- a/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/FunctionStartRFParams.java +++ b/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/FunctionStartRFParams.java @@ -303,7 +303,7 @@ public class FunctionStartRFParams { funcEntries = new AddressSet(); funcInteriors = new AddressSet(); while (fIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Function func = fIter.next(); monitor.incrementProgress(1); if (func.getBody().getNumAddresses() < minFuncSize) { diff --git a/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/GetAddressesToClassifyTask.java b/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/GetAddressesToClassifyTask.java index 9839a367b3..daec84300d 100644 --- a/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/GetAddressesToClassifyTask.java +++ b/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/GetAddressesToClassifyTask.java @@ -52,7 +52,7 @@ public class GetAddressesToClassifyTask extends Task { monitor.initialize(prog.getFunctionManager().getFunctionCount()); FunctionIterator fIter = prog.getFunctionManager().getFunctions(true); while (fIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); Function func = fIter.next(); execNonFunc = execNonFunc.subtract(func.getBody()); diff --git a/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/ModelTrainingUtils.java b/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/ModelTrainingUtils.java index 7d862ddb03..aa91ad9c6d 100644 --- a/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/ModelTrainingUtils.java +++ b/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/ModelTrainingUtils.java @@ -116,7 +116,7 @@ public class ModelTrainingUtils { TaskMonitor monitor) throws CancelledException { AddressSet following = new AddressSet(); for (Address addr : addresses.getAddresses(true)) { - monitor.checkCanceled(); + monitor.checkCancelled(); CodeUnit cu = program.getListing().getCodeUnitAfter(addr); if (cu == null) { continue; @@ -149,7 +149,7 @@ public class ModelTrainingUtils { TaskMonitor monitor) throws CancelledException { AddressSet preceding = new AddressSet(); for (Address addr : addresses.getAddresses(true)) { - monitor.checkCanceled(); + monitor.checkCancelled(); CodeUnit cu = program.getListing().getCodeUnitBefore(addr); if (cu == null) { continue; @@ -182,7 +182,7 @@ public class ModelTrainingUtils { program.getListing().getDefinedData(program.getMemory().getExecuteSet(), true); AddressSet definedData = new AddressSet(); for (Data d : dataIter) { - monitor.checkCanceled(); + monitor.checkCancelled(); definedData.add( new AddressRangeImpl(d.getAddress(), d.getAddress().add(d.getLength() - 1))); } @@ -210,7 +210,7 @@ public class ModelTrainingUtils { monitor.initialize(source.getNumAddresses()); Iterator
addressIter = source.getAddresses(true); while (addressIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address addr = addressIter.next(); monitor.incrementProgress(1L); List trainingVector = diff --git a/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/RandomForestTrainingTask.java b/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/RandomForestTrainingTask.java index 7313c57f88..65dd3c5889 100644 --- a/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/RandomForestTrainingTask.java +++ b/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/RandomForestTrainingTask.java @@ -338,7 +338,7 @@ public class RandomForestTrainingTask extends Task { List trainers = new ArrayList<>(); for (int i = 0; i < NUM_TREES; ++i) { - monitor.checkCanceled(); + monitor.checkCancelled(); //Integer.MAX_VALUE: unlimited depth trainers.add(new CARTClassificationTrainer(Integer.MAX_VALUE, featureFraction, ThreadLocalRandom.current().nextLong())); @@ -371,7 +371,7 @@ public class RandomForestTrainingTask extends Task { new VotingCombiner()); } catch (Exception e) { - monitor.checkCanceled(); + monitor.checkCancelled(); Msg.error(this, "Exception while training model: " + e.getMessage()); } return randomForest; @@ -411,7 +411,7 @@ public class RandomForestTrainingTask extends Task { RandomForestFunctionFinderPlugin.FUNC_START, errors); } catch (Exception e) { - monitor.checkCanceled(); + monitor.checkCancelled(); Msg.error(this, "Exception while evaluating model on known function starts: " + e.getMessage()); } @@ -430,7 +430,7 @@ public class RandomForestTrainingTask extends Task { RandomForestFunctionFinderPlugin.NON_START, errors); } catch (Exception e) { - monitor.checkCanceled(); + monitor.checkCancelled(); Msg.error(this, "Exception while evaluating model on known function interiors: " + e.getMessage()); } diff --git a/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/RandomSubsetUtils.java b/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/RandomSubsetUtils.java index 46d3928adf..485e67b0c0 100644 --- a/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/RandomSubsetUtils.java +++ b/Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/RandomSubsetUtils.java @@ -53,7 +53,7 @@ public class RandomSubsetUtils { int addressesVisited = 0; int listIndex = 0; while (iter.hasNext() && addressesAdded < k) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address addr = iter.next(); if (sortedRandom.get(listIndex) == addressesVisited) { randomAddresses.add(addr); diff --git a/Ghidra/Extensions/SampleTablePlugin/src/main/java/ghidra/examples/BasicBlockCounterFunctionAlgorithm.java b/Ghidra/Extensions/SampleTablePlugin/src/main/java/ghidra/examples/BasicBlockCounterFunctionAlgorithm.java index 252e6d4dca..75b4f05f7c 100644 --- a/Ghidra/Extensions/SampleTablePlugin/src/main/java/ghidra/examples/BasicBlockCounterFunctionAlgorithm.java +++ b/Ghidra/Extensions/SampleTablePlugin/src/main/java/ghidra/examples/BasicBlockCounterFunctionAlgorithm.java @@ -42,7 +42,7 @@ public class BasicBlockCounterFunctionAlgorithm implements FunctionAlgorithm { int blockCount = 0; while (iterator.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); iterator.next(); blockCount++; monitor.incrementProgress(1); diff --git a/Ghidra/Extensions/SampleTablePlugin/src/main/java/ghidra/examples/ReferenceFunctionAlgorithm.java b/Ghidra/Extensions/SampleTablePlugin/src/main/java/ghidra/examples/ReferenceFunctionAlgorithm.java index 2df98e9a64..66ab5f79f0 100644 --- a/Ghidra/Extensions/SampleTablePlugin/src/main/java/ghidra/examples/ReferenceFunctionAlgorithm.java +++ b/Ghidra/Extensions/SampleTablePlugin/src/main/java/ghidra/examples/ReferenceFunctionAlgorithm.java @@ -41,7 +41,7 @@ public class ReferenceFunctionAlgorithm implements FunctionAlgorithm { AddressIterator iterator = referenceManager.getReferenceSourceIterator(body, true); int referenceCount = 0; while (iterator.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address address = iterator.next(); Reference[] referencesFrom = referenceManager.getReferencesFrom(address); referenceCount += referencesFrom.length; diff --git a/Ghidra/Extensions/SampleTablePlugin/src/main/java/ghidra/examples2/SampleSearcher.java b/Ghidra/Extensions/SampleTablePlugin/src/main/java/ghidra/examples2/SampleSearcher.java index e91b8c90da..ac6c679e17 100644 --- a/Ghidra/Extensions/SampleTablePlugin/src/main/java/ghidra/examples2/SampleSearcher.java +++ b/Ghidra/Extensions/SampleTablePlugin/src/main/java/ghidra/examples2/SampleSearcher.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. @@ -35,7 +34,7 @@ public class SampleSearcher { monitor.initialize(program.getFunctionManager().getFunctionCount()); while (it.hasNext()) { if (monitor.isCancelled()) { - monitor.clearCanceled(); //otherwise the partial results won't be shown + monitor.clearCancelled(); //otherwise the partial results won't be shown break; } Function fun = it.next(); diff --git a/Ghidra/Extensions/SleighDevTools/ghidra_scripts/CompareSleighExternal.java b/Ghidra/Extensions/SleighDevTools/ghidra_scripts/CompareSleighExternal.java index 49b60cf71b..1f30a799e6 100644 --- a/Ghidra/Extensions/SleighDevTools/ghidra_scripts/CompareSleighExternal.java +++ b/Ghidra/Extensions/SleighDevTools/ghidra_scripts/CompareSleighExternal.java @@ -58,7 +58,7 @@ public class CompareSleighExternal extends GhidraScript { long align = currentProgram.getLanguage().getInstructionAlignment(); while (addresses.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address addr = addresses.next(); completed++; diff --git a/Ghidra/Features/Base/developer_scripts/ConsistencyCheck.java b/Ghidra/Features/Base/developer_scripts/ConsistencyCheck.java index 014f9041b6..d4690dfe53 100644 --- a/Ghidra/Features/Base/developer_scripts/ConsistencyCheck.java +++ b/Ghidra/Features/Base/developer_scripts/ConsistencyCheck.java @@ -54,7 +54,7 @@ public class ConsistencyCheck extends GhidraScript { return; } - monitor.checkCanceled(); + monitor.checkCancelled(); if (!df.canSave() || !currentProgram.hasExclusiveAccess()) { popup("Program database is NOT consistent!\nRebuild requires exclusive checkout."); @@ -72,7 +72,7 @@ public class ConsistencyCheck extends GhidraScript { programMgr.closeProgram(currentProgram, true); - monitor.clearCanceled(); // compensate for Script Manager cancelling task on program close + monitor.clearCancelled(); // compensate for Script Manager cancelling task on program close dbh = program.getDBHandle(); try { diff --git a/Ghidra/Features/Base/developer_scripts/MoveMemoryRangeContents.java b/Ghidra/Features/Base/developer_scripts/MoveMemoryRangeContents.java index 534958e01a..ceccebc9ab 100644 --- a/Ghidra/Features/Base/developer_scripts/MoveMemoryRangeContents.java +++ b/Ghidra/Features/Base/developer_scripts/MoveMemoryRangeContents.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. @@ -98,7 +97,7 @@ public class MoveMemoryRangeContents extends GhidraScript { monitor.setMessage("Clearing old symbols..."); SymbolIterator symIter = program.getSymbolTable().getSymbolIterator(destStart, true); while (symIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Symbol sym = symIter.next(); if (sym.getAddress().compareTo(destEnd) > 0) { break; @@ -118,7 +117,7 @@ public class MoveMemoryRangeContents extends GhidraScript { Address srcAddr = srcStart; Address destAddr = destStart; while (true) { - monitor.checkCanceled(); + monitor.checkCancelled(); int cnt = program.getMemory().getBytes(srcAddr, bytes, 0, Math.min(len, bytes.length)); currentProgram.getMemory().setBytes(destAddr, bytes, 0, cnt); len -= cnt; diff --git a/Ghidra/Features/Base/ghidra_scripts/AssociateExternalPELibrariesScript.java b/Ghidra/Features/Base/ghidra_scripts/AssociateExternalPELibrariesScript.java index 601e80cd3b..066a037b01 100644 --- a/Ghidra/Features/Base/ghidra_scripts/AssociateExternalPELibrariesScript.java +++ b/Ghidra/Features/Base/ghidra_scripts/AssociateExternalPELibrariesScript.java @@ -55,7 +55,7 @@ public class AssociateExternalPELibrariesScript extends GhidraScript { String[] externalLibraryNames = externalManager.getExternalLibraryNames(); for (String name : externalLibraryNames) { - monitor.checkCanceled(); + monitor.checkCancelled(); List ciLibraries = getProgramsCaseInsensitive(name, libraries); if (ciLibraries.isEmpty()) { @@ -83,7 +83,7 @@ public class AssociateExternalPELibrariesScript extends GhidraScript { List matchingFiles = new ArrayList(); for (DomainFile file : projectFiles) { - monitor.checkCanceled(); + monitor.checkCancelled(); if (!file.getName().equalsIgnoreCase(name)) { continue; diff --git a/Ghidra/Features/Base/ghidra_scripts/CallotherCensusScript.java b/Ghidra/Features/Base/ghidra_scripts/CallotherCensusScript.java index 1e13fc7431..7baeaf64fb 100644 --- a/Ghidra/Features/Base/ghidra_scripts/CallotherCensusScript.java +++ b/Ghidra/Features/Base/ghidra_scripts/CallotherCensusScript.java @@ -42,7 +42,7 @@ public class CallotherCensusScript extends GhidraScript { InstructionIterator instIter = currentProgram.getListing().getInstructions(true); while (instIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Instruction inst = instIter.next(); for (PcodeOp op : inst.getPcode()) { if (op.getOpcode() == PcodeOp.CALLOTHER) { diff --git a/Ghidra/Features/Base/ghidra_scripts/CreateHelpTemplateScript.java b/Ghidra/Features/Base/ghidra_scripts/CreateHelpTemplateScript.java index 5841fe98fc..97a65cabc4 100644 --- a/Ghidra/Features/Base/ghidra_scripts/CreateHelpTemplateScript.java +++ b/Ghidra/Features/Base/ghidra_scripts/CreateHelpTemplateScript.java @@ -83,7 +83,7 @@ public class CreateHelpTemplateScript extends GhidraScript { printWriter.println("
"); List actions = getActions(tool, plugin); for (DockingActionIf action : actions) { - monitor.checkCanceled(); + monitor.checkCancelled(); printWriter.println("\t" + "

" + action.getName() + "

"); printWriter.println("\t\t" + "
"); diff --git a/Ghidra/Features/Base/ghidra_scripts/CreateRelocationBasedOperandReferences.java b/Ghidra/Features/Base/ghidra_scripts/CreateRelocationBasedOperandReferences.java index 4c8654d403..e7fcd077a9 100644 --- a/Ghidra/Features/Base/ghidra_scripts/CreateRelocationBasedOperandReferences.java +++ b/Ghidra/Features/Base/ghidra_scripts/CreateRelocationBasedOperandReferences.java @@ -56,7 +56,7 @@ public class CreateRelocationBasedOperandReferences extends GhidraScript { int refCount = 0; while (relocations.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Relocation r = relocations.next(); monitor.incrementProgress(1); diff --git a/Ghidra/Features/Base/ghidra_scripts/EditBytesScript.java b/Ghidra/Features/Base/ghidra_scripts/EditBytesScript.java index 0262f13579..77184736cf 100644 --- a/Ghidra/Features/Base/ghidra_scripts/EditBytesScript.java +++ b/Ghidra/Features/Base/ghidra_scripts/EditBytesScript.java @@ -44,7 +44,7 @@ public class EditBytesScript extends GhidraScript { boolean containedInBlock = false; while (containedInBlock == false) { - monitor.checkCanceled(); + monitor.checkCancelled(); newBytes = askBytes("Replace Bytes", "Replace bytes at cursor with:"); endAddr = currentLocation.getByteAddress().add(newBytes.length - 1); activeAddr = currentLocation.getByteAddress(); diff --git a/Ghidra/Features/Base/ghidra_scripts/ExportProgramScript.java b/Ghidra/Features/Base/ghidra_scripts/ExportProgramScript.java index 20af8a0457..19cc53777e 100644 --- a/Ghidra/Features/Base/ghidra_scripts/ExportProgramScript.java +++ b/Ghidra/Features/Base/ghidra_scripts/ExportProgramScript.java @@ -57,7 +57,7 @@ public class ExportProgramScript extends GhidraScript { RelocationTable relocTable = currentProgram.getRelocationTable(); Iterator iter = relocTable.getRelocations(); while (iter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Relocation reloc = iter.next(); Address relocStart = reloc.getAddress(); @@ -102,7 +102,7 @@ public class ExportProgramScript extends GhidraScript { // the original for (long i = 0; i < size; i++) { - monitor.checkCanceled(); + monitor.checkCancelled(); byte originalByte = fileBytes.getOriginalByte(i); byte currentByte = fileBytes.getModifiedByte(i); @@ -158,7 +158,7 @@ public class ExportProgramScript extends GhidraScript { } for (Address address : list) { - monitor.checkCanceled(); + monitor.checkCancelled(); if (set.contains(address)) { return true; } diff --git a/Ghidra/Features/Base/ghidra_scripts/ExtractELFDebugFilesScript.java b/Ghidra/Features/Base/ghidra_scripts/ExtractELFDebugFilesScript.java index 312c16c880..41c4dc5c3c 100644 --- a/Ghidra/Features/Base/ghidra_scripts/ExtractELFDebugFilesScript.java +++ b/Ghidra/Features/Base/ghidra_scripts/ExtractELFDebugFilesScript.java @@ -69,7 +69,7 @@ public class ExtractELFDebugFilesScript extends GhidraScript { void processDir(GFile dir, File destDir) throws IOException, CancelledException { List listing = dir.getListing(); for (GFile file : listing) { - monitor.checkCanceled(); + monitor.checkCancelled(); if (file.isDirectory()) { continue; } @@ -89,7 +89,7 @@ public class ExtractELFDebugFilesScript extends GhidraScript { } } for (GFile file : listing) { - monitor.checkCanceled(); + monitor.checkCancelled(); if (file.isDirectory()) { processDir(file, destDir); } diff --git a/Ghidra/Features/Base/ghidra_scripts/GccRttiAnalysisScript.java b/Ghidra/Features/Base/ghidra_scripts/GccRttiAnalysisScript.java index 2f58b1e2f1..f4e8527e32 100644 --- a/Ghidra/Features/Base/ghidra_scripts/GccRttiAnalysisScript.java +++ b/Ghidra/Features/Base/ghidra_scripts/GccRttiAnalysisScript.java @@ -117,7 +117,7 @@ public class GccRttiAnalysisScript extends GhidraScript { int index = 0; String newCategoryName = new String(); while (index < categoryName.length()) { - monitor.checkCanceled(); + monitor.checkCancelled(); if (categoryName.substring(index).startsWith("::") && !insideBrackets) { newCategoryName = newCategoryName.concat("/"); @@ -453,7 +453,7 @@ public class GccRttiAnalysisScript extends GhidraScript { SymbolIterator symbols = symbolTable.getSymbolIterator("*" + string1 + "*", true); while (symbols.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Symbol symbol = symbols.next(); Address symbolAddress = symbol.getAddress(); @@ -483,7 +483,7 @@ public class GccRttiAnalysisScript extends GhidraScript { SymbolIterator symbols = symbolTable.getSymbols(symbolName); while (symbols.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Symbol symbol = symbols.next(); if (symbol.getParentNamespace().getName().equals(namespaceName)) { Namespace namespace = symbol.getParentNamespace(); @@ -519,7 +519,7 @@ public class GccRttiAnalysisScript extends GhidraScript { Iterator typeinfoIterator = typeinfoSymbols.iterator(); while (typeinfoIterator.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Symbol typeinfoSymbol = typeinfoIterator.next(); Address typeinfoAddress = typeinfoSymbol.getAddress(); @@ -696,7 +696,7 @@ public class GccRttiAnalysisScript extends GhidraScript { Iterator vtableIterator = listOfVtableSymbols.iterator(); while (vtableIterator.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Symbol vtableSymbol = vtableIterator.next(); Namespace vtableNamespace = vtableSymbol.getParentNamespace(); @@ -949,7 +949,7 @@ public class GccRttiAnalysisScript extends GhidraScript { int index = 0; try { while (index < numZeros) { - monitor.checkCanceled(); + monitor.checkCancelled(); if (getByte(address.add(index)) != 0x00) { return false; } @@ -1220,7 +1220,7 @@ public class GccRttiAnalysisScript extends GhidraScript { SymbolIterator symbols = symbolTable.getSymbols(addressSet, SymbolType.LABEL, true); while (symbols.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Symbol symbol = symbols.next(); if (exact && symbol.getName().equals(symbolName)) { symbolsInSet.add(symbol); diff --git a/Ghidra/Features/Base/ghidra_scripts/GraphClassesScript.java b/Ghidra/Features/Base/ghidra_scripts/GraphClassesScript.java index c6643f7398..a5dc5f7b1f 100644 --- a/Ghidra/Features/Base/ghidra_scripts/GraphClassesScript.java +++ b/Ghidra/Features/Base/ghidra_scripts/GraphClassesScript.java @@ -81,10 +81,10 @@ public class GraphClassesScript extends GhidraScript { private void getClassStructures(Category[] categories) throws CancelledException { for (Category category : categories) { - monitor.checkCanceled(); + monitor.checkCancelled(); DataType[] dataTypes = category.getDataTypes(); for (DataType dataType : dataTypes) { - monitor.checkCanceled(); + monitor.checkCancelled(); if (dataType.getName().equals(category.getName()) && dataType instanceof Structure) { @@ -125,7 +125,7 @@ public class GraphClassesScript extends GhidraScript { for (Structure classStructure : classStructures) { - monitor.checkCanceled(); + monitor.checkCancelled(); String description = classStructure.getDescription(); @@ -270,7 +270,7 @@ public class GraphClassesScript extends GhidraScript { DataTypeComponent[] components = childStructure.getComponents(); for (DataTypeComponent component : components) { - monitor.checkCanceled(); + monitor.checkCancelled(); DataType componentDataType = component.getDataType(); if (componentDataType instanceof Structure && componentDataType.getName().equals(parentName)) { @@ -291,7 +291,7 @@ public class GraphClassesScript extends GhidraScript { List parentStructures = new ArrayList<>(); for (Structure classStructure : classStructures) { - monitor.checkCanceled(); + monitor.checkCancelled(); if (classStructure.getName().equals(parentName)) { parentStructures.add(classStructure); diff --git a/Ghidra/Features/Base/ghidra_scripts/MarkCallOtherPcode.java b/Ghidra/Features/Base/ghidra_scripts/MarkCallOtherPcode.java index be22fb4e60..59e25c702b 100644 --- a/Ghidra/Features/Base/ghidra_scripts/MarkCallOtherPcode.java +++ b/Ghidra/Features/Base/ghidra_scripts/MarkCallOtherPcode.java @@ -43,7 +43,7 @@ public class MarkCallOtherPcode extends GhidraScript { InstructionIterator instructions = currentProgram.getListing().getInstructions(set, true); while (instructions.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Instruction instr = instructions.next(); PcodeOp[] pcode = instr.getPcode(); diff --git a/Ghidra/Features/Base/ghidra_scripts/MarkUnimplementedPcode.java b/Ghidra/Features/Base/ghidra_scripts/MarkUnimplementedPcode.java index 0181f97a7f..d3378c2844 100644 --- a/Ghidra/Features/Base/ghidra_scripts/MarkUnimplementedPcode.java +++ b/Ghidra/Features/Base/ghidra_scripts/MarkUnimplementedPcode.java @@ -42,7 +42,7 @@ public class MarkUnimplementedPcode extends GhidraScript { InstructionIterator instructions = currentProgram.getListing().getInstructions(set, true); while (instructions.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Instruction instr = instructions.next(); PcodeOp[] pcode = instr.getPcode(); diff --git a/Ghidra/Features/Base/ghidra_scripts/ProgressExampleScript.java b/Ghidra/Features/Base/ghidra_scripts/ProgressExampleScript.java index 5698527b02..45cd3aa1da 100644 --- a/Ghidra/Features/Base/ghidra_scripts/ProgressExampleScript.java +++ b/Ghidra/Features/Base/ghidra_scripts/ProgressExampleScript.java @@ -30,7 +30,7 @@ public class ProgressExampleScript extends GhidraScript { for (int i = 0; i < 10; i++) { // Note: any script wishing to be responsive to a cancellation from the GUI needs to // call checkCancelled() - monitor.checkCanceled(); + monitor.checkCancelled(); Thread.sleep(1000); // pause a bit so we can see progress diff --git a/Ghidra/Features/Base/ghidra_scripts/PropagateX86ConstantReferences.java b/Ghidra/Features/Base/ghidra_scripts/PropagateX86ConstantReferences.java index c45cae374f..b49126b358 100644 --- a/Ghidra/Features/Base/ghidra_scripts/PropagateX86ConstantReferences.java +++ b/Ghidra/Features/Base/ghidra_scripts/PropagateX86ConstantReferences.java @@ -265,7 +265,7 @@ public class PropagateX86ConstantReferences extends GhidraScript { tableSizeMax = 64; tableIndexOffset = 0; for (long assume = 0; assume < tableSizeMax; assume++) { - assumeValue = new Long(assume); + assumeValue = Long.valueOf(assume); hitTheGuard = false; symEval.flowConstants(branchSet.getMinAddress(), branchSet, eval, false, diff --git a/Ghidra/Features/Base/ghidra_scripts/RemoveUserCheckoutsScript.java b/Ghidra/Features/Base/ghidra_scripts/RemoveUserCheckoutsScript.java index 838ce65f74..c6d6e7b8d8 100644 --- a/Ghidra/Features/Base/ghidra_scripts/RemoveUserCheckoutsScript.java +++ b/Ghidra/Features/Base/ghidra_scripts/RemoveUserCheckoutsScript.java @@ -88,7 +88,7 @@ public class RemoveUserCheckoutsScript extends GhidraScript { private int removeCheckouts(RepositoryAdapter repository, String folderPath, String uid, TaskMonitor monitor) throws IOException, CancelledException { int count = 0; for (RepositoryItem item : repository.getItemList(folderPath)) { - monitor.checkCanceled(); + monitor.checkCancelled(); count += removeCheckouts(repository, item, uid); } for (String subfolder : repository.getSubfolderList(folderPath)) { diff --git a/Ghidra/Features/Base/ghidra_scripts/RepositoryFileUpgradeScript.java b/Ghidra/Features/Base/ghidra_scripts/RepositoryFileUpgradeScript.java index 617aab04a8..78e207546c 100644 --- a/Ghidra/Features/Base/ghidra_scripts/RepositoryFileUpgradeScript.java +++ b/Ghidra/Features/Base/ghidra_scripts/RepositoryFileUpgradeScript.java @@ -104,11 +104,11 @@ public class RepositoryFileUpgradeScript extends GhidraScript { private int listCheckouts(DomainFolder folder) throws IOException, CancelledException { int count = 0; for (DomainFile df : folder.getFiles()) { - monitor.checkCanceled(); + monitor.checkCancelled(); count += listCheckouts(df); } for (DomainFolder subfolder : folder.getFolders()) { - monitor.checkCanceled(); + monitor.checkCancelled(); count += listCheckouts(subfolder); } return count; @@ -130,13 +130,13 @@ public class RepositoryFileUpgradeScript extends GhidraScript { private int performProgramUpgrades(DomainFolder folder) throws IOException, CancelledException { int count = 0; for (DomainFile df : folder.getFiles()) { - monitor.checkCanceled(); + monitor.checkCancelled(); if (performProgramUpgrade(df)) { ++count; } } for (DomainFolder subfolder : folder.getFolders()) { - monitor.checkCanceled(); + monitor.checkCancelled(); count += performProgramUpgrades(subfolder); } return count; diff --git a/Ghidra/Features/Base/ghidra_scripts/ResolveX86orX64LinuxSyscallsScript.java b/Ghidra/Features/Base/ghidra_scripts/ResolveX86orX64LinuxSyscallsScript.java index 536008e3db..9fee16e16c 100644 --- a/Ghidra/Features/Base/ghidra_scripts/ResolveX86orX64LinuxSyscallsScript.java +++ b/Ghidra/Features/Base/ghidra_scripts/ResolveX86orX64LinuxSyscallsScript.java @@ -250,7 +250,7 @@ public class ResolveX86orX64LinuxSyscallsScript extends GhidraScript { TaskMonitor tMonitor) throws CancelledException { Map> funcsToCalls = new HashMap<>(); for (Function func : program.getFunctionManager().getFunctionsNoStubs(true)) { - tMonitor.checkCanceled(); + tMonitor.checkCancelled(); for (Instruction inst : program.getListing().getInstructions(func.getBody(), true)) { if (tester.test(inst)) { Set
callSites = funcsToCalls.get(func); diff --git a/Ghidra/Features/Base/ghidra_scripts/SearchBaseExtended.java b/Ghidra/Features/Base/ghidra_scripts/SearchBaseExtended.java index f6e80fe5ef..cc128ad66b 100644 --- a/Ghidra/Features/Base/ghidra_scripts/SearchBaseExtended.java +++ b/Ghidra/Features/Base/ghidra_scripts/SearchBaseExtended.java @@ -430,7 +430,7 @@ public class SearchBaseExtended extends GhidraScript { private boolean containsOnBit(byte[] array) { for (byte element : array) { - Byte temp = new Byte(element); + Byte temp = Byte.valueOf(element); int value = temp.intValue(); if (value != 0) { return true; diff --git a/Ghidra/Features/Base/ghidra_scripts/SearchForImageBaseOffsets.java b/Ghidra/Features/Base/ghidra_scripts/SearchForImageBaseOffsets.java index c86b9109a3..847e706972 100644 --- a/Ghidra/Features/Base/ghidra_scripts/SearchForImageBaseOffsets.java +++ b/Ghidra/Features/Base/ghidra_scripts/SearchForImageBaseOffsets.java @@ -63,7 +63,7 @@ public class SearchForImageBaseOffsets extends GhidraScript { byte byteArray[] = new byte[numBytes]; for (int i = 0; i < numBytes; i++) { - monitor.checkCanceled(); + monitor.checkCancelled(); byteArray[i] = (byte) (value >> (8 * i) & 0xff); } @@ -74,7 +74,7 @@ public class SearchForImageBaseOffsets extends GhidraScript { Address start = currentProgram.getMinAddress(); Address found = find(start, byteArray); while (found != null) { - monitor.checkCanceled(); + monitor.checkCancelled(); println(found.toString()); start = found.add(1); found = find(start, byteArray); diff --git a/Ghidra/Features/Base/ghidra_scripts/SearchForImageBaseOffsetsScript.java b/Ghidra/Features/Base/ghidra_scripts/SearchForImageBaseOffsetsScript.java index cb5cff5846..bb5eca12ef 100644 --- a/Ghidra/Features/Base/ghidra_scripts/SearchForImageBaseOffsetsScript.java +++ b/Ghidra/Features/Base/ghidra_scripts/SearchForImageBaseOffsetsScript.java @@ -102,7 +102,7 @@ public class SearchForImageBaseOffsetsScript extends GhidraScript { byte byteArray[] = new byte[numBytes]; for (int i = 0; i < numBytes; i++) { - monitor.checkCanceled(); + monitor.checkCancelled(); byteArray[i] = (byte) (value >> (BITS_PER_BYTE * i) & BYTE_MASK); } @@ -121,7 +121,7 @@ public class SearchForImageBaseOffsetsScript extends GhidraScript { byte byteArray[] = new byte[numBytes]; for (int i = 0; i < numBytes; i++) { - monitor.checkCanceled(); + monitor.checkCancelled(); byteArray[i] = (byte) (value >> (8 * (numBytes - (i + 1))) & 0xff); } @@ -140,7 +140,7 @@ public class SearchForImageBaseOffsetsScript extends GhidraScript { Address start = currentProgram.getMinAddress(); Address found = find(start, byteArray); while (found != null) { - monitor.checkCanceled(); + monitor.checkCancelled(); addressSet.add(found); start = found.add(1); found = find(start, byteArray); @@ -153,7 +153,7 @@ public class SearchForImageBaseOffsetsScript extends GhidraScript { AddressIterator addresses = addressSet.getAddresses(true); while (addresses.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address address = addresses.next(); println(address.toString()); } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/formats/ElfBinaryAnalysisCommand.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/formats/ElfBinaryAnalysisCommand.java index e6fe53afcf..f549941575 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/formats/ElfBinaryAnalysisCommand.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/formats/ElfBinaryAnalysisCommand.java @@ -141,7 +141,7 @@ public class ElfBinaryAnalysisCommand extends FlatProgramAPI ElfSectionHeader[] stringSections = elf.getSections(ElfSectionHeaderConstants.SHT_STRTAB); for (ElfSectionHeader stringSection : stringSections) { - monitor.checkCanceled(); + monitor.checkCancelled(); try { Address addr = addr(stringSection.getOffset()); Address maxAddr = addr.addNoWrap(stringSection.getSize() - 1); @@ -176,7 +176,7 @@ public class ElfBinaryAnalysisCommand extends FlatProgramAPI private void processSectionHeaders(ElfHeader elf, Listing listing) throws Exception { ElfSectionHeader[] sections = elf.getSections(); for (int i = 0; i < sections.length; i++) { - monitor.checkCanceled(); + monitor.checkCancelled(); String name = sections[i].getNameAsString(); DataType sectionDT = sections[i].toDataType(); @@ -229,7 +229,7 @@ public class ElfBinaryAnalysisCommand extends FlatProgramAPI ElfProgramHeader[] programHeaders = elf.getProgramHeaders(); for (int i = 0; i < programHeaders.length; i++) { - monitor.checkCanceled(); + monitor.checkCancelled(); Data d = array.getComponent(i); d.setComment(CodeUnit.EOL_COMMENT, programHeaders[i].getComment()); @@ -243,7 +243,7 @@ public class ElfBinaryAnalysisCommand extends FlatProgramAPI throws CancelledException { for (ElfProgramHeader programHeader : elf.getProgramHeaders( ElfProgramHeaderConstants.PT_INTERP)) { - monitor.checkCanceled(); + monitor.checkCancelled(); long offset = programHeader.getOffset(); if (offset == 0) { Msg.warn(this, " Dynamic table appears to have been stripped from binary"); @@ -281,7 +281,7 @@ public class ElfBinaryAnalysisCommand extends FlatProgramAPI BinaryReader reader = new BinaryReader(provider, !program.getMemory().isBigEndian()); for (int i = 0; i < dynamics.length; i++) { - monitor.checkCanceled(); + monitor.checkCancelled(); Data dynamicData = dynamicTableData.getComponent(i); if (dynamicData == null) { @@ -360,7 +360,7 @@ public class ElfBinaryAnalysisCommand extends FlatProgramAPI ElfSymbolTable[] symbolTables = elf.getSymbolTables(); for (ElfSymbolTable symbolTable2 : symbolTables) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address symbolTableAddr = addr(symbolTable2.getFileOffset()); @@ -406,7 +406,7 @@ public class ElfBinaryAnalysisCommand extends FlatProgramAPI monitor.setMessage("Processing relocation tables..."); ElfRelocationTable[] relocationTables = elf.getRelocationTables(); for (ElfRelocationTable relocationTable : relocationTables) { - monitor.checkCanceled(); + monitor.checkCancelled(); ElfSectionHeader relocationSection = relocationTable.getTableSectionHeader(); String relocSectionName = ""; if (relocationSection != null) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/ApplyFunctionDataTypesCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/ApplyFunctionDataTypesCmd.java index 12d02d0266..a18c7a9acb 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/ApplyFunctionDataTypesCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/ApplyFunctionDataTypesCmd.java @@ -189,7 +189,7 @@ public class ApplyFunctionDataTypesCmd extends BackgroundCommand { monitor.initialize(functionNameMap.size()); for (String functionName : functionNameMap.keySet()) { - monitor.checkCanceled(); + monitor.checkCancelled(); FunctionDefinition fdef = functionNameMap.get(functionName); checkForSymbol(monitor, functionName, fdef, symbolMap, null); @@ -205,10 +205,10 @@ public class ApplyFunctionDataTypesCmd extends BackgroundCommand { private void collectFunctionDefinitions(Category cat, TaskMonitor monitor, Map functionNameMap) throws CancelledException { - monitor.checkCanceled(); + monitor.checkCancelled(); for (DataType dt : cat.getDataTypes()) { - monitor.checkCanceled(); + monitor.checkCancelled(); if (!(dt instanceof FunctionDefinition)) { continue; } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CaptureFunctionDataTypesCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CaptureFunctionDataTypesCmd.java index ec58982048..93587d722d 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CaptureFunctionDataTypesCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CaptureFunctionDataTypesCmd.java @@ -66,7 +66,7 @@ public class CaptureFunctionDataTypesCmd extends BackgroundCommand { FunctionManager functionManager = program.getFunctionManager(); FunctionIterator functions = functionManager.getFunctions(set, true); while (functions.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Function function = functions.next(); FunctionSignature signature = function.getSignature(true); FunctionDefinitionDataType functionDef = diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CreateFunctionCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CreateFunctionCmd.java index a0a935b7d8..0ab818fc98 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CreateFunctionCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CreateFunctionCmd.java @@ -409,7 +409,7 @@ public class CreateFunctionCmd extends BackgroundCommand { throws CancelledException, OverlappingFunctionException { Iterator iter = program.getFunctionManager().getFunctionsOverlapping(body); while (iter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Function elem = iter.next(); AddressSetView funcBody = elem.getBody(); if (funcBody.contains(entry)) { @@ -440,7 +440,7 @@ public class CreateFunctionCmd extends BackgroundCommand { TaskMonitor monitor) throws CancelledException { Iterator iter = program.getFunctionManager().getFunctionsOverlapping(body); while (iter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Function elem = iter.next(); if (elem.getEntryPoint().equals(entry)) { // if finding the entrypoint, need to redefine the functions body. @@ -705,7 +705,7 @@ public class CreateFunctionCmd extends BackgroundCommand { Iterator iter = program.getFunctionManager().getFunctionsOverlapping(newBody); while (iter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Function elem = iter.next(); if (elem.getEntryPoint().equals(entry)) { // if finding the entrypoint, need to redefine the functions body. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/FunctionResultStateStackAnalysisCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/FunctionResultStateStackAnalysisCmd.java index 3c150a149f..2ad2a70d3f 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/FunctionResultStateStackAnalysisCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/FunctionResultStateStackAnalysisCmd.java @@ -129,7 +129,7 @@ public class FunctionResultStateStackAnalysisCmd extends BackgroundCommand { ArrayList funcList = new ArrayList(); // list of functions needing stack frames created stack.push(f); while (!stack.isEmpty()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Function func = stack.pop(); // if the purge for the function is unknown, it has not been looked at yet. // we need to add it to the list to analyze its stack frame. @@ -139,7 +139,7 @@ public class FunctionResultStateStackAnalysisCmd extends BackgroundCommand { AddressIterator iter = program.getReferenceManager().getReferenceSourceIterator(func.getBody(), true); while (iter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address fromAddr = iter.next(); Reference refs[] = program.getReferenceManager().getFlowReferencesFrom(fromAddr); @@ -174,7 +174,7 @@ public class FunctionResultStateStackAnalysisCmd extends BackgroundCommand { int default_stackshift = defaultModel.getStackshift(); while (!funcList.isEmpty()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Function func = funcList.remove(0); monitor.setMessage("Stack " + func.getName()); @@ -385,7 +385,7 @@ public class FunctionResultStateStackAnalysisCmd extends BackgroundCommand { VarnodeOperation vop = (VarnodeOperation) exp; Varnode[] inputValues = vop.getInputValues(); for (int i = 0; i < inputValues.length; i++) { - monitor.checkCanceled(); + monitor.checkCancelled(); if (vn.equals(inputValues[i])) { inputValues[i] = value; } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/FunctionStackAnalysisCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/FunctionStackAnalysisCmd.java index d267327864..726ac988c5 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/FunctionStackAnalysisCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/FunctionStackAnalysisCmd.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. @@ -140,7 +139,7 @@ public class FunctionStackAnalysisCmd extends BackgroundCommand { ArrayList funcList = new ArrayList(); // list of functions needing stack frames created stack.push(f); while (!stack.isEmpty()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Function func = stack.pop(); if (func.isThunk()) { continue; @@ -163,7 +162,7 @@ public class FunctionStackAnalysisCmd extends BackgroundCommand { // int default_purge = program.getCompilerSpec().getCallStackMod(); // int default_stackshift = program.getCompilerSpec().getCallStackShift(); while (!funcList.isEmpty()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Function func = funcList.remove(0); SourceType oldSignatureSource = func.getSignatureSource(); @@ -218,7 +217,7 @@ public class FunctionStackAnalysisCmd extends BackgroundCommand { InstructionIterator iter = program.getListing().getInstructions(func.getBody(), true); while (iter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Instruction instr = iter.next(); // process any stack pointer references diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/NewFunctionStackAnalysisCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/NewFunctionStackAnalysisCmd.java index b5111d8a58..f4c7602648 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/NewFunctionStackAnalysisCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/NewFunctionStackAnalysisCmd.java @@ -149,7 +149,7 @@ public class NewFunctionStackAnalysisCmd extends BackgroundCommand { ArrayList funcList = new ArrayList<>(); // list of functions needing stack frames created stack.push(f); while (!stack.isEmpty()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Function func = stack.pop(); if (func.isThunk()) { continue; @@ -183,7 +183,7 @@ public class NewFunctionStackAnalysisCmd extends BackgroundCommand { // Process all the functions identified as needing stack analysis. // The list will have the lowest level functions analyzed first. while (!funcList.isEmpty()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Function func = funcList.remove(0); SourceType oldSignatureSource = func.getSignatureSource(); @@ -742,7 +742,7 @@ public class NewFunctionStackAnalysisCmd extends BackgroundCommand { } private Variable getVariableContaining(int offset, List sortedVariables) { - Object key = new Integer(offset); + Object key = Integer.valueOf(offset); int index = Collections.binarySearch(sortedVariables, key, StackVariableComparator.get()); if (index >= 0) { return sortedVariables.get(index); @@ -773,7 +773,7 @@ public class NewFunctionStackAnalysisCmd extends BackgroundCommand { * @param sortedVariables */ private void addVariableToSortedList(Variable var, List sortedVariables) { - int index = Collections.binarySearch(sortedVariables, new Integer(var.getStackOffset()), + int index = Collections.binarySearch(sortedVariables, Integer.valueOf(var.getStackOffset()), StackVariableComparator.get()); if (index >= 0) { throw new AssertException("Unexpected variable conflict"); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/module/AbstractModularizationCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/module/AbstractModularizationCmd.java index b5520906de..61456edf5e 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/module/AbstractModularizationCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/module/AbstractModularizationCmd.java @@ -167,7 +167,7 @@ public abstract class AbstractModularizationCmd extends BackgroundCommand { CodeBlockReferenceIterator iterator = sourceBlock.getDestinations(monitor); while (iterator.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); CodeBlockReference destination = iterator.next(); CodeBlock targetBlock = getDestinationBlock(destination); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/module/ComplexityDepthModularizationCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/module/ComplexityDepthModularizationCmd.java index 7b7bae6667..27bad0e9dd 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/module/ComplexityDepthModularizationCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/module/ComplexityDepthModularizationCmd.java @@ -57,7 +57,7 @@ public class ComplexityDepthModularizationCmd extends AbstractModularizationCmd List list = partition.get(i); ProgramModule levelModule = createModule(destinationModule, "Level " + i); for (CodeBlockVertex v : list) { - monitor.checkCanceled(); + monitor.checkCancelled(); makeFragment(program, levelModule, v); } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/module/DominanceModularizationCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/module/DominanceModularizationCmd.java index dce400b1a0..c200bbd670 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/module/DominanceModularizationCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/module/DominanceModularizationCmd.java @@ -81,7 +81,7 @@ public class DominanceModularizationCmd extends AbstractModularizationCmd { makeFragment(program, currentModule, vertex); for (CodeBlockVertex child : children) { - monitor.checkCanceled(); + monitor.checkCancelled(); rebuildProgramTree(dg, child, currentModule); } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/module/ModuleAlgorithmCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/module/ModuleAlgorithmCmd.java index 332d2979c5..35427dd563 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/module/ModuleAlgorithmCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/module/ModuleAlgorithmCmd.java @@ -173,7 +173,7 @@ public class ModuleAlgorithmCmd extends BackgroundCommand { parent.moveChild(newName, index); } while (cbi.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); CodeBlock cb = cbi.next(); monitor.setMessage("Processing code block @ " + cb.getMinAddress().toString(true)); ArrayList list = new ArrayList(); @@ -190,7 +190,7 @@ public class ModuleAlgorithmCmd extends BackgroundCommand { parentModule = module; } for (CodeBlock codeBlock : list) { - monitor.checkCanceled(); + monitor.checkCancelled(); ProgramFragment fragment = createFragment(parentModule, codeBlock); moveCodeUnits(fragment, codeBlock, monitor); } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/datatypes/DataTypeMergeManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/datatypes/DataTypeMergeManager.java index 4fdb96a65c..82d51da499 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/datatypes/DataTypeMergeManager.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/datatypes/DataTypeMergeManager.java @@ -271,7 +271,7 @@ public class DataTypeMergeManager implements MergeResolver { private void processSourceArchiveChanges() throws CancelledException { conflictOption = OPTION_MY; for (Long element : myArchiveChangeList) { - currentMonitor.checkCanceled(); + currentMonitor.checkCancelled(); currentMonitor.setProgress(++progressIndex); long id = element.longValue(); @@ -321,7 +321,7 @@ public class DataTypeMergeManager implements MergeResolver { private void processSourceArchiveAdditions() throws CancelledException { for (Long element : myArchiveAddedList) { - currentMonitor.checkCanceled(); + currentMonitor.checkCancelled(); currentMonitor.setProgress(++progressIndex); long id = element.longValue(); @@ -384,7 +384,7 @@ public class DataTypeMergeManager implements MergeResolver { private void processSourceArchiveConflicts() throws CancelledException { for (Long element : archiveConflictList) { - currentMonitor.checkCanceled(); + currentMonitor.checkCancelled(); currentMonitor.setProgress(++progressIndex); long sourceArchiveID = element.longValue(); @@ -415,7 +415,7 @@ public class DataTypeMergeManager implements MergeResolver { */ private void processCategoriesAdded() throws CancelledException { for (Long element : myCatAddedList) { - currentMonitor.checkCanceled(); + currentMonitor.checkCancelled(); currentMonitor.setProgress(++progressIndex); long id = element.longValue(); @@ -435,7 +435,7 @@ public class DataTypeMergeManager implements MergeResolver { private void processCategoryConflicts() throws CancelledException { for (Long element : catConflictList) { - currentMonitor.checkCanceled(); + currentMonitor.checkCancelled(); currentMonitor.setProgress(++progressIndex); long id = element.longValue(); @@ -463,7 +463,7 @@ public class DataTypeMergeManager implements MergeResolver { private void processCategoryChanges() throws CancelledException { for (Long element : myCatChangeList) { - currentMonitor.checkCanceled(); + currentMonitor.checkCancelled(); currentMonitor.setProgress(++progressIndex); long id = element.longValue(); @@ -476,7 +476,7 @@ public class DataTypeMergeManager implements MergeResolver { private void processCategoriesDeleted() throws CancelledException { for (Long element : myCatChangeList) { - currentMonitor.checkCanceled(); + currentMonitor.checkCancelled(); long id = element.longValue(); processCategoryDeleted(id); @@ -485,7 +485,7 @@ public class DataTypeMergeManager implements MergeResolver { private void processDataTypeConflicts() throws CancelledException { while (dtConflictList.size() > 0) { - currentMonitor.checkCanceled(); + currentMonitor.checkCancelled(); currentMonitor.setProgress(++progressIndex); long id = dtConflictList.get(0).longValue(); @@ -1550,7 +1550,7 @@ public class DataTypeMergeManager implements MergeResolver { private void processDataTypeChanges() throws CancelledException { for (Long element : myDtChangeList) { - currentMonitor.checkCanceled(); + currentMonitor.checkCancelled(); currentMonitor.setProgress(++progressIndex); long id = element.longValue(); @@ -2201,7 +2201,7 @@ public class DataTypeMergeManager implements MergeResolver { private void processDataTypesDeleted() throws CancelledException { for (Long element : myDtChangeList) { - currentMonitor.checkCanceled(); + currentMonitor.checkCancelled(); long id = element.longValue(); processDataTypeDeleted(id); @@ -2213,7 +2213,7 @@ public class DataTypeMergeManager implements MergeResolver { */ private void processDataTypesAdded() throws CancelledException { for (Long element : myDtAddedList) { - currentMonitor.checkCanceled(); + currentMonitor.checkCancelled(); currentMonitor.setProgress(++progressIndex); long myDtKey = element.longValue(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/AbstractFunctionMerger.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/AbstractFunctionMerger.java index 95e7afc413..4f78d7c78d 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/AbstractFunctionMerger.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/AbstractFunctionMerger.java @@ -402,7 +402,7 @@ abstract class AbstractFunctionMerger implements ListingMergeConstants { */ void determineFunctionConflicts(Function[] functions, boolean ignoreNames, TaskMonitor monitor) throws CancelledException { - monitor.checkCanceled(); + monitor.checkCancelled(); boolean isExternalFunction = (functions[LATEST] != null) ? functions[LATEST].isExternal() : ((functions[MY] != null) ? functions[MY].isExternal() : functions[ORIGINAL].isExternal()); @@ -504,7 +504,7 @@ abstract class AbstractFunctionMerger implements ListingMergeConstants { */ boolean determineSignatureConflicts(Function[] functions, TaskMonitor monitor) throws CancelledException { - monitor.checkCanceled(); + monitor.checkCancelled(); Address entry = (functions[LATEST] != null) ? functions[LATEST].getEntryPoint() : ((functions[MY] != null) ? functions[MY].getEntryPoint() : functions[ORIGINAL].getEntryPoint()); @@ -1064,7 +1064,7 @@ abstract class AbstractFunctionMerger implements ListingMergeConstants { List determineLocalVariableInfoConflicts(Function[] functions, boolean autoMerge, FunctionVariableStorageConflicts storageConflicts, TaskMonitor monitor) throws CancelledException { - monitor.checkCanceled(); + monitor.checkCancelled(); ArrayList varConflictList = null; Address entry = (functions[LATEST] != null) ? functions[LATEST].getEntryPoint() : ((functions[MY] != null) ? functions[MY].getEntryPoint() @@ -1374,7 +1374,7 @@ abstract class AbstractFunctionMerger implements ListingMergeConstants { int chosenConflictOption, TaskMonitor monitor) throws CancelledException { Iterator iter = paramInfoConflicts.iterator(); while (iter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); ParamInfoConflict pc = iter.next(); mergeParamInfo(entryPt, pc, chosenConflictOption, monitor); } @@ -1406,7 +1406,7 @@ abstract class AbstractFunctionMerger implements ListingMergeConstants { Iterator iter = paramInfoConflicts.iterator(); while (iter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); ParamInfoConflict pc = iter.next(); mergeParamInfo(functions, pc, chosenConflictOption, monitor); } @@ -1437,7 +1437,7 @@ abstract class AbstractFunctionMerger implements ListingMergeConstants { int chosenConflictOption, TaskMonitor monitor) throws CancelledException { Iterator iter = localVarConflicts.iterator(); while (iter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); LocalVariableConflict lvc = iter.next(); mergeLocal(entryPt, lvc, chosenConflictOption, monitor); } @@ -1445,7 +1445,7 @@ abstract class AbstractFunctionMerger implements ListingMergeConstants { protected void mergeLocal(Address entryPt, LocalVariableConflict localVarConflict, int chosenConflictOption, TaskMonitor monitor) throws CancelledException { - monitor.checkCanceled(); + monitor.checkCancelled(); Variable[] vars = localVarConflict.vars; // [0]=Original, [1]=Latest, [2]=My int conflicts = localVarConflict.varConflicts; // if ((conflicts & VAR_REMOVED) != 0) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/BookmarkMerger.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/BookmarkMerger.java index eb5f1e0e15..c9b8b3021e 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/BookmarkMerger.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/BookmarkMerger.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. @@ -457,7 +456,7 @@ class BookmarkMerger extends AbstractListingMerger { if ((bookmarkChoice == ASK_USER) && askUser && mergeManager != null) { showMergePanel(listingPanel, bmuid.address, bmuid.bookmarkType, bmuid.bookmarkCategory, monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { int optionToUse = diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/CodeUnitMerger.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/CodeUnitMerger.java index 2ecad11675..10766f8427 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/CodeUnitMerger.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/CodeUnitMerger.java @@ -492,7 +492,7 @@ class CodeUnitMerger extends AbstractListingMerger { conflictInfoPanel.setCodeUnitInfo(range, conflictIndex + 1, totalConflicts); conflictInfoPanel.setConflictInfo(1, 1); showMergePanel(listingPanel, rangeMin, rangeMax, monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); chosenConflictOption = getSelectedOption(conflictPanel); monitor.setMaximum(totalConflicts); monitor.setProgress(conflictIndex + 1); @@ -736,7 +736,7 @@ class CodeUnitMerger extends AbstractListingMerger { register, addrRange.getMinAddress(), addrRange.getMaxAddress()); resultContext.remove(addrRange.getMinAddress(), addrRange.getMaxAddress(), register); while (origValueIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); AddressRange valueRange = origValueIter.next(); RegisterValue value = originContext.getRegisterValue(register, valueRange.getMinAddress()); @@ -791,7 +791,7 @@ class CodeUnitMerger extends AbstractListingMerger { // Get each code unit out of the iterator and set it in the merged // program if it is an instruction. while (sourceCodeUnits.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); CodeUnit cu = sourceCodeUnits.next(); if (mergeCount > granularity) { monitor.setProgress(mergeProgress); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/CommentMerger.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/CommentMerger.java index 0ce394a9e6..e7a8605fed 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/CommentMerger.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/CommentMerger.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. @@ -297,7 +296,7 @@ class CommentMerger extends AbstractListingMerger { } if (chosenConflictOption == ASK_USER && mergeManager != null) { showMergePanel(listingPanel, addr, programMergeFilterCommentType, monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { merge(addr, programMergeFilterCommentType, chosenConflictOption, monitor); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/EquateMerger.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/EquateMerger.java index 7bfb8d1aef..f5e8635ae8 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/EquateMerger.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/EquateMerger.java @@ -148,7 +148,7 @@ class EquateMerger extends AbstractListingMerger { // Each operand index can have multiple scalars Scalar[] scalars = getScalars(resultCU, opIndex); for (Scalar scalar : scalars) { - monitor.checkCanceled(); + monitor.checkCancelled(); getOperandScalarConflicts(addr, opIndex, scalar); } } @@ -329,7 +329,7 @@ class EquateMerger extends AbstractListingMerger { else { if (askUser && mergeManager != null) { setupConflictPanel(listingPanel, equateConflict); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { merge(equateConflict.address, equateConflict.opIndex, diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ExternalFunctionMerger.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ExternalFunctionMerger.java index b857f93066..c23a670c3b 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ExternalFunctionMerger.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ExternalFunctionMerger.java @@ -473,7 +473,7 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li initializeAutoMerge("Auto-merging External Labels and Functions and determining conflicts.", progressMin, progressMax, monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); clearResolveInfo(); setupSymbolChanges(monitor); // Creates ID arrays used by processing methods. @@ -591,7 +591,7 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li throws CancelledException { AddressIterator latestModifiedAddressIterator = latestExternalSet.getAddresses(true); while (latestModifiedAddressIterator.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address externalAddress = latestModifiedAddressIterator.next(); Symbol latestSymbol = symbolTables[LATEST].getPrimarySymbol(externalAddress); if (latestSymbol == null) { @@ -624,7 +624,7 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li private void getNonSymbolChangesForMyExternals(TaskMonitor monitor) throws CancelledException { AddressIterator myModifiedAddressIterator = myExternalSet.getAddresses(true); while (myModifiedAddressIterator.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address externalAddress = myModifiedAddressIterator.next(); Symbol mySymbol = symbolTables[MY].getPrimarySymbol(externalAddress); if (mySymbol == null) { @@ -711,7 +711,7 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li private void mergeExternalDetail(int type, ExternalLocation resultExternalLocation, ExternalLocation fromExternalLocation, TaskMonitor monitor) throws CancelledException { - monitor.checkCanceled(); + monitor.checkCancelled(); // See if both changed to same value. switch (type) { @@ -1106,7 +1106,7 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li } private void determineExternalRemoveConflicts(TaskMonitor monitor) throws CancelledException { - monitor.checkCanceled(); + monitor.checkCancelled(); if (totalChanges <= 0) { return; } @@ -1157,7 +1157,7 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li } private void determineExternalChangeConflicts(TaskMonitor monitor) throws CancelledException { - monitor.checkCanceled(); + monitor.checkCancelled(); if (totalChanges <= 0) { return; } @@ -1174,7 +1174,7 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li private void processExternalsChangedInLatest(TaskMonitor monitor) throws CancelledException { Iterator latestIterator = latestModifiedIDs.iterator(); while (latestIterator.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); long latestID = latestIterator.next(); long originalID = resolveOriginalIDFromLatestID(latestID); long myID = resolveMyIDFromOriginalID(originalID); @@ -1211,7 +1211,7 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li private void processExternalsChangedInMy(TaskMonitor monitor) throws CancelledException { Iterator myIterator = myModifiedIDs.iterator(); while (myIterator.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); long myID = myIterator.next(); long originalID = resolveOriginalIDFromMyID(myID); long latestID = resolveLatestIDFromOriginalID(originalID); @@ -1426,7 +1426,7 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li */ public void replaceExternalDataType(ExternalLocation resultExternalLocation, ExternalLocation fromExternalLocation, TaskMonitor monitor) throws CancelledException { - monitor.checkCanceled(); + monitor.checkCancelled(); if (fromExternalLocation != null && resultExternalLocation != null) { DataType fromDataTypeForResult = getResultDataType(fromExternalLocation); DataType resultDataType = resultExternalLocation.getDataType(); @@ -1526,7 +1526,7 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li } private void determineExternalAddConflicts(TaskMonitor monitor) throws CancelledException { - monitor.checkCanceled(); + monitor.checkCancelled(); if (totalChanges <= 0) { return; } @@ -1540,7 +1540,7 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li // MY adds may conflict with LATEST adds that are already in RESULT. Iterator myIterator = myAddIDs.iterator(); while (myIterator.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); long myID = myIterator.next(); Symbol mySymbol = symbolTables[MY].getSymbol(myID); // Non-primary symbols are "original" symbols and we don't need to match these. @@ -2016,7 +2016,7 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li choicesPanel.setConflictType("External Function Removal"); setupConflictPanel(listingMergePanel, choicesPanel, externalLocations, monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { // If we have a external function removal choice then a "Use For All" has already occurred. @@ -2069,7 +2069,7 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li choicesPanel.setConflictType("Function Detail"); setupConflictPanel(listingPanel, choicesPanel, externalLocations, monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { mergeFunctionDetails(functions, currentConflictOption, monitor); @@ -2128,7 +2128,7 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li choicesPanel.setConflictType("Function Return"); setupConflictPanel(listingPanel, choicesPanel, externalLocations, monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { mergeFunctionReturn(functions, currentConflictOption, monitor); @@ -2145,14 +2145,14 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li if (variableStorageChoice != ASK_USER) { for (Pair, List> pair : variableStorageConflicts .getOverlappingVariables()) { - monitor.checkCanceled(); + monitor.checkCancelled(); mergeVariableStorage(functions, pair, variableStorageChoice, monitor); } } else if (askUser && mergeManager != null) { for (Pair, List> pair : variableStorageConflicts .getOverlappingVariables()) { - monitor.checkCanceled(); + monitor.checkCancelled(); boolean useForAll = (variableStorageChoice != ASK_USER); if (useForAll) { mergeVariableStorage(functions, pair, variableStorageChoice, monitor); @@ -2170,7 +2170,7 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li else { for (Pair, List> pair : variableStorageConflicts .getOverlappingVariables()) { - monitor.checkCanceled(); + monitor.checkCancelled(); mergeVariableStorage(functions, pair, currentConflictOption, monitor); } } @@ -2192,7 +2192,7 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li choicesPanel.setConflictType("Function Parameter Signature"); setupConflictPanel(listingPanel, choicesPanel, externalLocations, monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { mergeParameters(functions, currentConflictOption, monitor); @@ -2212,7 +2212,7 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li else if (askUser && mergeManager != null) { Iterator iter = paramInfoConflicts.iterator(); while (iter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); ParamInfoConflict pc = iter.next(); boolean useForAll = (parameterInfoChoice != ASK_USER); if (useForAll) { @@ -2226,7 +2226,7 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li choicesPanel.setConflictType("Function Parameter Info"); setupConflictPanel(listingPanel, choicesPanel, externalLocations, monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); } } @@ -2244,7 +2244,7 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li } if (askUser && mergeManager != null) { for (LocalVariableConflict localVariableConflict : localVarConflicts) { - monitor.checkCanceled(); + monitor.checkCancelled(); ConflictPanel choicesPanel; if ((localVariableConflict.varConflicts & VAR_REMOVED) != 0) { currentExternalConflictType = @@ -2411,26 +2411,26 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li // Handle External Detail Conflicts if (externalDetailConflicts.contains(myAddress)) { - monitor.checkCanceled(); + monitor.checkCancelled(); handleExternalDetailsConflict(externalLocations, chosenConflictOption, monitor); } // Handle External Data Type Conflicts if (externalDataTypeConflicts.contains(myAddress)) { - monitor.checkCanceled(); + monitor.checkCancelled(); handleExternalDataTypeConflict(externalLocations, chosenConflictOption, monitor); } // Handle External Function versus Data Type Conflicts if (externalFunctionVersusDataTypeConflicts.contains(myAddress)) { - monitor.checkCanceled(); + monitor.checkCancelled(); handleExternalFunctionVersusDataTypeConflict(externalLocations, chosenConflictOption, monitor); } // Handle Detailed Function Conflicts if (funcSet.contains(myAddress)) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address myEntryPoint = myAddress; Function[] functions = getFunctions(externalLocations); updateExternalNameInfo(externalLocations, MY); @@ -2572,7 +2572,7 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li choicesPanel.setConflictType("External Details"); setupConflictPanel(listingMergePanel, choicesPanel, externalLocations, monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { // If we have a external details choice then a "Use For All" has already occurred. @@ -2613,7 +2613,7 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li choicesPanel.setConflictType("External Data Type"); setupConflictPanel(listingMergePanel, choicesPanel, externalLocations, monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { // If we have a external data type choice then a "Use For All" has already occurred. @@ -2641,7 +2641,7 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li choicesPanel.setConflictType("External Function Versus Data Type"); setupConflictPanel(listingMergePanel, choicesPanel, externalLocations, monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { // If we have a external function vs. data type choice then a "Use For All" has already occurred. @@ -2683,7 +2683,7 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li setupAddConflictPanel(addConflictPanel, choicesPanel, externalLocations[LATEST], externalLocations[MY], monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { // If we have a external add choice then a "Use For All" has already occurred. @@ -2733,7 +2733,7 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li choicesPanel.setConflictType("External Removal"); setupConflictPanel(listingMergePanel, choicesPanel, externalLocations, monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { // If we have a function remove choice then a "Use For All" has already occurred. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ExternalProgramMerger.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ExternalProgramMerger.java index ae7785e6d6..0c18e7a30d 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ExternalProgramMerger.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ExternalProgramMerger.java @@ -591,7 +591,7 @@ public class ExternalProgramMerger implements MergeResolver, ListingMergeConstan for (int conflictIndex = 0; conflictIndex < totalConflicts; conflictIndex++) { IDGroup idGroup = extPgms.get(conflictIndex); if ((externalProgramChoice == ASK_USER) && askUser && mergeManager != null) { - monitor.checkCanceled(); + monitor.checkCancelled(); showMergePanel(idGroup, monitor); } else { @@ -852,14 +852,14 @@ public class ExternalProgramMerger implements MergeResolver, ListingMergeConstan int transactionID = resultPgm.startTransaction(getDescription()); boolean commit = false; try { - monitor.checkCanceled(); + monitor.checkCancelled(); clearResolveInfo(); autoMerge(monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); mergeConflicts(ASK_USER, monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); clearConflictPanel(); showResolveInfo(); commit = true; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/FunctionMerger.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/FunctionMerger.java index 505923e3ed..d6b58dc067 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/FunctionMerger.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/FunctionMerger.java @@ -275,7 +275,7 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { // Auto-merge parts of functions where possible and determine conflicts. AddressIterator iter = possibleDetailConflicts.getAddresses(true); while (iter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); updateProgress((int) (DETAILS_CONFLICT_START + ((addressCount * DETAILS_CONFLICT_SIZE) / totalAddresses))); Address entry = iter.next(); @@ -334,7 +334,7 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { int count = 0; while (latestIter.hasNext()) { monitor.setProgress(count++); - monitor.checkCanceled(); + monitor.checkCancelled(); Address entry = latestIter.next(); Function originalFunc = functionManagers[ORIGINAL].getFunctionAt(entry); Function latestFunc = functionManagers[LATEST].getFunctionAt(entry); @@ -361,7 +361,7 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { int count = 0; while (latestIter.hasNext()) { monitor.setProgress(count++); - monitor.checkCanceled(); + monitor.checkCancelled(); Address entry = latestIter.next(); Function originalFunc = functionManagers[ORIGINAL].getFunctionAt(entry); Function latestFunc = functionManagers[LATEST].getFunctionAt(entry); @@ -384,7 +384,7 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { int count = 0; while (myIter.hasNext()) { monitor.setProgress(count++); - monitor.checkCanceled(); + monitor.checkCancelled(); Address entry = myIter.next(); Function originalFunc = functionManagers[ORIGINAL].getFunctionAt(entry); Function myFunc = functionManagers[MY].getFunctionAt(entry); @@ -409,12 +409,12 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { */ private void determineOverlapConflicts(AddressSet changeSet, TaskMonitor monitor) throws CancelledException { - monitor.checkCanceled(); + monitor.checkCancelled(); AddressSet alreadyChecked = new AddressSet(); AddressIterator iter = changeSet.getAddresses(true); // Look at every address where the Latest or My made a function change. while (iter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address changeEntry = iter.next(); // Entry Point of function being checked. if (overlapAddressSet.contains(changeEntry)) { continue; @@ -497,7 +497,7 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { private void determineBodyConflicts(AddressSetView addrs, TaskMonitor monitor) throws CancelledException { - monitor.checkCanceled(); + monitor.checkCancelled(); long totalAddresses = addrs.getNumAddresses(); monitor.initialize(totalAddresses); long granularity = (totalAddresses / 100) + 1; @@ -523,7 +523,7 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { private void determineBodyConflicts(Address entry, Function original, Function latest, Function my, TaskMonitor monitor) throws CancelledException { - monitor.checkCanceled(); + monitor.checkCancelled(); AddressSetView originalAddrs = (original != null) ? original.getBody() : null; AddressSetView latestAddrs = (latest != null) ? latest.getBody() : null; AddressSetView myAddrs = (my != null) ? my.getBody() : null; @@ -556,7 +556,7 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { private void determineRemoveConflicts(AddressSet possibleConflicts, TaskMonitor monitor) throws CancelledException { - monitor.checkCanceled(); + monitor.checkCancelled(); AddressSet myRemoveConflicts = removeMy.intersect(changeLatest).intersect(possibleConflicts); AddressSet latestRemoveConflicts = @@ -570,7 +570,7 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { private void determineThunkConflicts(Function[] functions, TaskMonitor monitor) throws CancelledException { - monitor.checkCanceled(); + monitor.checkCancelled(); boolean latestIsThunk = functions[LATEST].isThunk(); boolean myIsThunk = functions[MY].isThunk(); @@ -842,7 +842,7 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { setupAddressSetConflictPanel(listingPanel, choicesPanel, addr, overlapConflicts.get(addr), monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { // If we have a function overlap choice then a "Use For All" has already occurred. @@ -865,7 +865,7 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { setupAddressSetConflictPanel(listingPanel, choicesPanel, addr, getBodySet(addr), monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { // If we have a function body choice then a "Use For All" has already occurred. @@ -888,7 +888,7 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { choicesPanel.setConflictType("Function Removal"); setupConflictPanel(listingPanel, choicesPanel, addr, monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { // If we have a function remove choice then a "Use For All" has already occurred. @@ -930,7 +930,7 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { choicesPanel.setConflictType("Function Detail"); setupConflictPanel(listingPanel, choicesPanel, addr, monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { mergeFunctionDetails(functions, currentConflictOption, monitor); @@ -983,7 +983,7 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { choicesPanel.setConflictType("Function Return"); setupConflictPanel(listingPanel, choicesPanel, addr, monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { mergeFunctionReturn(functions, currentConflictOption, monitor); @@ -1000,14 +1000,14 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { if (variableStorageChoice != ASK_USER) { for (Pair, List> pair : variableStorageConflicts .getOverlappingVariables()) { - monitor.checkCanceled(); + monitor.checkCancelled(); mergeVariableStorage(addr, pair, variableStorageChoice, monitor); } } else if (askUser && mergeManager != null) { for (Pair, List> pair : variableStorageConflicts .getOverlappingVariables()) { - monitor.checkCanceled(); + monitor.checkCancelled(); boolean useForAll = (variableStorageChoice != ASK_USER); if (useForAll) { mergeVariableStorage(addr, pair, variableStorageChoice, monitor); @@ -1025,7 +1025,7 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { else { for (Pair, List> pair : variableStorageConflicts .getOverlappingVariables()) { - monitor.checkCanceled(); + monitor.checkCancelled(); mergeVariableStorage(addr, pair, currentConflictOption, monitor); } } @@ -1047,7 +1047,7 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { choicesPanel.setConflictType("Function Parameter Signature"); setupConflictPanel(listingPanel, choicesPanel, addr, monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { mergeParameters(addr, currentConflictOption, monitor); @@ -1067,7 +1067,7 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { else if (askUser && mergeManager != null) { Iterator iter = paramInfoConflicts.iterator(); while (iter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); ParamInfoConflict pc = iter.next(); boolean useForAll = (parameterInfoChoice != ASK_USER); if (useForAll) { @@ -1080,7 +1080,7 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { choicesPanel.setConflictType("Function Parameter Info"); setupConflictPanel(listingPanel, choicesPanel, pc.entry, monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); } } @@ -1098,7 +1098,7 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { } if (askUser && mergeManager != null) { for (LocalVariableConflict localVariableConflict : localVarConflicts) { - monitor.checkCanceled(); + monitor.checkCancelled(); ConflictPanel choicesPanel = null; if ((localVariableConflict.varConflicts & VAR_REMOVED) != 0) { currentConflictType = FunctionConflictType.REMOVED_LOCAL_VARIABLE_CONFLICT; @@ -1187,12 +1187,12 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { choicesPanel.setConflictType("Thunk Function"); setupConflictPanel(listingPanel, choicesPanel, thunkConflictAddress, monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { merge(thunkConflictAddress, currentConflictOption, monitor); } - monitor.checkCanceled(); + monitor.checkCancelled(); } showResolveErrors(ERROR_TITLE); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/FunctionTagListingMerger.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/FunctionTagListingMerger.java index 4f4a68088b..194b7cb46d 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/FunctionTagListingMerger.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/FunctionTagListingMerger.java @@ -210,7 +210,7 @@ public class FunctionTagListingMerger extends AbstractListingMerger { else { showMergePanel(listingPanel, addr, id, monitor); } - monitor.checkCanceled(); + monitor.checkCancelled(); } } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/FunctionTagMerger.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/FunctionTagMerger.java index 03ccec54df..e3c142f09b 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/FunctionTagMerger.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/FunctionTagMerger.java @@ -194,7 +194,7 @@ public class FunctionTagMerger implements MergeResolver, ListingMergeConstants { monitor.initialize(totalConflicts); for (long id : tagConflicts.keySet()) { if ((conflictChoice == ASK_USER) && askUser && mergeManager != null) { - monitor.checkCanceled(); + monitor.checkCancelled(); currentlyMergingTagID = id; showMergePanel(id, monitor); } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ProgramContextMergeManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ProgramContextMergeManager.java index 49ea0068d8..aa988b599c 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ProgramContextMergeManager.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ProgramContextMergeManager.java @@ -221,7 +221,7 @@ public class ProgramContextMergeManager implements MergeResolver, ListingMergeCo mergeManager.updateProgress(currentProgressPercentage, "Merging register values for " + regName); monitor.setProgress(i); - monitor.checkCanceled(); + monitor.checkCancelled(); rmm = new RegisterMergeManager(regName, mergeManager, resultPgm, originalPgm, latestPgm, myPgm, latestChanges, myChanges); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ReferenceMerger.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ReferenceMerger.java index ce3f2e108b..48bba1faf3 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ReferenceMerger.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ReferenceMerger.java @@ -571,7 +571,7 @@ class ReferenceMerger extends AbstractListingMerger { opIndexes = new ArrayList<>(); typeConflicts.put(address, opIndexes); } - opIndexes.add(new Integer(opIndex)); + opIndexes.add(Integer.valueOf(opIndex)); conflictSet.addRange(address, address); } @@ -599,7 +599,7 @@ class ReferenceMerger extends AbstractListingMerger { opIndexes = new ArrayList<>(); primaryConflicts.put(address, opIndexes); } - opIndexes.add(new Integer(opIndex)); + opIndexes.add(Integer.valueOf(opIndex)); conflictSet.addRange(address, address); } @@ -735,7 +735,7 @@ class ReferenceMerger extends AbstractListingMerger { if (opIndexList == null || opIndexList.size() == 0) { return; } - if (opIndexList.contains(new Integer(opIndex))) { + if (opIndexList.contains(Integer.valueOf(opIndex))) { currentReference = null; currentAddress = addr; currentOpIndex = opIndex; @@ -748,7 +748,7 @@ class ReferenceMerger extends AbstractListingMerger { else { if (askUser && mergeManager != null) { showConflictPanel(listingPanel, TYPE_CONFLICT); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { resolveTypeConflict(addr, opIndex, chosenConflictOption); @@ -779,7 +779,7 @@ class ReferenceMerger extends AbstractListingMerger { else { if (askUser && mergeManager != null) { showConflictPanel(listingPanel, REMOVE_CONFLICT); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { resolveRemoveVsChange(currentReference, chosenConflictOption); @@ -811,7 +811,7 @@ class ReferenceMerger extends AbstractListingMerger { else { if (askUser && mergeManager != null) { showConflictPanel(listingPanel, CHANGE_CONFLICT); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { resolveChangeConflict(currentReference, chosenConflictOption); @@ -846,7 +846,7 @@ class ReferenceMerger extends AbstractListingMerger { else { if (askUser && mergeManager != null) { showConflictPanel(listingPanel, ADD_CONFLICT); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { resolveAddConflict(currentReference, chosenConflictOption); @@ -863,7 +863,7 @@ class ReferenceMerger extends AbstractListingMerger { if (opIndexList == null || opIndexList.size() == 0) { return; } - if (opIndexList.contains(new Integer(opIndex))) { + if (opIndexList.contains(Integer.valueOf(opIndex))) { // Check that the conflict still exists. It may have gotten resolved via another conflict. if (!hasPrimaryConflict(addr, opIndex)) { return; @@ -880,7 +880,7 @@ class ReferenceMerger extends AbstractListingMerger { else { if (askUser && mergeManager != null) { showConflictPanel(listingPanel, PRIMARY_CONFLICT); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { resolvePrimaryConflict(addr, opIndex, chosenConflictOption); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/RegisterMergeManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/RegisterMergeManager.java index cc39f09456..afd59d8aa3 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/RegisterMergeManager.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/RegisterMergeManager.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. @@ -536,7 +535,7 @@ class RegisterMergeManager implements ListingMergeConstants { } } - monitor.checkCanceled(); + monitor.checkCancelled(); } return conflicts.toArray(new AddressRange[conflicts.size()]); } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/SymbolMerger.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/SymbolMerger.java index be0f160149..1a94a410d3 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/SymbolMerger.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/SymbolMerger.java @@ -399,7 +399,7 @@ class SymbolMerger extends AbstractListingMerger { tempLatestChangeIDs.length); Arrays.sort(this.latestChangeIDs); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.setProgress(monitor.getProgress() + 1); getPrimariesAdded(this.myAddIDs, mySymTab, myPrimaryAddIDs, mySetPrimary); getPrimariesAdded(this.latestAddIDs, latestSymTab, latestPrimaryAddIDs, latestSetPrimary); @@ -419,7 +419,7 @@ class SymbolMerger extends AbstractListingMerger { long[] uniqueIDs = new long[first.length]; int u = 0; for (long element : first) { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.setProgress(monitor.getProgress() + 1); boolean matched = false; for (long element2 : second) { @@ -639,7 +639,7 @@ class SymbolMerger extends AbstractListingMerger { if (currentMonitor != monitor) { currentMonitor = monitor; } - monitor.checkCanceled(); + monitor.checkCancelled(); setupSymbolChanges(monitor); // Creates ID arrays used by processing methods. @@ -754,7 +754,7 @@ class SymbolMerger extends AbstractListingMerger { monitor.initialize(list.size()); for (int i = 0; i < list.size(); i++) { monitor.setProgress(i); - monitor.checkCanceled(); + monitor.checkCancelled(); long id = list.get(i); Symbol resultSymbol = resultSymTab.getSymbol(id); if (resultSymbol == null) { @@ -790,7 +790,7 @@ class SymbolMerger extends AbstractListingMerger { monitor.initialize(len); for (int i = 0; i < len; i++) { monitor.setProgress(i); - monitor.checkCanceled(); + monitor.checkCancelled(); long id = myRemoveIDs[i]; Symbol originalSym = originalSymTab.getSymbol(id); SymbolType originalType = originalSym.getSymbolType(); @@ -829,7 +829,7 @@ class SymbolMerger extends AbstractListingMerger { monitor.initialize(len); for (int i = 0; i < len; i++) { monitor.setProgress(i); - monitor.checkCanceled(); + monitor.checkCancelled(); incrementProgress(1); long id = myModifiedIDs[i]; Symbol mySym = mySymTab.getSymbol(id); @@ -1027,7 +1027,7 @@ class SymbolMerger extends AbstractListingMerger { monitor.initialize(len); for (int i = 0; i < len; i++) { monitor.setProgress(i); - monitor.checkCanceled(); + monitor.checkCancelled(); incrementProgress(1); long id = myAnchorChangeIDs[i]; Symbol mySym = mySymTab.getSymbol(id); @@ -1051,7 +1051,7 @@ class SymbolMerger extends AbstractListingMerger { AddressIterator iter = mySetPrimary.getAddresses(true); while (iter.hasNext()) { monitor.incrementProgress(1); - monitor.checkCanceled(); + monitor.checkCancelled(); incrementProgress(1); Address addr = iter.next(); Symbol myPrimary = mySymTab.getPrimarySymbol(addr); @@ -1092,7 +1092,7 @@ class SymbolMerger extends AbstractListingMerger { int len = myAddIDs.length; monitor.initialize(len); for (int i = 0; i < len; i++) { - monitor.checkCanceled(); + monitor.checkCancelled(); incrementProgress(1); monitor.incrementProgress(1); long id = myAddIDs[i]; @@ -1205,7 +1205,7 @@ class SymbolMerger extends AbstractListingMerger { MultiAddressIterator multiIter = new MultiAddressIterator(new AddressIterator[] { originalIter, latestIter, myIter }); while (multiIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address[] addrs = multiIter.nextAddresses(); if (addrs[0] != null) { if (addrs[1] == null || addrs[2] == null) { @@ -1232,7 +1232,7 @@ class SymbolMerger extends AbstractListingMerger { // Remove entry points if possible. AddressIterator iter = removeEntryPts.getAddresses(true); while (iter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address addr = iter.next(); tempResultSymTab.removeExternalEntryPoint(addr); incrementProgress(1); @@ -1240,7 +1240,7 @@ class SymbolMerger extends AbstractListingMerger { // Add entry points if possible. iter = addEntryPts.getAddresses(true); while (iter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address addr = iter.next(); tempResultSymTab.addExternalEntryPoint(addr); incrementProgress(1); @@ -1515,18 +1515,18 @@ class SymbolMerger extends AbstractListingMerger { public void merge(int progressMinimum, int progressMaximum, TaskMonitor monitor) throws ProgramConflictException, MemoryAccessException, CancelledException { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.setProgress(0); clearResolveInfo(); autoMerge(progressMinimum, progressMaximum, monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); mergeConflicts(monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); processDeferredRemoves(monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); infoBuf.append(getDeferredRemovesInfo()); infoBuf.append(getRenamedConflictsInfo()); - monitor.checkCanceled(); + monitor.checkCancelled(); showResolveInfo(); } @@ -2919,15 +2919,15 @@ class SymbolMerger extends AbstractListingMerger { private final static long serialVersionUID = 1; public boolean add(long l) { - return super.add(new Long(l)); + return super.add(Long.valueOf(l)); } public boolean contains(long l) { - return super.contains(new Long(l)); + return super.contains(Long.valueOf(l)); } public boolean remove(long l) { - return super.remove(new Long(l)); + return super.remove(Long.valueOf(l)); } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/UserDefinedPropertyMerger.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/UserDefinedPropertyMerger.java index 8e2e3173c0..c33250c266 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/UserDefinedPropertyMerger.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/UserDefinedPropertyMerger.java @@ -339,7 +339,7 @@ class UserDefinedPropertyMerger extends AbstractListingMerger { // Address addr = (Address) propIter.next(); // if (sameOption[propIndex] == ASK_USER && mergeManager != null) { // showMergePanel(listingPanel, propertyName, addr); -// monitor.checkCanceled(); +// monitor.checkCancelled(); // } // else { // merge(propertyName, addr, sameOption[propIndex]); @@ -365,7 +365,7 @@ class UserDefinedPropertyMerger extends AbstractListingMerger { } if (sameOption[propertyIndex] == ASK_USER && mergeManager != null) { showMergePanel(listingPanel, propertyName, addr); - monitor.checkCanceled(); + monitor.checkCancelled(); } else { merge(propertyName, addr, sameOption[propertyIndex]); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/propertylist/PropertyListMergeManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/propertylist/PropertyListMergeManager.java index 8e8aeb928b..76dc92eec8 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/propertylist/PropertyListMergeManager.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/propertylist/PropertyListMergeManager.java @@ -361,13 +361,13 @@ public class PropertyListMergeManager implements MergeResolver { return options.getBoolean(propertyName, false) ? Boolean.TRUE : Boolean.FALSE; case DOUBLE_TYPE: - return new Double(options.getDouble(propertyName, 0d)); + return Double.valueOf(options.getDouble(propertyName, 0d)); case INT_TYPE: - return new Integer(options.getInt(propertyName, 0)); + return Integer.valueOf(options.getInt(propertyName, 0)); case LONG_TYPE: - return new Long(options.getLong(propertyName, 0L)); + return Long.valueOf(options.getLong(propertyName, 0L)); case NO_TYPE: return null; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/tree/ProgramTreeMergeManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/tree/ProgramTreeMergeManager.java index fe0cc8a660..f874237217 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/tree/ProgramTreeMergeManager.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/tree/ProgramTreeMergeManager.java @@ -154,14 +154,14 @@ public class ProgramTreeMergeManager implements MergeResolver { "Program Tree Merge is processing IDs changed in Checked Out..."); ArrayList changeList = new ArrayList(); for (long myChangeID : myChangeIDs) { - changeList.add(new Long(myChangeID)); + changeList.add(Long.valueOf(myChangeID)); } mergeManager.updateProgress(10, "Program Tree Merge is processing IDs added in Checked Out..."); ArrayList myAddedList = new ArrayList(); for (long element : myIDsAdded) { - myAddedList.add(new Long(element)); + myAddedList.add(Long.valueOf(element)); } mergeManager.updateProgress(20, "Program Tree Merge is eliminating removed IDs..."); @@ -171,7 +171,7 @@ public class ProgramTreeMergeManager implements MergeResolver { mergeManager.updateProgress(30, "Program Tree Merge is processing IDs added in Latest..."); ArrayList latestAddedList = new ArrayList(); for (long element : latestIDsAdded) { - latestAddedList.add(new Long(element)); + latestAddedList.add(Long.valueOf(element)); } conflictsChangeList = new ArrayList(changeList); @@ -179,7 +179,7 @@ public class ProgramTreeMergeManager implements MergeResolver { mergeManager.updateProgress(40, "Program Tree Merge is processing change IDs..."); ArrayList latestChangeList = new ArrayList(); for (long latestChangeID : latestChangeIDs) { - latestChangeList.add(new Long(latestChangeID)); + latestChangeList.add(Long.valueOf(latestChangeID)); } mergeManager.updateProgress(50, diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AbstractDemanglerAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AbstractDemanglerAnalyzer.java index 6ca40bb4e2..d78a2a7836 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AbstractDemanglerAnalyzer.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AbstractDemanglerAnalyzer.java @@ -115,7 +115,7 @@ public abstract class AbstractDemanglerAnalyzer extends AbstractAnalyzer { // consider copying primary symbols to alt storage for iteration SymbolIterator it = symbolTable.getPrimarySymbolIterator(set, true); while (it.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); if (++count % 100 == 0) { monitor.setMessage(baseMonitorMessage + " - " + count + " symbols"); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AutoAnalysisManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AutoAnalysisManager.java index e60e59ed12..add58bad86 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AutoAnalysisManager.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AutoAnalysisManager.java @@ -1369,11 +1369,11 @@ public class AutoAnalysisManager implements DomainObjectListener, DomainObjectCl throw new UnsupportedOperationException( "AutoAnalysisManager.scheduleWorker may not be invoked from Swing thread"); } - workerMonitor.checkCanceled(); + workerMonitor.checkCancelled(); AnalysisWorkerCommand cmd = new AnalysisWorkerCommand(worker, workerContext, analyzeChanges, workerMonitor); - workerMonitor.checkCanceled(); + workerMonitor.checkCancelled(); // NOTE: It is very important that the worker cmd not run concurrent with analysis if (SystemUtilities.isInHeadlessMode()) { @@ -1402,7 +1402,7 @@ public class AutoAnalysisManager implements DomainObjectListener, DomainObjectCl } } - workerMonitor.checkCanceled(); + workerMonitor.checkCancelled(); Msg.debug(this, "Analysis worker completed (" + cmd.worker.getWorkerName() + "): " + cmd.worker.getClass()); @@ -1556,11 +1556,11 @@ public class AutoAnalysisManager implements DomainObjectListener, DomainObjectCl public long getMaximum() { return Math.max(primaryMonitor.getMaximum(), secondaryMonitor.getMaximum()); } - + @Override public void checkCanceled() throws CancelledException { - primaryMonitor.checkCanceled(); - secondaryMonitor.checkCanceled(); + primaryMonitor.checkCancelled(); + secondaryMonitor.checkCancelled(); } @Override @@ -1603,8 +1603,8 @@ public class AutoAnalysisManager implements DomainObjectListener, DomainObjectCl @Override public void clearCanceled() { - primaryMonitor.clearCanceled(); - secondaryMonitor.clearCanceled(); + primaryMonitor.clearCancelled(); + secondaryMonitor.clearCancelled(); } } @@ -1747,7 +1747,7 @@ public class AutoAnalysisManager implements DomainObjectListener, DomainObjectCl analysisMonitor.removeCancelledListener(this); analysisMonitor.setCancelEnabled(true); // prevent cancel from affecting other queued analysis - analysisMonitor.clearCanceled(); + analysisMonitor.clearCancelled(); } synchronized (this) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/ConstantPropagationAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/ConstantPropagationAnalyzer.java index c8c1b0f931..8d0055700a 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/ConstantPropagationAnalyzer.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/ConstantPropagationAnalyzer.java @@ -252,7 +252,7 @@ public class ConstantPropagationAnalyzer extends AbstractAnalyzer { AddressSet inBodySet = new AddressSet(); Iterator fiter = program.getFunctionManager().getFunctionsOverlapping(set); while (fiter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Function function = fiter.next(); locations.add(function.getEntryPoint()); inBodySet.add(function.getBody()); @@ -268,7 +268,7 @@ public class ConstantPropagationAnalyzer extends AbstractAnalyzer { AddressSet outOfBodySet = new AddressSet(); while (referenceDestinationIterator.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address address = referenceDestinationIterator.next(); ReferenceIterator referencesTo = referenceManager.getReferencesTo(address); while (referencesTo.hasNext()) { @@ -290,7 +290,7 @@ public class ConstantPropagationAnalyzer extends AbstractAnalyzer { outOfBodySet = new AddressSet(); AddressRangeIterator addressRanges = set.getAddressRanges(); while (addressRanges.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); AddressRange addressRange = addressRanges.next(); locations.add(addressRange.getMinAddress()); outOfBodySet.add(addressRange.getMinAddress()); @@ -315,7 +315,7 @@ public class ConstantPropagationAnalyzer extends AbstractAnalyzer { protected AddressSetView runAddressAnalysis(final Program program, final Set
locations, final TaskMonitor monitor) throws CancelledException, InterruptedException, Exception { - monitor.checkCanceled(); + monitor.checkCancelled(); final AddressSet analyzedSet = new AddressSet(); if (locations.isEmpty()) { @@ -391,7 +391,7 @@ public class ConstantPropagationAnalyzer extends AbstractAnalyzer { Listing listing = program.getListing(); int count = 0; while (!todoSet.isEmpty()) { - monitor.checkCanceled(); + monitor.checkCancelled(); if ((count++ % NOTIFICATION_INTERVAL) == 0) { monitor.setProgress(totalNumAddresses - todoSet.getNumAddresses()); @@ -446,7 +446,7 @@ public class ConstantPropagationAnalyzer extends AbstractAnalyzer { public AddressSetView analyzeLocation(final Program program, Address start, AddressSetView set, final TaskMonitor monitor) throws CancelledException { - monitor.checkCanceled(); + monitor.checkCancelled(); // get the function body if (program.getListing().getInstructionAt(start) == null) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/FindNoReturnFunctionsAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/FindNoReturnFunctionsAnalyzer.java index 78f8b4a64b..8625a826df 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/FindNoReturnFunctionsAnalyzer.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/FindNoReturnFunctionsAnalyzer.java @@ -120,7 +120,7 @@ public class FindNoReturnFunctionsAnalyzer extends AbstractAnalyzer { // mark all detected non-returning functions AddressIterator noreturns = noReturnSet.getAddresses(true); for (Address address : noreturns) { - monitor.checkCanceled(); + monitor.checkCancelled(); setFunctionNonReturning(program, address); @@ -317,7 +317,7 @@ public class FindNoReturnFunctionsAnalyzer extends AbstractAnalyzer { AddressIterator refIter = cp.getReferenceManager().getReferenceSourceIterator(checkSet, true); for (Address address : refIter) { - monitor.checkCanceled(); + monitor.checkCancelled(); // instruction may have already been checked from a non-returning call if (checkedSet.contains(address)) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/MachoFunctionStartsAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/MachoFunctionStartsAnalyzer.java index 7b8ace962c..187a01b478 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/MachoFunctionStartsAnalyzer.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/MachoFunctionStartsAnalyzer.java @@ -207,7 +207,7 @@ public class MachoFunctionStartsAnalyzer extends AbstractAnalyzer { monitor.initialize(mappedImages.size()); for (DyldCacheImage mappedImage : mappedImages) { String name = new File(mappedImage.getPath()).getName(); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.setMessage("Analyzing function starts for " + name + "..."); monitor.incrementProgress(1); @@ -274,7 +274,7 @@ public class MachoFunctionStartsAnalyzer extends AbstractAnalyzer { List commands = header.getLoadCommands(FunctionStartsCommand.class); for (FunctionStartsCommand cmd : commands) { for (Address addr : cmd.findFunctionStartAddrs(provider, textSegmentAddr)) { - monitor.checkCanceled(); + monitor.checkCancelled(); if (!set.contains(textSegmentAddr)) { continue; } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/OperandReferenceAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/OperandReferenceAnalyzer.java index b87685ff9c..c5baa55b4e 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/OperandReferenceAnalyzer.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/OperandReferenceAnalyzer.java @@ -234,7 +234,7 @@ public class OperandReferenceAnalyzer extends AbstractAnalyzer { AddressSet checkedTargets = new AddressSet(); while (iter.hasNext() && !newCodeFound) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address addr = iter.next(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/validator/PercentAnalyzedValidator.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/validator/PercentAnalyzedValidator.java index 2e49505f44..8faa0313e6 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/validator/PercentAnalyzedValidator.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/validator/PercentAnalyzedValidator.java @@ -93,7 +93,7 @@ public class PercentAnalyzedValidator extends PostAnalysisValidator { instCount += length; } - monitor.checkCanceled(); + monitor.checkCancelled(); DataIterator dataIter = prog.getListing().getData(execMemSetInitialized, true); int dataCount = 0; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bookmark/BookmarkTableModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bookmark/BookmarkTableModel.java index 4dfe3c188b..c8dba46fa7 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bookmark/BookmarkTableModel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bookmark/BookmarkTableModel.java @@ -99,7 +99,7 @@ class BookmarkTableModel extends AddressBasedTableModel { monitor.initialize(getIteratorKeyCount()); int i = 0; while (it.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.setProgress(i++); long key = it.next(); accumulator.add(new BookmarkRowObject(key)); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/CallNode.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/CallNode.java index 8baa644c03..1574a7bf26 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/CallNode.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/CallNode.java @@ -80,7 +80,7 @@ public abstract class CallNode extends GTreeSlowLoadingNode { ReferenceManager referenceManager = program.getReferenceManager(); AddressIterator addressIterator = addresses.getAddresses(true); while (addressIterator.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address address = addressIterator.next(); Reference[] referencesFrom = referenceManager.getReferencesFrom(address); if (referencesFrom != null) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/IncomingCallNode.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/IncomingCallNode.java index 48a45c90e0..7dafe5b8aa 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/IncomingCallNode.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/IncomingCallNode.java @@ -93,7 +93,7 @@ public class IncomingCallNode extends CallNode { LazyMap.lazyMap(new HashMap<>(), k -> new ArrayList<>()); FunctionManager functionManager = program.getFunctionManager(); for (Address fromAddress : addresses) { - monitor.checkCanceled(); + monitor.checkCancelled(); Function callerFunction = functionManager.getFunctionContaining(fromAddress); if (callerFunction == null) { continue; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/OutgoingCallNode.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/OutgoingCallNode.java index cac2031e5a..885fc0e1d9 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/OutgoingCallNode.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/OutgoingCallNode.java @@ -82,7 +82,7 @@ public abstract class OutgoingCallNode extends CallNode { LazyMap.lazyMap(new HashMap<>(), k -> new ArrayList<>()); FunctionManager functionManager = program.getFunctionManager(); for (Reference reference : references) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address toAddress = reference.getToAddress(); if (toAddress.equals(entryPoint)) { continue; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clear/ClearCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clear/ClearCmd.java index 0e6e20e34b..5342a94aa8 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clear/ClearCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clear/ClearCmd.java @@ -163,7 +163,7 @@ public class ClearCmd extends BackgroundCommand { Address rangeMin = range.getMinAddress(); SymbolIterator symbolIter = symbolTable.getSymbolIterator(rangeMin, true); while (symbolIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Symbol s = symbolIter.next(); if (s.getAddress().compareTo(range.getMaxAddress()) > 0) { break; // done with range @@ -201,7 +201,7 @@ public class ClearCmd extends BackgroundCommand { int progress = 0; while (iter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); AddressRange range = iter.next(); listing.clearComments(range.getMinAddress(), range.getMaxAddress()); progress += range.getLength(); @@ -238,7 +238,7 @@ public class ClearCmd extends BackgroundCommand { FunctionIterator iter = manager.getFunctions(clearView, true); while (iter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Function func = iter.next(); monitor.incrementProgress(1); manager.removeFunction(func.getEntryPoint()); @@ -267,7 +267,7 @@ public class ClearCmd extends BackgroundCommand { Iterator iter = eqtbl.getEquates(); while (iter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Equate eq = iter.next(); EquateReference[] refs = eq.getReferences(); @@ -354,7 +354,7 @@ public class ClearCmd extends BackgroundCommand { private void removeRegisters(ProgramContext pc, AddressRange range, TaskMonitor monitor) throws CancelledException { for (Register reg : pc.getRegistersWithValues()) { - monitor.checkCanceled(); + monitor.checkCancelled(); if (reg.isProcessorContext()) { continue; // skip context register @@ -372,7 +372,7 @@ public class ClearCmd extends BackgroundCommand { Set sourceTypesToClear, TaskMonitor monitor) throws CancelledException { while (iter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address addr = iter.next(); Reference[] refs = refMgr.getReferencesFrom(addr); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clear/ClearFlowAndRepairCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clear/ClearFlowAndRepairCmd.java index b767ed8591..f20881e899 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clear/ClearFlowAndRepairCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clear/ClearFlowAndRepairCmd.java @@ -102,7 +102,7 @@ public class ClearFlowAndRepairCmd extends BackgroundCommand { clearSet = new AddressSet(); while (cuIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); CodeUnit cu = cuIter.next(); if (cu instanceof Instruction) { Instruction instr = (Instruction) cu; @@ -157,7 +157,7 @@ public class ClearFlowAndRepairCmd extends BackgroundCommand { HashSet
ptrDestinations = new HashSet<>(); while (!todoStarts.isEmpty()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address addr = todoStarts.pop(); if (clearSet.contains(addr)) { continue; @@ -214,7 +214,7 @@ public class ClearFlowAndRepairCmd extends BackgroundCommand { SymbolTable symTable = program.getSymbolTable(); Iterator
iter = ptrDestinations.iterator(); while (iter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address addr = iter.next(); Symbol[] syms = symTable.getSymbols(addr); for (Symbol sym : syms) { @@ -259,7 +259,7 @@ public class ClearFlowAndRepairCmd extends BackgroundCommand { ReferenceIterator refIter = refMgr.getReferencesTo(destAddr); while (refIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Reference ref = refIter.next(); RefType refType = ref.getReferenceType(); if (refType instanceof FlowType) { @@ -290,7 +290,7 @@ public class ClearFlowAndRepairCmd extends BackgroundCommand { AddressIterator fromAddrIter = refMgr.getReferenceSourceIterator(refFromSet, true); while (fromAddrIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address fromAddr = fromAddrIter.next(); @@ -319,7 +319,7 @@ public class ClearFlowAndRepairCmd extends BackgroundCommand { boolean clearIt = true; ReferenceIterator refIter = refMgr.getReferencesTo(toAddr); while (refIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Reference ref = refIter.next(); if (!clearSet.contains(ref.getFromAddress())) { clearIt = false; @@ -423,13 +423,13 @@ public class ClearFlowAndRepairCmd extends BackgroundCommand { } AddressIterator addrIter = refMgr.getReferenceDestinationIterator(clearSet, true); while (addrIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address addr = addrIter.next(); ReferenceIterator refIter = refMgr.getReferencesTo(addr); Address dataRefAddr = null; while (refIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Reference ref = refIter.next(); RefType refType = ref.getReferenceType(); if (refType.isFlow()) { @@ -464,7 +464,7 @@ public class ClearFlowAndRepairCmd extends BackgroundCommand { // get any in the clear set that were entry points AddressIterator aiter = clearSet.getAddresses(true); while (aiter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address addr = aiter.next(); if (program.getSymbolTable().isExternalEntryPoint(addr)) { disassemblePoints.addRange(addr, addr); @@ -478,7 +478,7 @@ public class ClearFlowAndRepairCmd extends BackgroundCommand { cmd.setSeedContext(seedContext); cmd.applyTo(program, monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); // Analyze new data reference points (DisassembleCommand has already analyzed code) AutoAnalysisManager analysisMgr = AutoAnalysisManager.getAnalysisManager(program); @@ -503,7 +503,7 @@ public class ClearFlowAndRepairCmd extends BackgroundCommand { AddressRangeIterator rangeIter = clearSet.getAddressRanges(); while (rangeIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); AddressRange range = rangeIter.next(); Address addr = range.getMinAddress(); int searchCnt = 0; @@ -572,7 +572,7 @@ public class ClearFlowAndRepairCmd extends BackgroundCommand { Iterator fnIter = fnMgr.getFunctionsOverlapping(sub); while (fnIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Function f = fnIter.next(); if (!starts.contains(f.getEntryPoint())) { Msg.warn(this, @@ -583,7 +583,7 @@ public class ClearFlowAndRepairCmd extends BackgroundCommand { fnIter = fnMgr.getFunctionsOverlapping(sub); while (fnIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Function f = fnIter.next(); if (starts.remove(f.getEntryPoint())) { AddressSetView oldBody = f.getBody(); @@ -606,7 +606,7 @@ public class ClearFlowAndRepairCmd extends BackgroundCommand { Iterator
entryIter = starts.iterator(); while (entryIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address entry = entryIter.next(); CreateFunctionCmd cmd = new CreateFunctionCmd(entry); cmd.applyTo(program, monitor); @@ -670,7 +670,7 @@ public class ClearFlowAndRepairCmd extends BackgroundCommand { // Follow start block flow and build graph while (!todoVertices.isEmpty()) { - monitor.checkCanceled(); + monitor.checkCancelled(); BlockVertex fromVertex = todoVertices.pop(); CodeBlock fromBlock = fromVertex.block; if (protectedSet.contains(fromBlock.getMinAddress())) { @@ -685,7 +685,7 @@ public class ClearFlowAndRepairCmd extends BackgroundCommand { findDestAddrs(fromBlock, destAddrs); // Needed for detecting offcut flows } while (blockRefIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); CodeBlockReference cbRef = blockRefIter.next(); Address blockAddr = cbRef.getReference(); @@ -744,7 +744,7 @@ public class ClearFlowAndRepairCmd extends BackgroundCommand { FunctionManager functionManager = program.getFunctionManager(); Iterator vertexIter = vertexMap.values().iterator(); while (vertexIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); BlockVertex v = vertexIter.next(); if (v == startVertex || v.srcVertices.isEmpty()) { continue; @@ -768,7 +768,7 @@ public class ClearFlowAndRepairCmd extends BackgroundCommand { continue; } while (refIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Reference ref = refIter.next(); Address fromAddr = ref.getFromAddress(); RefType refType = ref.getReferenceType(); @@ -819,7 +819,7 @@ public class ClearFlowAndRepairCmd extends BackgroundCommand { Listing listing = program.getListing(); InstructionIterator iter = listing.getInstructions(destBlock.getMinAddress(), true); while (iter.hasNext() && offcutStart == null) { - monitor.checkCanceled(); + monitor.checkCancelled(); Instruction nextInstr = iter.next(); Address nextInstrAddr = nextInstr.getMinAddress(); if (nextInstrAddr.compareTo(blockEnd) > 0) { @@ -846,7 +846,7 @@ public class ClearFlowAndRepairCmd extends BackgroundCommand { Program program = offcutInstr.getProgram(); Listing listing = program.getListing(); - monitor.checkCanceled(); + monitor.checkCancelled(); // Record outgoing flows as new starts for clearing Reference[] refs = offcutInstr.getReferencesFrom(); @@ -897,7 +897,7 @@ public class ClearFlowAndRepairCmd extends BackgroundCommand { // Check data fall-through locations for bookmarks Listing listing = program.getListing(); for (AddressRange range : set.getAddressRanges()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address maxAddr = range.getMaxAddress(); Instruction lastInstr = listing.getInstructionContaining(maxAddr); if (lastInstr == null) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/CodeBrowserSelectionPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/CodeBrowserSelectionPlugin.java index ed427d83e5..400385b58f 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/CodeBrowserSelectionPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/CodeBrowserSelectionPlugin.java @@ -176,7 +176,7 @@ public class CodeBrowserSelectionPlugin extends Plugin { "\"."); break; } - monitor.checkCanceled(); + monitor.checkCancelled(); CodeUnit cu = iterator.next(); accumulator.add(cu.getMinAddress()); monitor.incrementProgress(cu.getLength()); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompEditorModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompEditorModel.java index 3621575fde..b7d68a724c 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompEditorModel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompEditorModel.java @@ -414,7 +414,7 @@ public abstract class CompEditorModel extends CompositeEditorModel { monitor.initialize(entries); for (int rowIndex = endRowIndex; rowIndex >= startRowIndex; rowIndex--) { - monitor.checkCanceled(); + monitor.checkCancelled(); int componentOrdinal = convertRowToOrdinal(rowIndex); ordinals.add(componentOrdinal); if (componentOrdinal < row) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/StructureEditorModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/StructureEditorModel.java index da56b5b09b..6175f188c6 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/StructureEditorModel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/StructureEditorModel.java @@ -920,7 +920,7 @@ class StructureEditorModel extends CompEditorModel { try { for (int i = 0; i < numCopies; i++) { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.setMessage("Inserting " + (i + 1) + " of " + numCopies); viewComposite.insert(componentOrdinal, dataType, length); monitor.incrementProgress(1); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/UnionEditorModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/UnionEditorModel.java index 4259e228a4..329e481068 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/UnionEditorModel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/UnionEditorModel.java @@ -398,7 +398,7 @@ class UnionEditorModel extends CompEditorModel { monitor.initialize(numCopies); for (int i = 0; i < numCopies; i++) { - monitor.checkCanceled(); + monitor.checkCancelled(); insert(rowIndex + i, dataType, length, null, null); monitor.incrementProgress(1); } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/DataSettingsDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/DataSettingsDialog.java index 41ba8db891..73cc281286 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/DataSettingsDialog.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/DataSettingsDialog.java @@ -143,7 +143,7 @@ public class DataSettingsDialog extends AbstractSettingsDialog { } while (!defClasses.isEmpty() && definedData.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); d = definedData.next(); removeMissingDefinitions(defClasses, defs, d.getDataType().getSettingsDefinitions()); @@ -170,7 +170,7 @@ public class DataSettingsDialog extends AbstractSettingsDialog { int fromIndex = from[from.length - 1]; int toIndex = to[to.length - 1]; for (int i = fromIndex; i <= toIndex; i++) { - monitor.checkCanceled(); + monitor.checkCancelled(); dataComp = parent.getComponent(i); if (dataComp == null) { break; @@ -253,7 +253,7 @@ public class DataSettingsDialog extends AbstractSettingsDialog { if (interiorSelection == null) { DataIterator definedData = program.getListing().getDefinedData(selection, true); while (definedData.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Data d = definedData.next(); applySettingsToData(dlg, d); monitor.incrementProgress(d.getLength()); @@ -274,7 +274,7 @@ public class DataSettingsDialog extends AbstractSettingsDialog { monitor.initialize(toIndex - fromIndex + 1); for (int i = fromIndex; i <= toIndex; i++) { - monitor.checkCanceled(); + monitor.checkCancelled(); dataComp = parent.getComponent(i); if (dataComp == null) { break; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/TypeGraphTask.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/TypeGraphTask.java index ee9ed3929b..0116e08f55 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/TypeGraphTask.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/TypeGraphTask.java @@ -121,7 +121,7 @@ public class TypeGraphTask extends Task { } for (DataTypeComponent inner : struct.getComponents()) { - monitor.checkCanceled(); + monitor.checkCancelled(); DataType dt = inner.getDataType(); if (dt instanceof TypeDef) { dt = ((TypeDef) dt).getBaseDataType(); @@ -138,7 +138,7 @@ public class TypeGraphTask extends Task { private void recursePointer(Pointer pointer, AttributedGraph graph, AttributedVertex lastVertex, TaskMonitor monitor) throws CancelledException { - monitor.checkCanceled(); + monitor.checkCancelled(); DataType ptrType = pointer.getDataType(); if (ptrType == null) { return; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/associate/DisassociateAction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/associate/DisassociateAction.java index caa919cda8..2645e7ec16 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/associate/DisassociateAction.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/associate/DisassociateAction.java @@ -161,7 +161,7 @@ public class DisassociateAction extends DockingAction { monitor.initialize(typesToDisassociate.size()); for (DataTypeSyncInfo info : typesToDisassociate) { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.setMessage("Disassociating " + info.getName()); info.disassociate(); monitor.incrementProgress(1); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/associate/DisassociateDataTypeAction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/associate/DisassociateDataTypeAction.java index 677cf7a780..431e0d6f03 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/associate/DisassociateDataTypeAction.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/associate/DisassociateDataTypeAction.java @@ -232,7 +232,7 @@ public class DisassociateDataTypeAction extends DockingAction { synchronizer.openTransactions(); try { for (DataType dt : types) { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.setMessage("Disassociating " + dt.getName()); dtm.disassociate(dt); monitor.incrementProgress(1); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/associate/SyncAction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/associate/SyncAction.java index 33cef5094d..b228faab87 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/associate/SyncAction.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/associate/SyncAction.java @@ -202,7 +202,7 @@ public abstract class SyncAction extends DockingAction implements Comparable { int progress = 0; while (it.hasNext()) { monitor.setProgress(progress++); - monitor.checkCanceled(); + monitor.checkCancelled(); long key = it.next(); if (filterAccepts(key)) { accumulator.add(new DataRowObject(key, addressMap)); @@ -250,7 +250,7 @@ class DataTableModel extends AddressBasedTableModel { return null; } - return new Integer(data.getLength()); + return Integer.valueOf(data.getLength()); } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/AutoTableDisassemblerModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/AutoTableDisassemblerModel.java index c899850939..c096bc34d6 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/AutoTableDisassemblerModel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/AutoTableDisassemblerModel.java @@ -110,7 +110,7 @@ class AutoTableDisassemblerModel extends AddressBasedTableModel { storage = new MapStorage(); while (addrIter.hasNext()) { ++addrCount; - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.setProgress(addrCount); Address start = addrIter.next(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/CallFixupAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/CallFixupAnalyzer.java index 60f8c68024..0d97c586ff 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/CallFixupAnalyzer.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/CallFixupAnalyzer.java @@ -79,7 +79,7 @@ public class CallFixupAnalyzer extends AbstractAnalyzer { Iterator functionIter = program.getFunctionManager().getFunctions(set, true); while (functionIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Function function = functionIter.next(); @@ -142,7 +142,7 @@ public class CallFixupAnalyzer extends AbstractAnalyzer { // for the places that were fixed, add in the functions they are found in AddressIterator addresses = codeChangeSet.getAddresses(true); for (Address address : addresses) { - monitor.checkCanceled(); + monitor.checkCancelled(); Function func = program.getFunctionManager().getFunctionContaining(address); if (func != null) { @@ -360,7 +360,7 @@ public class CallFixupAnalyzer extends AbstractAnalyzer { AddressIterator addrIter = repairedCallLocations.getAddresses(true); while (addrIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.setMaximum(numRefs); monitor.setProgress(refCnt++); Address fromAddr = addrIter.next(); @@ -476,9 +476,9 @@ public class CallFixupAnalyzer extends AbstractAnalyzer { } @Override - public void checkCanceled() throws CancelledException { + public void checkCancelled() throws CancelledException { // TODO Auto-generated method stub - parentMonitor.checkCanceled(); + parentMonitor.checkCancelled(); } @Override diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/EntryPointAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/EntryPointAnalyzer.java index aed7a11393..517ae33bdd 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/EntryPointAnalyzer.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/EntryPointAnalyzer.java @@ -267,7 +267,7 @@ public class EntryPointAnalyzer extends AbstractAnalyzer { for (Iterator
laterIter = doLaterSet.iterator(); laterIter.hasNext();) { Address entry = laterIter.next(); - monitor.checkCanceled(); + monitor.checkCancelled(); if (!listing.isUndefined(entry, entry)) { laterIter.remove(); @@ -305,7 +305,7 @@ public class EntryPointAnalyzer extends AbstractAnalyzer { monitor.setProgress(count++); - monitor.checkCanceled(); + monitor.checkCancelled(); // already disassembled if (!listing.isUndefined(entry, entry)) { @@ -376,7 +376,7 @@ public class EntryPointAnalyzer extends AbstractAnalyzer { AddressIterator aiter = program.getSymbolTable().getExternalEntryPointIterator(); while (aiter.hasNext()) { externalCount++; - monitor.checkCanceled(); + monitor.checkCancelled(); Address entryAddr = aiter.next(); Symbol entry = symbolTable.getPrimarySymbol(entryAddr); // make sure to put on things that are external entry points, but not defined symbols. @@ -394,7 +394,7 @@ public class EntryPointAnalyzer extends AbstractAnalyzer { SymbolIterator symbolIter = symbolTable.getSymbols(addressSet, SymbolType.LABEL, true); while (symbolIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Symbol entry = symbolIter.next(); Address entryAddr = entry.getAddress(); if (addressSet.contains(entryAddr)) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/equate/CreateEnumEquateCommand.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/equate/CreateEnumEquateCommand.java index c4ad7668f2..9d4563f15f 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/equate/CreateEnumEquateCommand.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/equate/CreateEnumEquateCommand.java @@ -83,7 +83,7 @@ public class CreateEnumEquateCommand extends BackgroundCommand { monitor.initialize(addresses.getNumAddresses()); while (it.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Instruction instruction = it.next(); processsEquates(instruction); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/SharedReturnJumpAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/SharedReturnJumpAnalyzer.java index e4ec5204c6..2a1a607978 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/SharedReturnJumpAnalyzer.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/SharedReturnJumpAnalyzer.java @@ -60,7 +60,7 @@ public class SharedReturnJumpAnalyzer extends SharedReturnAnalyzer { // AddressIterator iter = mgr.getReferenceSourceIterator(set, true); while (iter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address addr = iter.next(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/tags/FunctionTableModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/tags/FunctionTableModel.java index a11389affb..dc91188f70 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/tags/FunctionTableModel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/tags/FunctionTableModel.java @@ -90,7 +90,7 @@ class FunctionTableModel extends AddressBasedTableModel { int realFunctionCount = program.getFunctionManager().getFunctionCount(); monitor.initialize(realFunctionCount); while (iter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); Function f = iter.next(); boolean hasTag = f.getTags().stream().anyMatch(t -> tags.contains(t)); @@ -101,7 +101,7 @@ class FunctionTableModel extends AddressBasedTableModel { FunctionIterator externals = program.getFunctionManager().getExternalFunctions(); for (Function f : externals) { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); boolean hasTag = f.getTags().stream().anyMatch(t -> tags.contains(t)); if (hasTag) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/tags/FunctionTagTableModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/tags/FunctionTagTableModel.java index 55c46a013c..47fc7ad034 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/tags/FunctionTagTableModel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/tags/FunctionTagTableModel.java @@ -58,7 +58,7 @@ public class FunctionTagTableModel extends ThreadedTableModel tags = tagListPanel.backgroundLoadTags(); monitor.initialize(tags.size()); for (FunctionTag tag : tags) { - monitor.checkCanceled(); + monitor.checkCancelled(); accumulator.add(new FunctionTagRowObject(tag, tagManager.getUseCount(tag))); monitor.incrementProgress(1); } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/functionwindow/FunctionTableModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/functionwindow/FunctionTableModel.java index ce4437ba27..e82faa8372 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/functionwindow/FunctionTableModel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/functionwindow/FunctionTableModel.java @@ -111,7 +111,7 @@ public class FunctionTableModel extends AddressBasedTableModel asSet( @@ -1041,7 +1041,7 @@ public final class ReferenceUtils { Listing listing = program.getListing(); DataIterator dataIter = listing.getDefinedData(true); while (dataIter.hasNext() && !monitor.isCancelled()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Data data = dataIter.next(); getMatchingDataTypesReferencesFromDataAndSubData(accumulator, data, fieldMatcher, @@ -1153,7 +1153,7 @@ public final class ReferenceUtils { int numComponents = data.getNumComponents(); for (int i = 0; i < numComponents; i++) { - monitor.checkCanceled(); + monitor.checkCancelled(); Data subData = data.getComponent(i); getMatchingDataTypesReferencesFromDataAndSubData(accumulator, subData, fieldMatcher, @@ -1210,7 +1210,7 @@ public final class ReferenceUtils { // while (iterator.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Function function = iterator.next(); Address entryPoint = function.getEntryPoint(); @@ -1344,7 +1344,7 @@ public final class ReferenceUtils { AddressIterator addresses = referenceManager.getReferenceDestinationIterator(offcut, true); Address codeUnitAddress = cu.getAddress(); while (addresses.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address addr = addresses.next(); if (addr.equals(codeUnitAddress)) { @@ -1399,7 +1399,7 @@ public final class ReferenceUtils { } for (Address thunkAddr : thunkAddrs) { - monitor.checkCanceled(); + monitor.checkCancelled(); Reference ref = new ThunkReference(thunkAddr, func.getEntryPoint()); consumer.accept(new LocationReference(ref, false)); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/BundleStatusComponentProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/BundleStatusComponentProvider.java index 53786cfb7a..38aa0c0c54 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/BundleStatusComponentProvider.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/BundleStatusComponentProvider.java @@ -381,7 +381,7 @@ public class BundleStatusComponentProvider extends ComponentProviderAdapter { @Override public void run(TaskMonitor monitor) throws CancelledException { deactivateBundlesTask.run(monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); // partition bundles into system (bundles.get(true)) / non-system (bundles.get(false)) Map> bundles = statuses.stream() .map(bs -> bundleHost.getExistingGhidraBundle(bs.getFile())) @@ -485,7 +485,7 @@ public class BundleStatusComponentProvider extends ComponentProviderAdapter { monitor.setMaximum(bundles.size()); for (GhidraBundle bundle : bundles) { - monitor.checkCanceled(); + monitor.checkCancelled(); try { bundleHost.deactivateSynchronously(bundle.getLocationIdentifier()); bundleHost.disable(bundle); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/reachability/FunctionReachabilityTableModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/reachability/FunctionReachabilityTableModel.java index 72a294356d..2722bddd9a 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/reachability/FunctionReachabilityTableModel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/reachability/FunctionReachabilityTableModel.java @@ -112,7 +112,7 @@ public class FunctionReachabilityTableModel CodeBlockIterator codeBlocks = getCallGraphBlocks(monitor); while (codeBlocks.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); CodeBlock block = codeBlocks.next(); monitor.setMessage("Creating callgraph - block " + block.getMinAddress()); @@ -153,7 +153,7 @@ public class FunctionReachabilityTableModel CodeBlockReferenceIterator iterator = sourceBlock.getDestinations(monitor); while (iterator.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); CodeBlockReference destination = iterator.next(); CodeBlock targetBlock = getDestinationBlock(destination, monitor); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/scalartable/ScalarSearchModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/scalartable/ScalarSearchModel.java index 491750fce3..d769c11d20 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/scalartable/ScalarSearchModel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/scalartable/ScalarSearchModel.java @@ -149,7 +149,7 @@ public class ScalarSearchModel extends AddressBasedTableModel { for (Instruction instruction : instructions) { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); if (tooManyResults()) { @@ -160,7 +160,7 @@ public class ScalarSearchModel extends AddressBasedTableModel { for (int opIndex = 0; opIndex <= numOperands; opIndex++) { - monitor.checkCanceled(); + monitor.checkCancelled(); Object[] opObjs = instruction.getOpObjects(opIndex); Reference[] operandReferences = instruction.getOperandReferences(opIndex); @@ -177,7 +177,7 @@ public class ScalarSearchModel extends AddressBasedTableModel { while (dataIterator.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); if (tooManyResults()) { @@ -201,7 +201,7 @@ public class ScalarSearchModel extends AddressBasedTableModel { TaskMonitor monitor) throws CancelledException { for (Object opObj : opObjs) { - monitor.checkCanceled(); + monitor.checkCancelled(); Scalar scalar = getScalarFromOperand(opObj, monitor); if (scalar != null) { @@ -234,7 +234,7 @@ public class ScalarSearchModel extends AddressBasedTableModel { for (int i = 0; i < numComponents; i++) { - monitor.checkCanceled(); + monitor.checkCancelled(); Data component = data.getComponent(i); getScalarsFromCompositeData(data, component, monitor); } @@ -251,7 +251,7 @@ public class ScalarSearchModel extends AddressBasedTableModel { for (int i = 0; i < numSubComponents; i++) { - monitor.checkCanceled(); + monitor.checkCancelled(); Data subComponent = component.getComponent(i); getScalarsFromCompositeData(data, subComponent, monitor); } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchmem/DecimalSearchFormat.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchmem/DecimalSearchFormat.java index 7d07f69dd3..712c1edd99 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchmem/DecimalSearchFormat.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchmem/DecimalSearchFormat.java @@ -162,7 +162,7 @@ public class DecimalSearchFormat extends SearchFormat { for (int i = 0; i < n; i++) { byte b = (byte) value; - list.add(new Byte(b)); + list.add(Byte.valueOf(b)); value >>= 8; } if (isBigEndian) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchtext/AbstractSearchTableModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchtext/AbstractSearchTableModel.java index b6908d23f2..b76f3eb848 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchtext/AbstractSearchTableModel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchtext/AbstractSearchTableModel.java @@ -58,11 +58,11 @@ public abstract class AbstractSearchTableModel extends ProgramLocationPreviewTab protected void doLoad(Accumulator accumulator, TaskMonitor monitor) throws CancelledException { Searcher searcher = getSearcher(tool, monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); TextSearchResult result = searcher.search(); while (result != null && accumulator.size() < searchLimit) { accumulator.add(result.programLocation()); - monitor.checkCanceled(); + monitor.checkCancelled(); result = searcher.search(); } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/select/flow/SelectByScopedFlowPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/select/flow/SelectByScopedFlowPlugin.java index d28aea00ac..914f776bbb 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/select/flow/SelectByScopedFlowPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/select/flow/SelectByScopedFlowPlugin.java @@ -273,7 +273,7 @@ public class SelectByScopedFlowPlugin extends ProgramPlugin { monitor.initialize(addresses.getNumAddresses()); for (; iterator.hasNext();) { - monitor.checkCanceled(); + monitor.checkCancelled(); CodeBlock codeBlock = iterator.next(); CodeBlockVertex vertex = new CodeBlockVertex(codeBlock); vertices.add(vertex); @@ -299,7 +299,7 @@ public class SelectByScopedFlowPlugin extends ProgramPlugin { Map blockToVertexMap = mapBlocksToVertices(vertices); for (CodeBlockVertex startVertex : vertices) { - monitor.checkCanceled(); + monitor.checkCancelled(); addEdgesForStartVertex(graph, blockToVertexMap, startVertex, monitor); } } @@ -311,7 +311,7 @@ public class SelectByScopedFlowPlugin extends ProgramPlugin { CodeBlock codeBlock = start.getCodeBlock(); CodeBlockReferenceIterator destinations = codeBlock.getDestinations(monitor); for (; destinations.hasNext();) { - monitor.checkCanceled(); + monitor.checkCancelled(); CodeBlockReference reference = destinations.next(); CodeBlock destinationBlock = reference.getDestinationBlock(); CodeBlockVertex end = blockToVertexMap.get(destinationBlock); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/stackeditor/StackFrameDataType.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/stackeditor/StackFrameDataType.java index 662ce57779..556472f61e 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/stackeditor/StackFrameDataType.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/stackeditor/StackFrameDataType.java @@ -186,7 +186,7 @@ public class StackFrameDataType extends BiDirectionDataType { if (offset < getMinOffset() || offset > getMaxOffset()) { throw new ArrayIndexOutOfBoundsException(offset); } - int index = Collections.binarySearch(components, new Integer(offset), offsetComparator); + int index = Collections.binarySearch(components, Integer.valueOf(offset), offsetComparator); if (index >= 0) { return components.get(index); } @@ -205,7 +205,7 @@ public class StackFrameDataType extends BiDirectionDataType { if (ordinal < 0 || ordinal >= getNumComponents()) { throw new ArrayIndexOutOfBoundsException(ordinal); } - int index = Collections.binarySearch(components, new Integer(ordinal), ordinalComparator); + int index = Collections.binarySearch(components, Integer.valueOf(ordinal), ordinalComparator); if (index >= 0) { return components.get(index); } @@ -298,7 +298,7 @@ public class StackFrameDataType extends BiDirectionDataType { } // private int getFirstParameterLength() { -// Object offsetKey = new Integer(0); +// Object offsetKey = Integer.valueOf(0); // DataTypeComponent[] variables = getDefinedComponents(); // int loc = Arrays.binarySearch(variables, offsetKey, offsetComparator); // loc = (loc < 0 ? -1 - loc : loc); @@ -315,7 +315,7 @@ public class StackFrameDataType extends BiDirectionDataType { // } void shiftParamOffset(int offset, int deltaOrdinal, int deltaLength) { - int index = Collections.binarySearch(components, new Integer(offset), offsetComparator); + int index = Collections.binarySearch(components, Integer.valueOf(offset), offsetComparator); if (index < 0) { index = -index - 1; } @@ -333,11 +333,11 @@ public class StackFrameDataType extends BiDirectionDataType { */ @SuppressWarnings("unused") private void clearRange(int minOffset, int maxOffset) { - int first = Collections.binarySearch(components, new Integer(minOffset), offsetComparator); + int first = Collections.binarySearch(components, Integer.valueOf(minOffset), offsetComparator); if (first < 0) { first = -first - 1; } - int last = Collections.binarySearch(components, new Integer(maxOffset), offsetComparator); + int last = Collections.binarySearch(components, Integer.valueOf(maxOffset), offsetComparator); if (last < 0) { last = -last - 2; } @@ -379,7 +379,7 @@ public class StackFrameDataType extends BiDirectionDataType { if (offset < getMinOffset() || offset > getMaxOffset()) { throw new ArrayIndexOutOfBoundsException(offset); } - int index = Collections.binarySearch(components, new Integer(offset), offsetComparator); + int index = Collections.binarySearch(components, Integer.valueOf(offset), offsetComparator); if (index >= 0) { clearComponent(index); } @@ -596,7 +596,7 @@ public class StackFrameDataType extends BiDirectionDataType { } int nextOffset = offset; - int index = Collections.binarySearch(components, new Integer(offset), offsetComparator); + int index = Collections.binarySearch(components, Integer.valueOf(offset), offsetComparator); if (index >= 0) { index++; } @@ -694,7 +694,7 @@ public class StackFrameDataType extends BiDirectionDataType { if (ordinal < 0 || ordinal >= getNumComponents()) { return false; } - int index = Collections.binarySearch(components, new Integer(ordinal), ordinalComparator); + int index = Collections.binarySearch(components, Integer.valueOf(ordinal), ordinalComparator); if (index >= 0) { return true; } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/CombinedStringSearcher.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/CombinedStringSearcher.java index 6ebecc4f81..97ae5cd700 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/CombinedStringSearcher.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/CombinedStringSearcher.java @@ -95,7 +95,7 @@ public class CombinedStringSearcher { // Add defined strings to the accumulator that haven't been found by the StringSearcher monitor.setIndeterminate(true); while (nextDefinedString != null) { - monitor.checkCanceled(); + monitor.checkCancelled(); if (!inRange(updatedAddressSet, nextDefinedString)) { updateNextString(); continue; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/NGramUtils.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/NGramUtils.java index 2466304700..1086085e5b 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/NGramUtils.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/NGramUtils.java @@ -358,7 +358,7 @@ public class NGramUtils { } else { retArr[i] = - new Integer(new Character(inputChars[i].charAt(0)).charValue()).toString(); + Integer.valueOf(Character.valueOf(inputChars[i].charAt(0)).charValue()).toString(); } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/StringModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/StringModel.java index fad7a67f81..40b16d9bb6 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/StringModel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/StringModel.java @@ -69,7 +69,7 @@ public class StringModel { for (int i = 0; i < textReps.length; i++) { if ((i >= 33) && (i <= 126)) { - textReps[i] = new Character((char) i).toString(); + textReps[i] = Character.valueOf((char) i).toString(); } else { if (asciiNumToDescription.containsKey(i)) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/StringsAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/StringsAnalyzer.java index 6d9522dc74..59f5ca18fe 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/StringsAnalyzer.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/StringsAnalyzer.java @@ -309,7 +309,7 @@ public class StringsAnalyzer extends AbstractAnalyzer { for (AddressSpace space : addressSpaces) { - monitor.checkCanceled(); + monitor.checkCancelled(); // Portion of current address space that intersects with initialized memory AddressSet intersecting = diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/strings/ViewStringsTableModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/strings/ViewStringsTableModel.java index c8b739f854..9f1d95aff9 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/strings/ViewStringsTableModel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/strings/ViewStringsTableModel.java @@ -116,7 +116,7 @@ class ViewStringsTableModel extends AddressBasedTableModel { Swing.allowSwingToProcessEvents(); for (Data stringInstance : DefinedDataIterator.definedStrings(localProgram)) { accumulator.add(createIndexedStringInstanceLocation(localProgram, stringInstance)); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/SymbolTreeProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/SymbolTreeProvider.java index 604dc14785..11cca2a9b2 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/SymbolTreeProvider.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/SymbolTreeProvider.java @@ -658,7 +658,7 @@ public class SymbolTreeProvider extends ComponentProviderAdapter { } for (GTreeTask task : tasks) { - monitor.checkCanceled(); + monitor.checkCancelled(); task.run(monitor); } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/nodes/ClassCategoryNode.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/nodes/ClassCategoryNode.java index 214290a980..2803fa7b88 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/nodes/ClassCategoryNode.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/nodes/ClassCategoryNode.java @@ -91,7 +91,7 @@ public class ClassCategoryNode extends SymbolCategoryNode { while (it.hasNext()) { Symbol s = it.next(); if (s != null && (s.getSymbolType() == symbolType)) { - monitor.checkCanceled(); + monitor.checkCancelled(); list.add(SymbolNode.createNode(s, program)); } monitor.incrementProgress(1); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/nodes/OrganizationNode.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/nodes/OrganizationNode.java index c5a9cfb6ae..59045f61d3 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/nodes/OrganizationNode.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/nodes/OrganizationNode.java @@ -116,7 +116,7 @@ public class OrganizationNode extends SymbolTreeNode { // loop through and create organization nodes for groups larger than one element List children = new ArrayList<>(); for (String prefix : prefixMap.keySet()) { - monitor.checkCanceled(); + monitor.checkCancelled(); List nodesSamePrefix = prefixMap.get(prefix); @@ -368,7 +368,7 @@ public class OrganizationNode extends SymbolTreeNode { int uniquePrefixSize = commonPrefixSize + 1; Map> map = new LinkedHashMap<>(); for (GTreeNode node : nodeList) { - monitor.checkCanceled(); + monitor.checkCancelled(); String prefix = getPrefix(node, uniquePrefixSize); List list = map.computeIfAbsent(prefix, k -> new ArrayList<>()); list.add(node); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/nodes/SymbolCategoryNode.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/nodes/SymbolCategoryNode.java index f1e31c7868..916bd81aba 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/nodes/SymbolCategoryNode.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/nodes/SymbolCategoryNode.java @@ -57,7 +57,7 @@ public abstract class SymbolCategoryNode extends SymbolTreeNode { public List generateChildren(TaskMonitor monitor) throws CancelledException { SymbolType symbolType = symbolCategory.getSymbolType(); List list = getSymbols(symbolType, monitor); - monitor.checkCanceled(); + monitor.checkCancelled(); return OrganizationNode.organize(list, MAX_NODES_BEFORE_ORGANIZING, monitor); } @@ -81,7 +81,7 @@ public abstract class SymbolCategoryNode extends SymbolTreeNode { while (it.hasNext()) { Symbol s = it.next(); monitor.incrementProgress(1); - monitor.checkCanceled(); + monitor.checkCancelled(); if (s != null && (s.getSymbolType() == symbolType)) { list.add(SymbolNode.createNode(s, program)); } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/SymbolReferenceModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/SymbolReferenceModel.java index c0eb057df8..f1f5561855 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/SymbolReferenceModel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/SymbolReferenceModel.java @@ -198,7 +198,7 @@ public class SymbolReferenceModel extends AddressBasedTableModel { Reference[] refs = currentSymbol.getReferences(monitor); for (Reference ref : refs) { - monitor.checkCanceled(); + monitor.checkCancelled(); accumulator.add(ref); } } @@ -213,7 +213,7 @@ public class SymbolReferenceModel extends AddressBasedTableModel { } InstructionIterator ii = getProgram().getListing().getInstructions(block, true); while (ii.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Instruction instr = ii.next(); Reference[] references = instr.getReferencesFrom(); for (Reference reference : references) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/SymbolTableModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/SymbolTableModel.java index 319b75ad59..1554f0bdad 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/SymbolTableModel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/SymbolTableModel.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -153,7 +153,7 @@ class SymbolTableModel extends AddressBasedTableModel { int value = 0; while (it.hasNext()) { monitor.setProgress(value++); - monitor.checkCanceled(); + monitor.checkCancelled(); Symbol s = it.next(); if (filter.accepts(s, getProgram())) { accumulator.add(new SymbolRowObject(s)); @@ -164,7 +164,7 @@ class SymbolTableModel extends AddressBasedTableModel { getProgram().getAddressFactory().getAddressSet(), true); while (addrIt.hasNext()) { monitor.setProgress(value++); - monitor.checkCanceled(); + monitor.checkCancelled(); Address a = addrIt.next(); Symbol s = symbolTable.getPrimarySymbol(a); if (s.isDynamic() && filter.accepts(s, getProgram())) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/JavaHelpPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/JavaHelpPlugin.java index 6cc07fca28..08035ea85a 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/JavaHelpPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/JavaHelpPlugin.java @@ -132,7 +132,7 @@ public class JavaHelpPlugin extends Plugin implements ApplicationLevelPlugin { monitor.setMessage("Filtering help items..."); Iterator iter = map.keySet().iterator(); while (iter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Object helpObj = iter.next(); if (helpObj instanceof DockingAction) { DockingAction action = (DockingAction) helpObj; @@ -151,7 +151,7 @@ public class JavaHelpPlugin extends Plugin implements ApplicationLevelPlugin { iter = map.keySet().iterator(); int i = 1; while (iter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); Object helpObj = iter.next(); HelpLocation helpLoc = map.get(helpObj); HelpInfoObject helpInfoObject = new HelpInfoObject(helpObj, helpLoc); @@ -171,7 +171,7 @@ public class JavaHelpPlugin extends Plugin implements ApplicationLevelPlugin { monitor.setMessage("Writing items missing help..."); for (HelpInfoObject helpInfo : helpInfos) { - monitor.checkCanceled(); + monitor.checkCancelled(); writeHelpInfo(out, helpInfo, i++); monitor.initialize(1); } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/dbtable/BooleanColumnAdapter.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/dbtable/BooleanColumnAdapter.java index 4064c8e759..084790538b 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/dbtable/BooleanColumnAdapter.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/dbtable/BooleanColumnAdapter.java @@ -27,7 +27,7 @@ public class BooleanColumnAdapter extends AbstractColumnAdapter { @Override Object getKeyValue(DBRecord rec) { - return new Boolean(((BooleanField) rec.getKeyField()).getBooleanValue()); + return Boolean.valueOf(((BooleanField) rec.getKeyField()).getBooleanValue()); } @Override diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/dbtable/ByteColumnAdapter.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/dbtable/ByteColumnAdapter.java index 0f1eeb98f6..4a5ea75ba0 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/dbtable/ByteColumnAdapter.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/dbtable/ByteColumnAdapter.java @@ -27,12 +27,12 @@ public class ByteColumnAdapter extends AbstractColumnAdapter { @Override Object getKeyValue(DBRecord rec) { - return new Byte(((ByteField) rec.getKeyField()).getByteValue()); + return Byte.valueOf(((ByteField) rec.getKeyField()).getByteValue()); } @Override Object getValue(DBRecord rec, int col) { - return new Byte(rec.getByteValue(col)); + return Byte.valueOf(rec.getByteValue(col)); } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/dbtable/IntegerColumnAdapter.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/dbtable/IntegerColumnAdapter.java index d483ebecf7..7eb4399c7e 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/dbtable/IntegerColumnAdapter.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/dbtable/IntegerColumnAdapter.java @@ -27,12 +27,12 @@ public class IntegerColumnAdapter extends AbstractColumnAdapter { @Override Object getKeyValue(DBRecord rec) { - return new Integer(((IntField) rec.getKeyField()).getIntValue()); + return Integer.valueOf(((IntField) rec.getKeyField()).getIntValue()); } @Override Object getValue(DBRecord rec, int col) { - return new Integer(rec.getIntValue(col)); + return Integer.valueOf(rec.getIntValue(col)); } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/dbtable/LongColumnAdapter.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/dbtable/LongColumnAdapter.java index de06608bfd..c53e3bae0c 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/dbtable/LongColumnAdapter.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/dbtable/LongColumnAdapter.java @@ -26,11 +26,11 @@ public class LongColumnAdapter extends AbstractColumnAdapter { @Override Object getKeyValue(DBRecord rec) { - return new Long(rec.getKey()); + return Long.valueOf(rec.getKey()); } @Override Object getValue(DBRecord rec, int col) { - return new Long(rec.getLongValue(col)); + return Long.valueOf(rec.getLongValue(col)); } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/dbtable/ShortColumnAdapter.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/dbtable/ShortColumnAdapter.java index 6b4cf36df7..bcacb76fdc 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/dbtable/ShortColumnAdapter.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/dbtable/ShortColumnAdapter.java @@ -27,12 +27,12 @@ public class ShortColumnAdapter extends AbstractColumnAdapter { @Override Object getKeyValue(DBRecord rec) { - return new Short(((ShortField) rec.getKeyField()).getShortValue()); + return Short.valueOf(((ShortField) rec.getKeyField()).getShortValue()); } @Override Object getValue(DBRecord rec, int col) { - return new Short(rec.getShortValue(col)); + return Short.valueOf(rec.getShortValue(col)); } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/GccExceptionAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/GccExceptionAnalyzer.java index dac4588c0b..2359547cfd 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/GccExceptionAnalyzer.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/GccExceptionAnalyzer.java @@ -164,7 +164,7 @@ public class GccExceptionAnalyzer extends AbstractAnalyzer { int fdeTableCount = analyzeEhFrameHeaderSection(program, monitor, log); // If the EHFrameHeader doesn't exist, the fdeTableCount will be 0. - monitor.checkCanceled(); + monitor.checkCancelled(); try { /* @@ -179,7 +179,7 @@ public class GccExceptionAnalyzer extends AbstractAnalyzer { for (RegionDescriptor region : regions) { - monitor.checkCanceled(); + monitor.checkCancelled(); ehProtected.add(region.getRange()); LSDACallSiteTable callSiteTable = region.getCallSiteTable(); @@ -187,7 +187,7 @@ public class GccExceptionAnalyzer extends AbstractAnalyzer { // Process this table's call site records. for (LSDACallSiteRecord cs : callSiteTable.getCallSiteRecords()) { - monitor.checkCanceled(); + monitor.checkCancelled(); processCallSiteRecord(program, ehProtected, region, cs); } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/sections/DebugFrameSection.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/sections/DebugFrameSection.java index 990b8d9355..7e59be473c 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/sections/DebugFrameSection.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/sections/DebugFrameSection.java @@ -71,7 +71,7 @@ public class DebugFrameSection extends AbstractFrameSection { monitor.setMaximum(blockCount); for (MemoryBlock block : blocks) { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); if (block.getName().startsWith(DEBUG_FRAME_BLOCK_NAME)) { descriptors.addAll(analyzeSection(block)); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/ExactBytesFunctionHasher.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/ExactBytesFunctionHasher.java index daa9c584e2..6128c795c6 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/ExactBytesFunctionHasher.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/ExactBytesFunctionHasher.java @@ -46,7 +46,7 @@ public class ExactBytesFunctionHasher extends AbstractFunctionHasher { byte[] buffer = new byte[byteCount]; int offset = 0; for (CodeUnit codeUnit : units) { - monitor.checkCanceled(); + monitor.checkCancelled(); try { codeUnit.getBytesInCodeUnit(buffer, offset); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/ExactInstructionsFunctionHasher.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/ExactInstructionsFunctionHasher.java index ca078ec478..309680b2ec 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/ExactInstructionsFunctionHasher.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/ExactInstructionsFunctionHasher.java @@ -77,7 +77,7 @@ public class ExactInstructionsFunctionHasher extends AbstractFunctionHasher { byte[] buffer = new byte[byteCount]; int offset = 0; for (CodeUnit codeUnit : units) { - monitor.checkCanceled(); + monitor.checkCancelled(); try { codeUnit.getBytesInCodeUnit(buffer, offset); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/ExactMnemonicsFunctionHasher.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/ExactMnemonicsFunctionHasher.java index 750e414092..9d4715eb25 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/ExactMnemonicsFunctionHasher.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/ExactMnemonicsFunctionHasher.java @@ -37,7 +37,7 @@ public class ExactMnemonicsFunctionHasher extends ExactInstructionsFunctionHashe throws MemoryAccessException, CancelledException { StringBuilder sb = new StringBuilder(); for (CodeUnit codeUnit : units) { - monitor.checkCanceled(); + monitor.checkCancelled(); if (codeUnit instanceof Instruction) { Instruction inst = (Instruction) codeUnit; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/FunctionMatchSet.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/FunctionMatchSet.java index ad4e7bce55..293d4d53b2 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/FunctionMatchSet.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/FunctionMatchSet.java @@ -64,11 +64,11 @@ public class FunctionMatchSet extends ArrayList { // Address aAddr = m.getAAddresses()[0]; // a[0] = aAddr; // a[1] = aSymbolTable.getPrimarySymbol( aAddr ); -// a[2] = new Integer( getLength( aAddr, aModel )); +// a[2] = Integer.valueOf( getLength( aAddr, aModel )); // Address bAddr = m.getBAddresses()[0]; // a[3] = bAddr; // a[4] = bSymbolTable.getPrimarySymbol( bAddr ); -// a[5] = new Integer( getLength( bAddr, bModel ) ); +// a[5] = Integer.valueOf( getLength( bAddr, bModel ) ); // a[6] = m.getReason(); // return a; // } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchData.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchData.java index fd36d2f268..aa8e337f5a 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchData.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchData.java @@ -67,7 +67,7 @@ public class MatchData { DataIterator aProgDataIter = aProgram.getListing().getDefinedData(setA, true); while (aProgDataIter.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); Data aData = aProgDataIter.next(); final int length = aData.getLength(); @@ -150,7 +150,7 @@ public class MatchData { monitor.initialize(searchResults.size()); monitor.setMessage("(3 of 4) Post-process search results"); for (SearchResult, Set
>> searchResult : searchResults) { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); Address bLocation = searchResult.getPosition(); if (bLocation.getOffset() % alignment != 0) { @@ -183,7 +183,7 @@ public class MatchData { monitor.initialize(searchResults.size()); monitor.setMessage("(4 of 4) Create match objects"); for (SearchResult, Set
>> searchResult : searchResults) { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); ByteTrieNodeIfc, Set
>> node = searchResult.getNode(); if (!done.contains(node)) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchSet.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchSet.java index d66b3d3cff..3902a057d9 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchSet.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchSet.java @@ -68,7 +68,7 @@ public class MatchSet extends HashSet a[1] = thisName; a[2] = m.getOtherBeginning(); a[3] = otherName; - a[4] = new Integer( m.length() ); + a[4] = Integer.valueOf( m.length() ); return a; } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchSymbol.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchSymbol.java index 5b909fa8b0..0b6a88e6c7 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchSymbol.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/MatchSymbol.java @@ -71,7 +71,7 @@ public class MatchSymbol { Iterator matchIterator = entries.iterator(); while (matchIterator.hasNext()) { monitor.incrementProgress(1); - monitor.checkCanceled(); + monitor.checkCancelled(); Match match = matchIterator.next(); if (match.aSymbols.size() != 1 || match.bSymbols.size() != 1) { // remove match if it does not contain exactly one match pair @@ -87,7 +87,7 @@ public class MatchSymbol { for (Match match : entries) { monitor.incrementProgress(1); - monitor.checkCanceled(); + monitor.checkCancelled(); //TODO: special namespaces for externals - unknown, etc... //Library.UNKNOWN - similar to global space for normal symbols @@ -145,7 +145,7 @@ public class MatchSymbol { for (Symbol symbol : program.getSymbolTable().getAllSymbols(true)) { monitor.incrementProgress(1); - monitor.checkCanceled(); + monitor.checkCancelled(); // Don't include default names except string ones (ie no FUN_*, LAB_*, etc... but // yes s_*, u_*, etc... diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/SubroutineMatchSet.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/SubroutineMatchSet.java index 87efd931a8..01bf86bafb 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/SubroutineMatchSet.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/match/SubroutineMatchSet.java @@ -74,11 +74,11 @@ public class SubroutineMatchSet extends ArrayList { // Address aAddr = m.getAAddresses()[0]; // a[0] = aAddr; // a[1] = aSymbolTable.getPrimarySymbol( aAddr ); -// a[2] = new Integer( getLength( aAddr, aModel )); +// a[2] = Integer.valueOf( getLength( aAddr, aModel )); // Address bAddr = m.getBAddresses()[0]; // a[3] = bAddr; // a[4] = bSymbolTable.getPrimarySymbol( bAddr ); -// a[5] = new Integer( getLength( bAddr, bModel ) ); +// a[5] = Integer.valueOf( getLength( bAddr, bModel ) ); // a[6] = m.getReason(); // return a; // } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/script/AskDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/app/script/AskDialog.java index b62df1ec5d..a89ce3495e 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/script/AskDialog.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/script/AskDialog.java @@ -274,7 +274,7 @@ public class AskDialog extends DialogComponentProvider { if (text.equalsIgnoreCase("e")) { return Math.E; } - return new Double(text); + return Double.valueOf(text); } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java b/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java index 7014ddf767..ee1ae2f703 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java @@ -395,7 +395,7 @@ public abstract class GhidraScript extends FlatProgramAPI { start(); try { run(); - monitor.checkCanceled(); + monitor.checkCancelled(); } finally { end(true); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/FunctionXrefsTableModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/FunctionXrefsTableModel.java index 1c356d5ce1..168ecb0c8e 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/FunctionXrefsTableModel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/FunctionXrefsTableModel.java @@ -73,7 +73,7 @@ public class FunctionXrefsTableModel extends ReferencesFromTableModel { } for (Address address : thunks) { - monitor.checkCanceled(); + monitor.checkCancelled(); addReferences(accumulator, address); } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DWARFAbbreviation.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DWARFAbbreviation.java index 2bc7ee0b56..d01f7c7fd4 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DWARFAbbreviation.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DWARFAbbreviation.java @@ -56,7 +56,7 @@ public class DWARFAbbreviation List tmpAttrSpecs = new ArrayList<>(); DWARFAttributeSpecification attr; while ((attr = DWARFAttributeSpecification.read(reader)) != null) { - monitor.checkCanceled(); + monitor.checkCancelled(); tmpAttrSpecs.add(prog.internAttributeSpec(attr)); } DWARFAttributeSpecification[] attrSpecArray = @@ -75,7 +75,7 @@ public class DWARFAbbreviation // Read all abbreviations for this compilation unit and add to a map DWARFAbbreviation abbrev = null; while ((abbrev = DWARFAbbreviation.read(reader, prog, monitor)) != null) { - monitor.checkCanceled(); + monitor.checkCancelled(); result.put(abbrev.getAbbreviationCode(), abbrev); } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DWARFCompilationUnit.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DWARFCompilationUnit.java index 497fe9a9cd..c4ee046cca 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DWARFCompilationUnit.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DWARFCompilationUnit.java @@ -354,7 +354,7 @@ public class DWARFCompilationUnit { while ((br.getPointerIndex() < getEndOffset()) && (die = DebugInfoEntry.read(br, this, dwarfProgram.getAttributeFactory())) != null) { - monitor.checkCanceled(); + monitor.checkCancelled(); if (die.isTerminator()) { if (parent == null && parentStack.isEmpty()) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/external/ExternalDebugFilesService.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/external/ExternalDebugFilesService.java index 23c19eabdf..642ed54f0a 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/external/ExternalDebugFilesService.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/external/ExternalDebugFilesService.java @@ -62,7 +62,7 @@ public class ExternalDebugFilesService { throws IOException { try { for (SearchLocation searchLoc : searchLocations) { - monitor.checkCanceled(); + monitor.checkCancelled(); FSRL result = searchLoc.findDebugFile(debugInfo, monitor); if (result != null) { return result; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFDataTypeManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFDataTypeManager.java index b4d8540067..d3e257c010 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFDataTypeManager.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFDataTypeManager.java @@ -562,7 +562,7 @@ public class DWARFDataTypeManager { for (DIEAggregate diea : DIEAMonitoredIterator.iterable(prog, "DWARF Import Types", monitor)) { - monitor.checkCanceled(); + monitor.checkCancelled(); try { if (isDataType(diea)) { @@ -640,7 +640,7 @@ public class DWARFDataTypeManager { for (DIEAggregate diea : DIEAMonitoredIterator.iterable(prog, "DWARF Import Function Signatures", monitor)) { - monitor.checkCanceled(); + monitor.checkCancelled(); try { diea = getFuncDIEA(diea); if (diea != null) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFFunctionImporter.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFFunctionImporter.java index e406e55217..8cf54478c0 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFFunctionImporter.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFFunctionImporter.java @@ -103,7 +103,7 @@ public class DWARFFunctionImporter { for (DIEAggregate diea : DIEAMonitoredIterator.iterable(prog, "DWARF - Create Funcs & Symbols", monitor)) { - monitor.checkCanceled(); + monitor.checkCancelled(); try { switch (diea.getTag()) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFParser.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFParser.java index 454a46b964..034ba9ad67 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFParser.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFParser.java @@ -76,7 +76,7 @@ public class DWARFParser { CategoryPath rootCP = prog.getRootDNI().asCategoryPath(); for (DataTypePath dataTypePath : importedTypes) { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); if ( (monitor.getProgress() % 5) == 0 ) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFProgram.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFProgram.java index 339b04f680..8d30175f09 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFProgram.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFProgram.java @@ -612,7 +612,7 @@ public class DWARFProgram implements Closeable { BinaryReader br = debugInfoBR; br.setPointerIndex(0); while (br.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.setMessage("Bootstrapping DWARF Compilation Unit #" + compUnits.size()); DWARFCompilationUnit cu = DWARFCompilationUnit.readCompilationUnit(this, br, diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfDefaultGotPltMarkup.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfDefaultGotPltMarkup.java index db11e6a955..0039eb2b94 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfDefaultGotPltMarkup.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfDefaultGotPltMarkup.java @@ -79,7 +79,7 @@ public class ElfDefaultGotPltMarkup { // look for .got section blocks MemoryBlock[] blocks = memory.getBlocks(); for (MemoryBlock gotBlock : blocks) { - monitor.checkCanceled(); + monitor.checkCancelled(); if (!gotBlock.getName().startsWith(ElfSectionHeaderConstants.dot_got)) { continue; @@ -545,7 +545,7 @@ public class ElfDefaultGotPltMarkup { Disassembler disassembler = Disassembler.getDisassembler(prog, monitor, m -> { /* silent */}); while (!set.isEmpty()) { - monitor.checkCanceled(); + monitor.checkCancelled(); AddressSet disset = disassembler.disassemble(set.getMinAddress(), null, true); if (disset.isEmpty()) { // Stop on first error but discard error bookmark since diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/info/StandardElfInfoProducer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/info/StandardElfInfoProducer.java index ee6d015e40..9724e2f6df 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/info/StandardElfInfoProducer.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/info/StandardElfInfoProducer.java @@ -72,7 +72,7 @@ public class StandardElfInfoProducer implements ElfInfoProducer { Program program = elfLoadHelper.getProgram(); for (Entry> noteEntry : STANDARD_READERS.entrySet()) { - monitor.checkCanceled(); + monitor.checkCancelled(); String sectionName = noteEntry.getKey(); ReaderFunc readFunc = noteEntry.getValue(); @@ -87,7 +87,7 @@ public class StandardElfInfoProducer implements ElfInfoProducer { Memory memory = program.getMemory(); for (ElfProgramHeader elfProgramHeader : elfLoadHelper.getElfHeader() .getProgramHeaders(ElfProgramHeaderConstants.PT_NOTE)) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address addr = elfLoadHelper.findLoadAddress(elfProgramHeader, 0); MemoryBlock memBlock = memory.getBlock(addr); @@ -98,7 +98,7 @@ public class StandardElfInfoProducer implements ElfInfoProducer { MemoryByteProvider.createMemoryBlockByteProvider(program.getMemory(), memBlock)) { BinaryReader br = new BinaryReader(bp, !program.getMemory().isBigEndian()); while (br.hasNext()) { - monitor.checkCanceled(); + monitor.checkCancelled(); long start = br.getPointerIndex(); ElfNote note = br.readNext(ElfNote::read); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/golang/GolangElfInfoProducer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/golang/GolangElfInfoProducer.java index 5b99044858..cd2d2adc6e 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/golang/GolangElfInfoProducer.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/golang/GolangElfInfoProducer.java @@ -57,7 +57,7 @@ public class GolangElfInfoProducer implements ElfInfoProducer { Program program = elfLoadHelper.getProgram(); for (Entry> itemEntry : GOLANGINFO_READERS.entrySet()) { - monitor.checkCanceled(); + monitor.checkCancelled(); String sectionName = itemEntry.getKey(); ReaderFunc readFunc = itemEntry.getValue(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/golang/rtti/GoRttiContext.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/golang/rtti/GoRttiContext.java index f3f0da11c7..fd9d36c51b 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/golang/rtti/GoRttiContext.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/golang/rtti/GoRttiContext.java @@ -500,7 +500,7 @@ public class GoRttiContext extends ProgramContext { monitor.initialize(goTypes.size()); List typeOffsets = goTypes.keySet().stream().sorted().collect(Collectors.toList()); for (Long typeOffset : typeOffsets) { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); GoType typ = getGoType(typeOffset); DataType dt = typ.recoverDataType(); @@ -525,7 +525,7 @@ public class GoRttiContext extends ProgramContext { goTypes.clear(); Set discoveredTypes = new HashSet<>(); for (Iterator it = firstModule.iterateTypes(); it.hasNext();) { - upwtm.checkCanceled(); + upwtm.checkCancelled(); upwtm.setProgress(discoveredTypes.size()); GoType type = it.next(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheAccelerateInfo.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheAccelerateInfo.java index 64f93f37be..ea97880e88 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheAccelerateInfo.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheAccelerateInfo.java @@ -173,7 +173,7 @@ public class DyldCacheAccelerateInfo implements StructConverter { try { for (int i = 0; i < imageExtrasCount; ++i) { imageInfoExtraList.add(new DyldCacheImageInfoExtra(reader)); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } } @@ -191,7 +191,7 @@ public class DyldCacheAccelerateInfo implements StructConverter { try { for (int i = 0; i < initializersCount; ++i) { acceleratorInitializerList.add(new DyldCacheAcceleratorInitializer(reader)); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } } @@ -209,7 +209,7 @@ public class DyldCacheAccelerateInfo implements StructConverter { try { for (int i = 0; i < dofSectionsCount; ++i) { acceleratorDofList.add(new DyldCacheAcceleratorDof(reader)); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } } @@ -227,7 +227,7 @@ public class DyldCacheAccelerateInfo implements StructConverter { try { for (int i = 0; i < rangeTableCount; ++i) { rangeEntryList.add(new DyldCacheRangeEntry(reader)); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } } @@ -247,7 +247,7 @@ public class DyldCacheAccelerateInfo implements StructConverter { Data d = DataUtilities.createData(program, addr, imageInfoExtra.toDataType(), -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); addr = addr.add(d.getLength()); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } } @@ -275,7 +275,7 @@ public class DyldCacheAccelerateInfo implements StructConverter { // Function already created...skip } addr = addr.add(d.getLength()); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } } @@ -295,7 +295,7 @@ public class DyldCacheAccelerateInfo implements StructConverter { Data d = DataUtilities.createData(program, addr, dof.toDataType(), -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); addr = addr.add(d.getLength()); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } } @@ -351,7 +351,7 @@ public class DyldCacheAccelerateInfo implements StructConverter { Data d = DataUtilities.createData(program, addr, rangeEntry.toDataType(), -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); addr = addr.add(d.getLength()); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheHeader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheHeader.java index 8e08c0f8c9..41acff5217 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheHeader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheHeader.java @@ -424,7 +424,7 @@ public class DyldCacheHeader implements StructConverter { reader.setPointerIndex(mappingWithSlideOffset); for (int i = 0; i < mappingWithSlideCount; ++i) { cacheMappingAndSlideInfoList.add(new DyldCacheMappingAndSlideInfo(reader)); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } } @@ -747,7 +747,7 @@ public class DyldCacheHeader implements StructConverter { reader.setPointerIndex(mappingOffset); for (int i = 0; i < mappingCount; ++i) { mappingInfoList.add(new DyldCacheMappingInfo(reader)); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } } @@ -769,7 +769,7 @@ public class DyldCacheHeader implements StructConverter { reader.setPointerIndex(offset); for (int i = 0; i < count; ++i) { imageInfoList.add(new DyldCacheImageInfo(reader)); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } } @@ -815,7 +815,7 @@ public class DyldCacheHeader implements StructConverter { reader.setPointerIndex(branchPoolsOffset); for (int i = 0; i < branchPoolsCount; ++i) { branchPoolList.add(reader.readNextLong()); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } } @@ -834,7 +834,7 @@ public class DyldCacheHeader implements StructConverter { reader.setPointerIndex(imagesTextOffset); for (int i = 0; i < imagesTextCount; ++i) { imageTextInfoList.add(new DyldCacheImageTextInfo(reader)); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } } @@ -854,7 +854,7 @@ public class DyldCacheHeader implements StructConverter { reader.setPointerIndex(subCacheArrayOffset); for (int i = 0; i < subCacheArrayCount; ++i) { subcacheEntryList.add(new DyldSubcacheEntry(reader, headerType)); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } } @@ -910,7 +910,7 @@ public class DyldCacheHeader implements StructConverter { Data d = DataUtilities.createData(program, addr, mappingInfo.toDataType(), -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); addr = addr.add(d.getLength()); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } } @@ -930,7 +930,7 @@ public class DyldCacheHeader implements StructConverter { Data d = DataUtilities.createData(program, addr, mappingInfo.toDataType(), -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); addr = addr.add(d.getLength()); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } } @@ -952,7 +952,7 @@ public class DyldCacheHeader implements StructConverter { DataUtilities.ClearDataMode.CHECK_FOR_SPACE); program.getListing().setComment(addr, CodeUnit.EOL_COMMENT, imageInfo.getPath()); addr = addr.add(d.getLength()); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } } @@ -1029,7 +1029,7 @@ public class DyldCacheHeader implements StructConverter { Pointer64DataType.dataType.getLength(), DataUtilities.ClearDataMode.CHECK_FOR_SPACE); addr = addr.add(d.getLength()); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } } @@ -1070,7 +1070,7 @@ public class DyldCacheHeader implements StructConverter { program.getListing() .setComment(addr, CodeUnit.EOL_COMMENT, imageTextInfo.getPath()); addr = addr.add(d.getLength()); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } } @@ -1090,7 +1090,7 @@ public class DyldCacheHeader implements StructConverter { Data d = DataUtilities.createData(program, addr, subcacheEntry.toDataType(), -1, DataUtilities.ClearDataMode.CHECK_FOR_SPACE); addr = addr.add(d.getLength()); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheLocalSymbolsInfo.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheLocalSymbolsInfo.java index 5271b73305..bb53fc231a 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheLocalSymbolsInfo.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheLocalSymbolsInfo.java @@ -155,7 +155,7 @@ public class DyldCacheLocalSymbolsInfo implements StructConverter { for (int i = 0; i < nlistCount; ++i) { nlistList.add(new NList(nListReader, is32bit)); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } // sort the entries by the index in the string table, so don't jump around reading @@ -167,7 +167,7 @@ public class DyldCacheLocalSymbolsInfo implements StructConverter { // initialize the NList strings from string table long stringTableOffset = startIndex + stringsOffset; for (NList nList : sortedList) { - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); nList.initString(nListReader, stringTableOffset); } @@ -184,7 +184,7 @@ public class DyldCacheLocalSymbolsInfo implements StructConverter { try { for (int i = 0; i < entriesCount; ++i) { localSymbolsEntryList.add(new DyldCacheLocalSymbolsEntry(reader)); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } } @@ -203,7 +203,7 @@ public class DyldCacheLocalSymbolsInfo implements StructConverter { for (NList nlist : nlistList) { Data d = program.getListing().createData(addr, nlist.toDataType()); addr = addr.add(d.getLength()); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } } @@ -221,7 +221,7 @@ public class DyldCacheLocalSymbolsInfo implements StructConverter { for (DyldCacheLocalSymbolsEntry localSymbolsEntry : localSymbolsEntryList) { Data d = program.getListing().createData(addr, localSymbolsEntry.toDataType()); addr = addr.add(d.getLength()); - monitor.checkCanceled(); + monitor.checkCancelled(); monitor.incrementProgress(1); } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheSlideInfo1.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheSlideInfo1.java index 0054eb04ff..0c5dbcc2d3 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheSlideInfo1.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheSlideInfo1.java @@ -145,7 +145,7 @@ public class DyldCacheSlideInfo1 extends DyldCacheSlideInfoCommon { // V1 pointers currently don't need to be fixed, unless the pointers the // dyld is slid from its preferred location. for (int tocIndex = 0; tocIndex < toc_count; tocIndex++) { - monitor.checkCanceled(); + monitor.checkCancelled(); int entryIndex = (toc[tocIndex]) & 0xFFFF; if (entryIndex > entries_count || entryIndex > bits.length) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheSlideInfo2.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheSlideInfo2.java index 76fd7a3064..70e18f4077 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheSlideInfo2.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheSlideInfo2.java @@ -145,7 +145,7 @@ public class DyldCacheSlideInfo2 extends DyldCacheSlideInfoCommon { monitor.setMaximum(pageStartsCount); for (int index = 0; index < pageStartsCount; index++) { - monitor.checkCanceled(); + monitor.checkCancelled(); long page = dataPageStart + (pageSize * index); @@ -216,7 +216,7 @@ public class DyldCacheSlideInfo2 extends DyldCacheSlideInfoCommon { long delta = -1; while (delta != 0) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address chainLoc = chainStart.add(nextOff); long chainValue = memory.getLong(chainLoc); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheSlideInfo3.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheSlideInfo3.java index ada966a300..7b7b5ec8cc 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheSlideInfo3.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheSlideInfo3.java @@ -122,7 +122,7 @@ public class DyldCacheSlideInfo3 extends DyldCacheSlideInfoCommon { monitor.setMaximum(pageStartsCount); for (int index = 0; index < pageStartsCount; index++) { - monitor.checkCanceled(); + monitor.checkCancelled(); long page = dataPageStart + (pageSize * index); @@ -174,7 +174,7 @@ public class DyldCacheSlideInfo3 extends DyldCacheSlideInfoCommon { long delta = -1; while (delta != 0) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address chainLoc = chainStart.add(nextOff); long chainValue = memory.getLong(chainLoc); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheSlideInfo4.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheSlideInfo4.java index 82ac37ec26..ee802c4ba5 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheSlideInfo4.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheSlideInfo4.java @@ -157,7 +157,7 @@ public class DyldCacheSlideInfo4 extends DyldCacheSlideInfoCommon { monitor.setMaximum(pageStartsCount); for (int index = 0; index < pageStartsCount; index++) { - monitor.checkCanceled(); + monitor.checkCancelled(); long page = dataPageStart + (pageSize * index); @@ -229,7 +229,7 @@ public class DyldCacheSlideInfo4 extends DyldCacheSlideInfoCommon { long delta = -1; while (delta != 0) { - monitor.checkCanceled(); + monitor.checkCancelled(); Address chainLoc = chainStart.add(nextOff); int chainValue = memory.getInt(chainLoc); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheSlideInfoCommon.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheSlideInfoCommon.java index ef692a6296..fa10c28242 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheSlideInfoCommon.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheSlideInfoCommon.java @@ -154,7 +154,7 @@ public abstract class DyldCacheSlideInfoCommon implements StructConverter { // Create pointers at any fixed-up addresses for (Address addr : unchainedLocList) { - monitor.checkCanceled(); + monitor.checkCancelled(); try { program.getListing().createData(addr, Pointer64DataType.dataType); } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/BoundImportDataDirectory.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/BoundImportDataDirectory.java index a2c026fc53..0553f57038 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/BoundImportDataDirectory.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/BoundImportDataDirectory.java @@ -226,7 +226,7 @@ public class BoundImportDataDirectory extends DataDirectory { else { String moduleName = descriptor.getModuleName(); if (moduleName != null && moduleName.length() > 0) { - nameHash.put(moduleName, new Short((short)pos)); + nameHash.put(moduleName, Short.valueOf((short)pos)); descriptor.setOffsetModuleName((short)pos); pos += (descriptor.getModuleName().length() + 1); } @@ -244,7 +244,7 @@ public class BoundImportDataDirectory extends DataDirectory { else { String moduleName = forwarder.getModuleName(); if (moduleName != null && moduleName.length() > 0) { - nameHash.put(moduleName, new Short((short)pos)); + nameHash.put(moduleName, Short.valueOf((short)pos)); forwarder.setOffsetModuleName((short)pos); pos += (forwarder.getModuleName().length() + 1); } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/rich/PERichTableDataType.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/rich/PERichTableDataType.java index b62d9590cf..575a8cfad4 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/rich/PERichTableDataType.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/rich/PERichTableDataType.java @@ -299,7 +299,7 @@ public class PERichTableDataType extends DynamicDataType { @Override public String getRepresentation(MemBuffer buf, Settings settings, int length) { try { - return new Integer(buf.getInt(0) ^ mask).toString(); + return Integer.valueOf(buf.getInt(0) ^ mask).toString(); } catch (MemoryAccessException mae) { return "0"; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/exporter/ProgramTextOptions.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/exporter/ProgramTextOptions.java index 0d9aae992d..e15bb1ac0c 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/exporter/ProgramTextOptions.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/exporter/ProgramTextOptions.java @@ -106,25 +106,25 @@ class ProgramTextOptions { List