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

Removes "representative" property of variables in SSA form

Browse Source
This commit is contained in:
konsoletyper 2014-01-22 13:02:27 +04:00
parent d704e503ee
commit 161eb2b9c0
7 changed files with 73 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,6 +109,9 @@ public class JavascriptBuilder {
ValueType.arrayOf(ValueType.CHARACTER), ValueType.VOID)));
dependencyChecker.checkDependencies();
ListableClassHolderSource classSet = dependencyChecker.cutUnachievableClasses();
Decompiler decompiler = new Decompiler(classSet, classLoader);
ClassSetOptimizer optimizer = new ClassSetOptimizer();
optimizer.optimizeAll(classSet);
if (bytecodeLogging) {
try {
logBytecode(new PrintWriter(new OutputStreamWriter(logStream, "UTF-8")), classSet);
@ -116,9 +119,6 @@ public class JavascriptBuilder {
// Just don't do anything
}
}
Decompiler decompiler = new Decompiler(classSet, classLoader);
ClassSetOptimizer optimizer = new ClassSetOptimizer();
optimizer.optimizeAll(classSet);
renderer.renderRuntime();
List<ClassNode> clsNodes = decompiler.decompile(classSet.getClassNames());
for (ClassNode clsNode : clsNodes) {

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

@ -37,7 +37,6 @@ public class Program {
public Variable createVariable() {
Variable variable = new Variable(this);
variable.setIndex(variables.size());
variable.setRepresentative(variable.getIndex());
variables.add(variable);
return variable;
}

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

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

132
teavm-core/src/main/java/org/teavm/model/util/InstructionStringifier.java
View File

@ -30,10 +30,6 @@ public class InstructionStringifier implements InstructionVisitor {
this.sb = sb;
}
private StringBuilder appendVar(Variable var) {
return sb.append('@').append(var.getIndex()).append(":").append(var.getRepresentative());
}
@Override
public void visit(EmptyInstruction insn) {
sb.append("nop");
@ -41,43 +37,49 @@ public class InstructionStringifier implements InstructionVisitor {
@Override
public void visit(ClassConstantInstruction insn) {
appendVar(insn.getReceiver()).append(" := classOf ").append(insn.getConstant());
sb.append("@").append(insn.getReceiver().getIndex()).append(" := classOf ")
.append(insn.getConstant());
}
@Override
public void visit(NullConstantInstruction insn) {
appendVar(insn.getReceiver()).append(" := null");
sb.append("@").append(insn.getReceiver().getIndex()).append(" := null");
}
@Override
public void visit(IntegerConstantInstruction insn) {
appendVar(insn.getReceiver()).append(" := ").append(insn.getConstant());
sb.append("@").append(insn.getReceiver().getIndex()).append(" := ")
.append(insn.getConstant());
}
@Override
public void visit(LongConstantInstruction insn) {
appendVar(insn.getReceiver()).append(" := ").append(insn.getConstant());
sb.append("@").append(insn.getReceiver().getIndex()).append(" := ")
.append(insn.getConstant());
}
@Override
public void visit(FloatConstantInstruction insn) {
appendVar(insn.getReceiver()).append(" := ").append(insn.getConstant());
sb.append("@").append(insn.getReceiver().getIndex()).append(" := ")
.append(insn.getConstant());
}
@Override
public void visit(DoubleConstantInstruction insn) {
appendVar(insn.getReceiver()).append(" := ").append(insn.getConstant());
sb.append("@").append(insn.getReceiver().getIndex()).append(" := ")
.append(insn.getConstant());
}
@Override
public void visit(StringConstantInstruction insn) {
appendVar(insn.getReceiver()).append(" := '").append(insn.getConstant()).append("'");
sb.append("@").append(insn.getReceiver().getIndex()).append(" := '")
.append(insn.getConstant()).append("'");
}
@Override
public void visit(BinaryInstruction insn) {
appendVar(insn.getReceiver()).append(" := ");
appendVar(insn.getFirstOperand()).append(" ");
sb.append("@").append(insn.getReceiver().getIndex()).append(" := @")
.append(insn.getFirstOperand().getIndex()).append(" ");
switch (insn.getOperation()) {
case ADD:
sb.append("+");
@ -116,26 +118,24 @@ public class InstructionStringifier implements InstructionVisitor {
sb.append("^");
break;
}
sb.append(' ');
appendVar(insn.getSecondOperand());
sb.append(" @").append(insn.getSecondOperand().getIndex());
}
@Override
public void visit(NegateInstruction insn) {
appendVar(insn.getReceiver()).append(" := -");
appendVar(insn.getOperand());
sb.append("@").append(insn.getReceiver().getIndex()).append(" := -")
.append(" @").append(insn.getOperand().getIndex());
}
@Override
public void visit(AssignInstruction insn) {
appendVar(insn.getReceiver()).append(" := ");
appendVar(insn.getAssignee());
sb.append("@").append(insn.getReceiver().getIndex()).append(" := @")
.append(insn.getAssignee().getIndex());
}
@Override
public void visit(BranchingInstruction insn) {
sb.append("if ");
appendVar(insn.getOperand()).append(" ");
sb.append("if @").append(insn.getOperand().getIndex()).append(" ");
switch (insn.getCondition()) {
case EQUAL:
sb.append("== 0");
@ -168,8 +168,7 @@ public class InstructionStringifier implements InstructionVisitor {
@Override
public void visit(BinaryBranchingInstruction insn) {
sb.append("if ");
appendVar(insn.getFirstOperand()).append(" ");
sb.append("if @").append(insn.getFirstOperand().getIndex()).append(" ");
switch (insn.getCondition()) {
case EQUAL:
case REFERENCE_EQUAL:
@ -180,7 +179,8 @@ public class InstructionStringifier implements InstructionVisitor {
sb.append("!=");
break;
}
appendVar(insn.getSecondOperand()).append(" then goto $").append(insn.getConsequent().getIndex())
sb.append("@").append(insn.getSecondOperand().getIndex())
.append(" then goto $").append(insn.getConsequent().getIndex())
.append(" else goto $").append(insn.getAlternative().getIndex());
}
@ -191,15 +191,15 @@ public class InstructionStringifier implements InstructionVisitor {
@Override
public void visit(SwitchInstruction insn) {
sb.append("switch ");
appendVar(insn.getCondition()).append(" ");
sb.append("switch @").append(insn.getCondition().getIndex()).append(" ");
List<SwitchTableEntry> entries = insn.getEntries();
for (int i = 0; i < entries.size(); ++i) {
if (i > 0) {
sb.append("; ");
}
SwitchTableEntry entry = entries.get(i);
sb.append("case ").append(entry.getCondition()).append(": goto $").append(entry.getTarget());
sb.append("case ").append(entry.getCondition()).append(": goto $")
.append(entry.getTarget());
}
sb.append(", default: goto $").append(insn.getDefaultTarget());
}
@ -208,46 +208,48 @@ public class InstructionStringifier implements InstructionVisitor {
public void visit(ExitInstruction insn) {
sb.append("return");
if (insn.getValueToReturn() != null) {
sb.append(" ");
appendVar(insn.getValueToReturn());
sb.append(" @").append(insn.getValueToReturn().getIndex());
}
}
@Override
public void visit(RaiseInstruction insn) {
sb.append("throw ");
appendVar(insn.getException());
sb.append("throw @").append(insn.getException().getIndex());
}
@Override
public void visit(ConstructArrayInstruction insn) {
appendVar(insn.getReceiver()).append(" = new ").append(insn.getItemType()).append("[");
appendVar(insn.getSize()).append(']');
sb.append("@").append(insn.getReceiver().getIndex()).append(" = new ")
.append(insn.getItemType()).append("[@").append(insn.getSize().getIndex())
.append(']');
}
@Override
public void visit(ConstructInstruction insn) {
appendVar(insn.getReceiver()).append(" = new ").append(insn.getType()).append("()");
sb.append("@").append(insn.getReceiver().getIndex()).append(" = new ")
.append(insn.getType()).append("()");
}
@Override
public void visit(ConstructMultiArrayInstruction insn) {
appendVar(insn.getReceiver()).append(" = new ").append(insn.getItemType()).append("[");
sb.append("@").append(insn.getReceiver().getIndex()).append(" = new ")
.append(insn.getItemType()).append("[");
List<Variable> dimensions = insn.getDimensions();
for (int i = 0; i < dimensions.size(); ++i) {
if (i > 0) {
sb.append(", ");
}
appendVar(dimensions.get(i));
Variable dimension = dimensions.get(i);
sb.append("@").append(dimension.getIndex());
}
sb.append("]");
}
@Override
public void visit(GetFieldInstruction insn) {
appendVar(insn.getReceiver()).append(" := ");
sb.append("@").append(insn.getReceiver().getIndex()).append(" := ");
if (insn.getInstance() != null) {
appendVar(insn.getInstance());
sb.append("@").append(insn.getInstance().getIndex());
} else {
sb.append(insn.getField().getClassName());
}
@ -257,35 +259,34 @@ public class InstructionStringifier implements InstructionVisitor {
@Override
public void visit(PutFieldInstruction insn) {
if (insn.getInstance() != null) {
appendVar(insn.getInstance());
sb.append("@").append(insn.getInstance().getIndex());
} else {
sb.append(insn.getField().getClassName());
}
sb.append(".").append(insn.getField()).append(" := ");
appendVar(insn.getValue());
sb.append(".").append(insn.getField()).append(" := @").append(insn.getValue().getIndex());
}
@Override
public void visit(GetElementInstruction insn) {
appendVar(insn.getReceiver()).append(" := ");
appendVar(insn.getArray()).append("[");
appendVar(insn.getIndex()).append("]");
sb.append("@").append(insn.getReceiver().getIndex()).append(" := @")
.append(insn.getArray().getIndex()).append("[@")
.append(insn.getIndex().getIndex()).append("]");
}
@Override
public void visit(PutElementInstruction insn) {
appendVar(insn.getArray()).append("[");
appendVar(insn.getIndex()).append("] := ");
appendVar(insn.getValue());
sb.append("@").append(insn.getArray().getIndex()).append("[@")
.append(insn.getIndex().getIndex()).append("] := @")
.append(insn.getValue().getIndex());
}
@Override
public void visit(InvokeInstruction insn) {
if (insn.getReceiver() != null) {
appendVar(insn.getReceiver()).append(" := ");
sb.append("@").append(insn.getReceiver().getIndex()).append(" := ");
}
if (insn.getInstance() != null) {
appendVar(insn.getInstance());
sb.append("@").append(insn.getInstance().getIndex());
} else {
sb.append(insn.getMethod().getClassName());
}
@ -295,52 +296,55 @@ public class InstructionStringifier implements InstructionVisitor {
if (i > 0) {
sb.append(", ");
}
appendVar(arguments.get(i));
sb.append("@").append(arguments.get(i).getIndex());
}
sb.append(")");
}
@Override
public void visit(IsInstanceInstruction insn) {
appendVar(insn.getReceiver()).append(" := ");
appendVar(insn.getValue()).append(" instanceof ").append(insn.getType());
sb.append("@").append(insn.getReceiver().getIndex()).append(" := @")
.append(insn.getValue().getIndex()).append(" instanceof ").append(insn.getType());
}
@Override
public void visit(CastInstruction insn) {
appendVar(insn.getReceiver()).append(" := cast ");
appendVar(insn.getValue()).append(" to ").append(insn.getTargetType());
sb.append("@").append(insn.getReceiver().getIndex()).append(" := cast @")
.append(insn.getValue().getIndex()).append(" to ")
.append(insn.getTargetType());
}
@Override
public void visit(CastNumberInstruction insn) {
appendVar(insn.getReceiver()).append(" := cast ");
appendVar(insn.getValue()).append(" from ").append(insn.getSourceType())
sb.append("@").append(insn.getReceiver().getIndex()).append(" := cast @")
.append(insn.getValue().getIndex())
.append(" from ").append(insn.getSourceType())
.append(" to ").append(insn.getTargetType());
}
@Override
public void visit(CastIntegerInstruction insn) {
appendVar(insn.getReceiver()).append(" := cast ");
appendVar(insn.getValue()).append(" from INT to ").append(insn.getTargetType());
sb.append("@").append(insn.getReceiver().getIndex()).append(" := cast @")
.append(insn.getValue().getIndex())
.append(" from INT to ").append(insn.getTargetType());
}
@Override
public void visit(UnwrapArrayInstruction insn) {
appendVar(insn.getReceiver()).append(" := ");
appendVar(insn.getArray()).append(".data");
sb.append("@").append(insn.getReceiver().getIndex()).append(" := @")
.append(insn.getArray()).append(".data");
}
@Override
public void visit(ArrayLengthInstruction insn) {
appendVar(insn.getReceiver()).append(" := ");
appendVar(insn.getArray()).append(".length");
sb.append("@").append(insn.getReceiver().getIndex()).append(" := @")
.append(insn.getArray().getIndex()).append(".length");
}
@Override
public void visit(CloneArrayInstruction insn) {
appendVar(insn.getReceiver()).append(" := ");
appendVar(insn.getArray()).append(".clone()");
sb.append("@").append(insn.getReceiver().getIndex()).append("@")
.append(insn.getArray().getIndex()).append(".clone()");
}
@Override

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

@ -31,16 +31,14 @@ public class ListingBuilder {
sb.append(prefix).append("$").append(i).append(":\n");
for (Phi phi : block.getPhis()) {
sb.append(prefix).append(" ");
sb.append("@").append(phi.getReceiver().getIndex()).append(":")
.append(phi.getReceiver().getRepresentative()).append(" := ");
sb.append("@").append(phi.getReceiver().getIndex()).append(" := ");
List<Incoming> incomings = phi.getIncomings();
for (int j = 0; j < incomings.size(); ++j) {
if (j > 0) {
sb.append(", ");
}
Incoming incoming = incomings.get(j);
sb.append("@").append(incoming.getValue().getIndex()).append(":")
.append(incoming.getValue().getRepresentative()).append(" from ")
sb.append("@").append(incoming.getValue().getIndex()).append(" from ")
.append("$").append(incoming.getSource().getIndex());
}
sb.append("\n");

24
teavm-core/src/main/java/org/teavm/model/util/PhiEliminator.java
View File

@ -1,24 +0,0 @@
/*
* Copyright 2014 Alexey Andreev.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.teavm.model.util;
/**
*
* @author Alexey Andreev
*/
public class PhiEliminator {
}

5
teavm-core/src/main/java/org/teavm/parsing/SSATransformer.java
View File

@ -77,9 +77,6 @@ public class SSATransformer {
}
}
}
for (int i = 0; i <= arguments.length; ++i) {
program.variableAt(i).setRepresentative(i);
}
arguments = null;
}
@ -126,7 +123,6 @@ public class SSATransformer {
for (Phi phi : currentBlock.getPhis()) {
Variable var = program.createVariable();
variableMap[phi.getReceiver().getIndex()] = var;
var.setRepresentative(phi.getReceiver().getIndex());
phi.setReceiver(var);
}
for (Instruction insn : currentBlock.getInstructions()) {
@ -185,7 +181,6 @@ public class SSATransformer {
private Variable define(Variable var) {
Variable result = program.createVariable();
result.setRepresentative(var.getIndex());
variableMap[var.getIndex()] = result;
return result;
}