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

GP-2974: Fixing warnings

Browse source
This commit is contained in:
Ryan Kurtz 2023-04-26 08:03:57 -04:00
parent 113156a19f
commit 7fa3389119
662 changed files with 2198 additions and 2216 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/copying/DebuggerCopyPlan.java
View file

@ -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<Bookmark> 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

2
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/AbstractQueryTableModel.java
View file

@ -305,7 +305,7 @@ public abstract class AbstractQueryTableModel<T> extends ThreadedTableModel<T, T
}
for (T t : (Iterable<T>) streamRows(trace, query, span)::iterator) {
accumulator.add(t);
monitor.checkCanceled();
monitor.checkCancelled();
}
}

2
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/components/ObjectNode.java
View file

@ -129,7 +129,7 @@ public class ObjectNode extends GTreeSlowLoadingNode { //extends GTreeNode
List<GTreeNode> children = children();
monitor = new TreeTaskMonitor(monitor, children.size());
for (GTreeNode child : children) {
monitor.checkCanceled();
monitor.checkCancelled();
count += child.loadAll(monitor);
monitor.incrementProgress(1);
}

2
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/modules/DebuggerStaticMappingServicePlugin.java
View file

@ -762,7 +762,7 @@ public class DebuggerStaticMappingServicePlugin extends Plugin
protected static void doAddMappings(Trace trace, Collection<MapEntry<?, ?>> entries,
TaskMonitor monitor, boolean truncateExisting) throws CancelledException {
for (MapEntry<?, ?> ent : entries) {
monitor.checkCanceled();
monitor.checkCancelled();
try {
DebuggerStaticMappingUtils.addMapping(ent, truncateExisting);
}

2
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/stack/UnwindAnalysis.java
View file

@ -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());
}
}