refactor: make FunctionInstructionSinkCodeRelocationSynthesizer::getF…

…unctionInstructionSinks() throw CancelledException
boricj · May 22, 2024 · 0bc41dc · 0bc41dc
1 parent 33b4101
commit 0bc41dc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/ghidra/app/analyzers/relocations/MipsCodeRelocationSynthesizer.java b/src/main/java/ghidra/app/analyzers/relocations/MipsCodeRelocationSynthesizer.java
@@ -40,6 +40,7 @@
 import ghidra.program.model.symbol.SymbolTable;
 import ghidra.program.util.ProgramUtilities;
 import ghidra.util.DataConverter;
+import ghidra.util.exception.CancelledException;
 import ghidra.util.task.TaskMonitor;
 
 public class MipsCodeRelocationSynthesizer
@@ -390,7 +391,7 @@ public boolean matches(Instruction instruction, int operandIndex, Reference refe
 	@Override
 	public List<FunctionInstructionSink> getFunctionInstructionSinks(Program program,
 			RelocationTable relocationTable, Function function, TaskMonitor monitor,
-			MessageLog log) {
+			MessageLog log) throws CancelledException {
 		List<FunctionInstructionSink> sinks = new ArrayList<>();
 		sinks.add(new MIPS_26_InstructionRelocationEmitter(program, relocationTable, function,
 			monitor, log));

diff --git a/src/main/java/ghidra/app/analyzers/relocations/X86CodeRelocationSynthesizer.java b/src/main/java/ghidra/app/analyzers/relocations/X86CodeRelocationSynthesizer.java
@@ -27,6 +27,7 @@
 import ghidra.program.model.listing.Function;
 import ghidra.program.model.listing.Program;
 import ghidra.program.model.relocobj.RelocationTable;
+import ghidra.util.exception.CancelledException;
 import ghidra.util.task.TaskMonitor;
 
 public class X86CodeRelocationSynthesizer extends FunctionInstructionSinkCodeRelocationSynthesizer {
@@ -84,7 +85,7 @@ else if (operandMask.equals(OPMASK_SIB_4BYTES)) {
 	@Override
 	public List<FunctionInstructionSink> getFunctionInstructionSinks(Program program,
 			RelocationTable relocationTable, Function function, TaskMonitor monitor,
-			MessageLog log) {
+			MessageLog log) throws CancelledException {
 		InstructionRelocationEmitter absolute =
 			new X86InstructionAbsoluteRelocationEmitter(program, relocationTable, function, monitor,
 				log);

diff --git a/.../app/analyzers/relocations/emitters/FunctionInstructionSinkCodeRelocationSynthesizer.java b/.../app/analyzers/relocations/emitters/FunctionInstructionSinkCodeRelocationSynthesizer.java
@@ -63,5 +63,5 @@ public void processFunction(Program program, AddressSetView set, Function functi
 
 	public abstract List<FunctionInstructionSink> getFunctionInstructionSinks(Program program,
 			RelocationTable relocationTable, Function function, TaskMonitor monitor,
-			MessageLog log);
+			MessageLog log) throws CancelledException;
 }