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

Fixes minor decompilation issues

Browse Source
This commit is contained in:
konsoletyper 2014-01-27 12:36:35 +04:00
parent 0eb4e54e51
commit 94fe8a0acf
13 changed files with 72 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
teavm-classlib/pom.xml
View File

@ -52,7 +52,7 @@
</goals>
<phase>process-test-classes</phase>
<configuration>
<minifying>false</minifying>
<minifying>true</minifying>
</configuration>
</execution>
</executions>

3
teavm-core/src/main/java/org/teavm/codegen/SourceWriter.java
View File

@ -55,18 +55,21 @@ public class SourceWriter implements Appendable {
@Override
public SourceWriter append(char value) throws IOException {
appendIndent();
innerWriter.append(value);
return this;
}
@Override
public SourceWriter append(CharSequence csq) throws IOException {
appendIndent();
innerWriter.append(csq);
return this;
}
@Override
public SourceWriter append(CharSequence csq, int start, int end) throws IOException {
appendIndent();
innerWriter.append(csq, start, end);
return this;
}

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

@ -183,9 +183,6 @@ public class Decompiler {
if (node >= 0) {
generator.currentBlock = program.basicBlockAt(node);
int tmp = indexer.nodeAt(next);
if (tmp == -1) {
System.out.println();
}
generator.nextBlock = next < indexer.size() ? program.basicBlockAt(tmp) : null;
generator.statements.clear();
for (Instruction insn : generator.currentBlock.getInstructions()) {
@ -200,7 +197,9 @@ public class Decompiler {
RegularMethodNode methodNode = new RegularMethodNode(reference);
methodNode.getModifiers().addAll(mapModifiers(method.getModifiers()));
methodNode.setBody(result);
methodNode.setVariableCount(program.variableCount());
for (int i = 0; i < program.variableCount(); ++i) {
methodNode.getVariables().add(program.variableAt(i).getRegister());
}
Optimizer optimizer = new Optimizer();
optimizer.optimize(methodNode);
return methodNode;

24
teavm-core/src/main/java/org/teavm/javascript/JavascriptBuilder.java
View File

@ -112,6 +112,7 @@ public class JavascriptBuilder {
Decompiler decompiler = new Decompiler(classSet, classLoader);
ClassSetOptimizer optimizer = new ClassSetOptimizer();
optimizer.optimizeAll(classSet);
allocateRegisters(classSet);
if (bytecodeLogging) {
try {
logBytecode(new PrintWriter(new OutputStreamWriter(logStream, "UTF-8")), classSet);
@ -138,6 +139,18 @@ public class JavascriptBuilder {
}
}
private void allocateRegisters(ListableClassHolderSource classes) {
RegisterAllocator allocator = new RegisterAllocator();
for (String className : classes.getClassNames()) {
ClassHolder cls = classes.getClassHolder(className);
for (MethodHolder method : cls.getMethods()) {
if (method.getProgram() != null && method.getProgram().basicBlockCount() > 0) {
allocator.allocateRegisters(method);
}
}
}
}
private void logBytecode(PrintWriter writer, ListableClassHolderSource classes) {
for (String className : classes.getClassNames()) {
ClassHolder classHolder = classes.getClassHolder(className);
@ -161,14 +174,13 @@ public class JavascriptBuilder {
printType(writer, parameterTypes[i]);
}
writer.println(")");
if (method.getProgram() != null && method.getProgram().basicBlockCount() > 0) {
Program program = method.getProgram();
if (program != null && program.basicBlockCount() > 0) {
ListingBuilder builder = new ListingBuilder();
RegisterAllocator allocator = new RegisterAllocator();
int[] colors = allocator.allocateRegisters(method);
writer.print(builder.buildListing(method.getProgram(), " "));
writer.print(builder.buildListing(program, " "));
writer.print(" Register allocation:");
for (int i = 0; i < colors.length; ++i) {
writer.print(i + ":" + colors[i] + " ");
for (int i = 0; i < program.variableCount(); ++i) {
writer.print(i + ":" + program.variableAt(i).getRegister() + " ");
}
writer.println();
writer.println();

9
teavm-core/src/main/java/org/teavm/javascript/Optimizer.java
View File

@ -34,14 +34,17 @@ public class Optimizer {
}
public void optimize(RegularMethodNode method) {
ReadWriteStatsBuilder stats = new ReadWriteStatsBuilder(method.getVariableCount());
ReadWriteStatsBuilder stats = new ReadWriteStatsBuilder(method.getVariables().size());
method.getBody().acceptVisitor(stats);
OptimizingVisitor optimizer = new OptimizingVisitor(stats);
method.getBody().acceptVisitor(optimizer);
method.setBody(optimizer.resultStmt);
int paramCount = method.getReference().parameterCount();
UnusedVariableEliminator unusedEliminator = new UnusedVariableEliminator(paramCount, method.getVariableCount());
UnusedVariableEliminator unusedEliminator = new UnusedVariableEliminator(paramCount, method.getVariables());
method.getBody().acceptVisitor(unusedEliminator);
method.setVariableCount(unusedEliminator.lastIndex);
method.getVariables().subList(unusedEliminator.lastIndex, method.getVariables().size()).clear();
for (int i = 0; i < method.getVariables().size(); ++i) {
method.getVariables().set(i, i);
}
}
}

12
teavm-core/src/main/java/org/teavm/javascript/OptimizingVisitor.java
View File

@ -271,16 +271,8 @@ class OptimizingVisitor implements StatementVisitor, ExprVisitor {
} else {
statement.getRightValue().acceptVisitor(this);
Expr right = resultExpr;
Expr left;
if (statement.getLeftValue() instanceof VariableExpr) {
VariableExpr leftVar = (VariableExpr)statement.getLeftValue();
left = statement.getLeftValue();
if (stats.reads[leftVar.getIndex()] == 0) {
left = null;
} else {
left = statement.getLeftValue();
}
} else {
Expr left = statement.getLeftValue();
if (!(statement.getLeftValue() instanceof VariableExpr)) {
statement.getLeftValue().acceptVisitor(this);
left = resultExpr;
}

5
teavm-core/src/main/java/org/teavm/javascript/Renderer.java
View File

@ -332,7 +332,10 @@ public class Renderer implements ExprVisitor, StatementVisitor {
public void visit(RegularMethodNode method) {
try {
MethodReference ref = method.getReference();
int variableCount = method.getVariableCount();
int variableCount = 0;
for (int var : method.getVariables()) {
variableCount = Math.max(variableCount, var + 1);
}
boolean hasVars = variableCount > ref.parameterCount() + 1;
if (hasVars) {
writer.append("var ");

32
teavm-core/src/main/java/org/teavm/javascript/StatementGenerator.java
View File

@ -578,7 +578,7 @@ class StatementGenerator implements InstructionVisitor {
assign(castToInteger(Expr.binary(op, Expr.var(first), Expr.var(second))), result);
}
private Statement generateJumpStatementWithoutPhis(BasicBlock target) {
private Statement generateJumpStatement(BasicBlock target) {
if (nextBlock == target) {
return null;
}
@ -593,29 +593,8 @@ class StatementGenerator implements InstructionVisitor {
return contStmt;
}
}
private Statement wrapWithPhis(Statement rawJump, BasicBlock target) {
SequentialStatement seq = new SequentialStatement();
for (Phi phi : target.getPhis()) {
for (Incoming outgoing : phi.getIncomings()) {
if (outgoing.getSource() == currentBlock) {
seq.getSequence().add(Statement.assign(Expr.var(outgoing.getPhi().getReceiver().getIndex()),
Expr.var(outgoing.getValue().getIndex())));
}
}
}
if (rawJump != null) {
seq.getSequence().add(rawJump);
}
return !seq.getSequence().isEmpty() ? seq : null;
}
private Statement generateJumpStatement(BasicBlock target) {
return wrapWithPhis(generateJumpStatementWithoutPhis(target), target);
}
private Statement generateJumpStatementWithoutPhis(SwitchStatement stmt, int target) {
Statement body = generateJumpStatementWithoutPhis(program.basicBlockAt(target));
private Statement generateJumpStatement(SwitchStatement stmt, int target) {
Statement body = generateJumpStatement(program.basicBlockAt(target));
if (body == null) {
BreakStatement breakStmt = new BreakStatement();
breakStmt.setTarget(stmt);
@ -623,11 +602,6 @@ class StatementGenerator implements InstructionVisitor {
}
return body;
}
private Statement generateJumpStatement(SwitchStatement stmt, int target) {
return wrapWithPhis(generateJumpStatementWithoutPhis(stmt, target), program.basicBlockAt(target));
}
private void branch(Expr condition, BasicBlock consequentBlock, BasicBlock alternativeBlock) {
Statement consequent = generateJumpStatement(consequentBlock);
Statement alternative = generateJumpStatement(alternativeBlock);

15
teavm-core/src/main/java/org/teavm/javascript/UnusedVariableEliminator.java
View File

@ -16,6 +16,7 @@
package org.teavm.javascript;
import java.util.Arrays;
import java.util.List;
import org.teavm.javascript.ast.*;
/**
@ -23,10 +24,18 @@ import org.teavm.javascript.ast.*;
* @author Alexey Andreev
*/
class UnusedVariableEliminator implements ExprVisitor, StatementVisitor {
int[] variables;
int[] indexes;
int lastIndex;
public UnusedVariableEliminator(int parameterCount, int variableCount) {
public UnusedVariableEliminator(int parameterCount, List<Integer> variables) {
this.variables = new int[variables.size()];
int variableCount = 0;
for (int i = 0; i < variables.size(); ++i) {
int var = variables.get(i);
this.variables[i] = var;
variableCount = Math.max(variableCount, var + 1);
}
indexes = new int[variableCount];
Arrays.fill(indexes, -1);
for (int i = 0; i <= parameterCount; ++i) {
@ -109,10 +118,10 @@ class UnusedVariableEliminator implements ExprVisitor, StatementVisitor {
}
private int renumber(int var) {
int index = indexes[var];
int index = indexes[variables[var]];
if (index == -1) {
index = lastIndex++;
indexes[var] = index;
indexes[variables[var]] = index;
}
return index;
}

12
teavm-core/src/main/java/org/teavm/javascript/ast/RegularMethodNode.java
View File

@ -15,6 +15,8 @@
*/
package org.teavm.javascript.ast;
import java.util.ArrayList;
import java.util.List;
import org.teavm.model.MethodReference;
/**
@ -23,7 +25,7 @@ import org.teavm.model.MethodReference;
*/
public class RegularMethodNode extends MethodNode {
private Statement body;
private int variableCount;
private List<Integer> variables = new ArrayList<>();
public RegularMethodNode(MethodReference reference) {
super(reference);
@ -37,12 +39,8 @@ public class RegularMethodNode extends MethodNode {
this.body = body;
}
public int getVariableCount() {
return variableCount;
}
public void setVariableCount(int variableCount) {
this.variableCount = variableCount;
public List<Integer> getVariables() {
return variables;
}
@Override

2
teavm-core/src/main/java/org/teavm/model/Program.java
View File

@ -27,6 +27,7 @@ public class Program {
private List<Variable> variables = new ArrayList<>();
private MethodHolder method;
private boolean packed;
private int lastUsedRegister;
public BasicBlock createBasicBlock() {
BasicBlock block = new BasicBlock(this, basicBlocks.size());
@ -38,6 +39,7 @@ public class Program {
Variable variable = new Variable(this);
variable.setIndex(variables.size());
variables.add(variable);
variable.setRegister(lastUsedRegister++);
return variable;
}

9
teavm-core/src/main/java/org/teavm/model/Variable.java
View File

@ -22,6 +22,7 @@ package org.teavm.model;
public class Variable {
private Program program;
private int index;
private int register;
Variable(Program program) {
this.program = program;
@ -42,4 +43,12 @@ public class Variable {
void setProgram(Program program) {
this.program = program;
}
public int getRegister() {
return register;
}
public void setRegister(int register) {
this.register = register;
}
}

6
teavm-core/src/main/java/org/teavm/model/util/RegisterAllocator.java
View File

@ -28,7 +28,7 @@ import org.teavm.model.instructions.JumpInstruction;
* @author Alexey Andreev
*/
public class RegisterAllocator {
public int[] allocateRegisters(MethodHolder method) {
public void allocateRegisters(MethodHolder method) {
Program program = method.getProgram();
List<PhiArgumentCopy> phiArgsCopies = insertPhiArgumentsCopies(program);
InterferenceGraphBuilder interferenceBuilder = new InterferenceGraphBuilder();
@ -45,7 +45,9 @@ public class RegisterAllocator {
}
GraphColorer colorer = new GraphColorer();
colorer.colorize(interferenceGraph, classArray, colors);
return colors;
for (int i = 0; i < colors.length; ++i) {
method.getProgram().variableAt(i).setRegister(colors[i]);
}
}
private static class PhiArgumentCopy {