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

GP-2697 addressing code review comments

Browse source
This commit is contained in:
James 2022-11-22 20:34:06 +00:00
parent dbd2098a59
commit 7ab05db386
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Ghidra/Features/Decompiler/ghidra_scripts/DecompilerStackProblemsFinderScript.java
View file

@ -30,6 +30,7 @@ import ghidra.program.model.address.*;
import ghidra.program.model.listing.Function; import ghidra.program.model.listing.Function;
import ghidra.program.model.listing.Program; import ghidra.program.model.listing.Program;
import ghidra.program.model.pcode.*; import ghidra.program.model.pcode.*;
import ghidra.util.exception.CancelledException;
import ghidra.util.task.TaskMonitor; import ghidra.util.task.TaskMonitor;
public class DecompilerStackProblemsFinderScript extends GhidraScript { public class DecompilerStackProblemsFinderScript extends GhidraScript {
@ -65,6 +66,7 @@ public class DecompilerStackProblemsFinderScript extends GhidraScript {
} }
finally { finally {
callback.dispose(); callback.dispose();
monitor.checkCanceled();
} }
TableChooserDialog tableDialog = TableChooserDialog tableDialog =
@ -86,7 +88,7 @@ public class DecompilerStackProblemsFinderScript extends GhidraScript {
} }
private List<StackErrorRow> findStackErrors(DecompileResults results, TaskMonitor tMonitor) private List<StackErrorRow> findStackErrors(DecompileResults results, TaskMonitor tMonitor)
throws Exception { throws CancelledException {
List<StackErrorRow> rows = new ArrayList<>(); List<StackErrorRow> rows = new ArrayList<>();
HighFunction highFunction = results.getHighFunction(); HighFunction highFunction = results.getHighFunction();
@ -96,16 +98,18 @@ public class DecompilerStackProblemsFinderScript extends GhidraScript {
AddressSetView body = results.getFunction().getBody(); AddressSetView body = results.getFunction().getBody();
AddressSpace addrSpace = body.getMinAddress().getAddressSpace(); AddressSpace addrSpace = body.getMinAddress().getAddressSpace();
Iterator<PcodeOpAST> ops = highFunction.getPcodeOps(); Iterator<PcodeOpAST> ops = highFunction.getPcodeOps();
ops.forEachRemaining(op -> { while (ops.hasNext()) {
tMonitor.checkCanceled();
PcodeOp op = ops.next();
if (op.getOpcode() != PcodeOp.COPY) { if (op.getOpcode() != PcodeOp.COPY) {
return; continue;
} }
if (!op.getOutput().getAddress().isStackAddress()) { if (!op.getOutput().getAddress().isStackAddress()) {
return; continue;
} }
Varnode input = op.getInput(0); Varnode input = op.getInput(0);
if (!input.isConstant()) { if (!input.isConstant()) {
return; continue;
} }
try { try {
Address addr = addrSpace.getAddress(input.getOffset()); Address addr = addrSpace.getAddress(input.getOffset());
@ -117,9 +121,9 @@ public class DecompilerStackProblemsFinderScript extends GhidraScript {
catch (AddressOutOfBoundsException e) { catch (AddressOutOfBoundsException e) {
//this is can happen when the constant is an encoding of a floating //this is can happen when the constant is an encoding of a floating
//point value. //point value.
return; continue;
}
} }
});
return rows; return rows;
} }
@ -134,7 +138,7 @@ public class DecompilerStackProblemsFinderScript extends GhidraScript {
public void configure(DecompInterface decompiler) { public void configure(DecompInterface decompiler) {
decompiler.toggleCCode(false); decompiler.toggleCCode(false);
decompiler.toggleSyntaxTree(true); decompiler.toggleSyntaxTree(true);
decompiler.setSimplificationStyle("decompile"); decompiler.setSimplificationStyle("normalize");
DecompileOptions opts = new DecompileOptions(); DecompileOptions opts = new DecompileOptions();
opts.grabFromProgram(p); opts.grabFromProgram(p);
decompiler.setOptions(opts); decompiler.setOptions(opts);