eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 08:14:09 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Perform better preordering before decompilation

Browse Source
This commit is contained in:
Alexey Andreev 2015-03-13 15:55:02 +04:00
parent 793d1e19d2
commit 77863ad6fd
2 changed files with 82 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
teavm-core/src/main/java/org/teavm/common/GraphIndexer.java
View File

@ -18,7 +18,10 @@ package org.teavm.common;
import com.carrotsearch.hppc.IntOpenHashSet;
import com.carrotsearch.hppc.IntSet;
import com.carrotsearch.hppc.cursors.IntCursor;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/**
*
@ -30,18 +33,19 @@ public class GraphIndexer {
static final byte VISITED = 2;
private int[] indexToNode;
private int[] nodeToIndex;
private byte[] state;
private Graph graph;
private DominatorTree domTree;
private int lastIndex;
private int[] weights;
public GraphIndexer(Graph graph) {
public GraphIndexer(Graph graph, int[] weights) {
int sz = graph.size();
this.weights = weights;
propagateWeights(graph, weights);
indexToNode = new int[sz + 1];
nodeToIndex = new int[sz + 1];
Arrays.fill(nodeToIndex, -1);
Arrays.fill(indexToNode, -1);
state = new byte[sz];
this.graph = graph;
domTree = GraphUtils.buildDominatorTree(graph);
sort(graph);
@ -66,8 +70,38 @@ public class GraphIndexer {
this.graph = sorted.build();
}
private void propagateWeights(Graph graph, int[] weights) {
int sz = graph.size();
byte[] state = new byte[sz];
IntegerStack stack = new IntegerStack(sz * 2);
stack.push(0);
while (!stack.isEmpty()) {
int node = stack.pop();
switch (state[node]) {
case VISITING:
state[node] = VISITED;
for (int succ : graph.outgoingEdges(node)) {
if (state[node] == VISITED) {
weights[node] += weights[succ];
}
}
break;
case NONE:
state[node] = VISITING;
stack.push(node);
for (int succ : graph.outgoingEdges(node)) {
if (state[succ] == NONE) {
stack.push(succ);
}
}
break;
}
}
}
private void sort(Graph graph) {
int sz = graph.size();
byte[] state = new byte[sz];
IntegerStack stack = new IntegerStack(sz * 2);
stack.push(0);
while (!stack.isEmpty()) {
@ -88,25 +122,45 @@ public class GraphIndexer {
}
}
int[] successors = graph.outgoingEdges(node);
List<WeightedNode> succList = new ArrayList<>(successors.length);
IntegerArray orderedSuccessors = new IntegerArray(successors.length);
if (terminalNodes.size() > 0) {
IntSet loopNodes = IntOpenHashSet.from(findNaturalLoop(node, terminalNodes.getAll()));
IntegerArray orderedSuccessors = new IntegerArray(successors.length);
for (int succ : successors) {
if (loopNodes.contains(succ)) {
orderedSuccessors.add(succ);
succList.add(new WeightedNode(succ, weights[succ]));
}
}
Collections.sort(succList);
for (WeightedNode wnode : succList) {
orderedSuccessors.add(wnode.index);
}
IntSet outerSuccessors = new IntOpenHashSet(successors.length);
succList.clear();
for (IntCursor loopNode : loopNodes) {
for (int succ : graph.outgoingEdges(loopNode.value)) {
if (!loopNodes.contains(succ)) {
outerSuccessors.add(succ);
if (outerSuccessors.add(succ)) {
succList.add(new WeightedNode(succ, weights[succ]));
}
}
}
}
orderedSuccessors.addAll(outerSuccessors.toArray());
successors = orderedSuccessors.getAll();
Collections.sort(succList);
for (WeightedNode wnode : succList) {
orderedSuccessors.add(wnode.index);
}
} else {
for (int succ : successors) {
succList.add(new WeightedNode(succ, weights[succ]));
}
Collections.sort(succList);
for (WeightedNode wnode : succList) {
orderedSuccessors.add(wnode.index);
}
}
successors = orderedSuccessors.getAll();
for (int succ : successors) {
if (state[succ] == NONE) {
stack.push(succ);
@ -152,4 +206,19 @@ public class GraphIndexer {
public Graph getGraph() {
return graph;
}
static class WeightedNode implements Comparable<WeightedNode> {
int index;
int weight;
public WeightedNode(int index, int weight) {
this.index = index;
this.weight = weight;
}
@Override
public int compareTo(WeightedNode o) {
return Integer.compare(weight, o.weight);
}
}
}

6
teavm-core/src/main/java/org/teavm/javascript/Decompiler.java
View File

@ -246,7 +246,11 @@ public class Decompiler {
AsyncMethodPart result = new AsyncMethodPart();
lastBlockId = 1;
graph = ProgramUtils.buildControlFlowGraph(program);
indexer = new GraphIndexer(graph);
int[] weights = new int[graph.size()];
for (int i = 0; i < weights.length; ++i) {
weights[i] = program.basicBlockAt(i).getInstructions().size();
}
indexer = new GraphIndexer(graph, weights);
graph = indexer.getGraph();
loopGraph = new LoopGraph(this.graph);
unflatCode();