christoph/lecture-compilers
1
Fork 0
Code Actions Activity

bufixes with printing to image

Browse Source
This commit is contained in:
ChUrl
2021-01-30 15:30:46 +01:00
parent 6e7208e6d3
commit e79980479f
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/codegen/analysis/dataflow/DataFlowGraph.java
View File

@ -25,7 +25,7 @@ public final class DataFlowGraph {
public static DataFlowGraph fromSourceGraph(FlowGraph srcGraph) { public static DataFlowGraph fromSourceGraph(FlowGraph srcGraph) {
final List<DataFlowNode> graph = new LinkedList<>(); final List<DataFlowNode> graph = new LinkedList<>();
for (FlowBasicBlock block : srcGraph.getBlocks()) { for (FlowBasicBlock block : srcGraph.getBasicBlocks()) {
for (FlowInstruction inst : block.getInstructions()) { for (FlowInstruction inst : block.getInstructions()) {
graph.add(DataFlowNode.fromFlowNode(inst, block)); graph.add(DataFlowNode.fromFlowNode(inst, block));
} }
@ -37,7 +37,7 @@ public final class DataFlowGraph {
} }
private static void initSuccPred(FlowGraph srcGraph, List<DataFlowNode> graph) { private static void initSuccPred(FlowGraph srcGraph, List<DataFlowNode> graph) {
for (FlowBasicBlock block : srcGraph.getBlocks()) { for (FlowBasicBlock block : srcGraph.getBasicBlocks()) {
for (FlowInstruction inst : block.getInstructions()) { for (FlowInstruction inst : block.getInstructions()) {
final DataFlowNode current = getNodeByInstruction(inst, graph); final DataFlowNode current = getNodeByInstruction(inst, graph);
@ -94,9 +94,19 @@ public final class DataFlowGraph {
dot.append(this.graph.get(this.graph.size() - 1).getId()).append(" -> END;\n"); dot.append(this.graph.get(this.graph.size() - 1).getId()).append(" -> END;\n");
for (DataFlowNode node : this.graph) { for (DataFlowNode node : this.graph) {
// Successors
for (DataFlowNode succ : node.getSuccessors()) { for (DataFlowNode succ : node.getSuccessors()) {
dot.append(node.getId()).append(" -> ").append(succ.getId()).append(";\n"); dot.append(node.getId()).append(" -> ").append(succ.getId()).append(";\n");
} }
// Predecessors
for (DataFlowNode pred : node.getPredecessors()) {
if (!dot.toString().contains(pred.getId() + " -> " + node.getId())) {
// No duplicates
dot.append(pred.getId()).append(" -> ").append(node.getId()).append(";\n");
}
}
} }
dot.append("}"); dot.append("}");