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

GT-3317

Browse source 
moved generic graph interfaces to features graph module
created graph service broker

first commit of program graph module adapted to new graph api

GT-3317 connected listeners, documented and prettied up code
changed GhidraGraph to preserve order of created graph. Removed edge
filtering from initial program graph display

GT-3317 added exporters for supported formats

GT-3317 fixed GhidraGraph bug where it lost edges

updates

changed to new action builder
removed icons, improved AttributeFilters

removed DialogComponentProviderBuilder
fixed generic alphabet soup

added vertex name updating.

GT-3317 added threading to sugiyama
adapted to take advantage of multi-threaded edge crossing reduction in
circle layout
eliminated parallel edges, improved sizing, updated jungrapht version

GT-3317 fixing AST graph and moving modules and packages
started help
GT-3317 updated min-cross and color selections
uses min-cross that optimizes for graph size

GT-3317 help, javadocs

changes from review comments and cleaning up warnings and simplifying
exporter code
fixing warnings, simplifying unnecessarily complicated code
more changes from review
more changes from review, simplifications. removed unnecessary
threading, renamed vertex, edge, etc
GT-3317 squashed many commits to make rebase easier. Mostly changes from
first code review.
This commit is contained in:
ghidravore 2019-12-06 11:32:03 -05:00
parent 0001ee2651
commit 410af5a272
112 changed files with 8736 additions and 1094 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Ghidra/Features/Decompiler/ghidra_scripts/GraphASTAndFlow.java
View file

@ -18,40 +18,40 @@
import java.util.*;
import ghidra.program.model.graph.GraphEdge;
import ghidra.program.model.graph.GraphVertex;
import ghidra.program.model.pcode.*;
import ghidra.service.graph.AttributedEdge;
import ghidra.service.graph.AttributedVertex;
public class GraphASTAndFlow extends GraphAST {
@Override
protected void buildGraph() {
HashMap<Integer, GraphVertex> vertices = new HashMap<Integer, GraphVertex>();
HashMap<Integer, AttributedVertex> vertices = new HashMap<>();
edgecount = 0;
Iterator<PcodeOpAST> opiter = getPcodeOpIterator();
HashMap<PcodeOp, GraphVertex> map = new HashMap<PcodeOp, GraphVertex>();
HashMap<PcodeOp, AttributedVertex> map = new HashMap<PcodeOp, AttributedVertex>();
while (opiter.hasNext()) {
PcodeOpAST op = opiter.next();
GraphVertex o = createOpVertex(op);
AttributedVertex o = createOpVertex(op);
map.put(op, o);
for (int i = 0; i < op.getNumInputs(); ++i) {
if ((i == 0) &&
((op.getOpcode() == PcodeOp.LOAD) || (op.getOpcode() == PcodeOp.STORE))) {
continue;
}
if ((i == 1)&&(op.getOpcode() == PcodeOp.INDIRECT))
if ((i == 1) && (op.getOpcode() == PcodeOp.INDIRECT)) {
continue;
}
VarnodeAST vn = (VarnodeAST) op.getInput(i);
if (vn != null) {
GraphVertex v = getVarnodeVertex(vertices, vn);
AttributedVertex v = getVarnodeVertex(vertices, vn);
createEdge(v, o);
}
}
VarnodeAST outvn = (VarnodeAST) op.getOutput();
if (outvn != null) {
GraphVertex outv = getVarnodeVertex(vertices, outvn);
AttributedVertex outv = getVarnodeVertex(vertices, outvn);
if (outv != null) {
createEdge(o, outv);
}
@ -59,8 +59,8 @@ public class GraphASTAndFlow extends GraphAST {
}
opiter = getPcodeOpIterator();
HashSet<PcodeBlockBasic> seenParents = new HashSet<PcodeBlockBasic>();
HashMap<PcodeBlock, GraphVertex> first = new HashMap<PcodeBlock, GraphVertex>();
HashMap<PcodeBlock, GraphVertex> last = new HashMap<PcodeBlock, GraphVertex>();
HashMap<PcodeBlock, AttributedVertex> first = new HashMap<>();
HashMap<PcodeBlock, AttributedVertex> last = new HashMap<>();
while (opiter.hasNext()) {
PcodeOpAST op = opiter.next();
PcodeBlockBasic parent = op.getParent();
@ -76,7 +76,7 @@ public class GraphASTAndFlow extends GraphAST {
first.put(parent, map.get(next));
}
if (prev != null && map.containsKey(prev) && map.containsKey(next)) {
GraphEdge edge = createEdge(map.get(prev), map.get(next));
AttributedEdge edge = createEdge(map.get(prev), map.get(next));
edge.setAttribute(COLOR_ATTRIBUTE, "Black");
}
prev = next;
@ -91,18 +91,10 @@ public class GraphASTAndFlow extends GraphAST {
for (int i = 0; i < block.getInSize(); i++) {
PcodeBlock in = block.getIn(i);
if (last.containsKey(in)) {
GraphEdge edge = createEdge(last.get(in), first.get(block));
AttributedEdge edge = createEdge(last.get(in), first.get(block));
edge.setAttribute(COLOR_ATTRIBUTE, "Red");
}
}
// All outs were already handled by the ins! Don't make two links!
// for (int i = 0; i < block.getOutSize(); i++) {
// PcodeBlock out = block.getOut(i);
// if (first.containsKey(out)) {
// GraphEdge edge = createEdge(last.get(block), first.get(out));
// edge.setAttribute(COLOR_ATTRIBUTE, "Red");
// }
// }
}
}