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

First correct local variable mapping

Browse Source
This commit is contained in:
konsoletyper 2014-08-06 20:56:33 +04:00
parent 36d76885a7
commit 8d0432dd5e
5 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,4 +65,17 @@ public class Variable implements VariableReader {
public void setDebugName(String debugName) {
this.debugName = debugName;
}
public void mergeDebugName(String otherDebugName) {
if (otherDebugName == null) {
return;
}
String[] parts = debugName != null ? debugName.split("\\|") : new String[0];
for (String part : parts) {
if (otherDebugName.equals(part)) {
return;
}
}
debugName = debugName != null ? debugName + "|" + otherDebugName : otherDebugName;
}
}

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

@ -214,6 +214,15 @@ public class RegisterAllocator {
varMap[tryCatch.getExceptionVariable().getIndex()]));
}
}
String[] originalNames = new String[program.variableCount()];
for (int i = 0; i < program.variableCount(); ++i) {
Variable var = program.variableAt(i);
originalNames[i] = var.getDebugName();
var.setDebugName(null);
}
for (int i = 0; i < program.variableCount(); ++i) {
program.variableAt(varMap[i]).mergeDebugName(originalNames[i]);
}
}
private void renameInterferenceGraph(List<MutableGraphNode> graph, DisjointSet classes, final int[] varMap) {

3
teavm-core/src/main/java/org/teavm/optimization/GlobalValueNumbering.java
View File

@ -112,6 +112,9 @@ public class GlobalValueNumbering implements MethodOptimization {
for (int i = 0; i < map.length; ++i) {
if (map[i] != i) {
Variable var = program.variableAt(i);
Variable mapVar = program.variableAt(map[i]);
mapVar.mergeDebugName(var.getDebugName());
program.deleteVariable(i);
}
}

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

@ -175,12 +175,14 @@ public class SSATransformer {
int[] phiIndexes = phiIndexMap[successor];
List<Phi> phis = program.basicBlockAt(successor).getPhis();
for (int j = 0; j < phis.size(); ++j) {
Phi phi = phis.get(j);
Variable var = variableMap[phiIndexes[j]];
if (var != null) {
Incoming incoming = new Incoming();
incoming.setSource(currentBlock);
incoming.setValue(var);
phis.get(j).getIncomings().add(incoming);
phi.getIncomings().add(incoming);
phi.getReceiver().mergeDebugName(var.getDebugName());
}
}
}

10
teavm-core/src/main/resources/org/teavm/javascript/runtime.js
View File

@ -391,6 +391,16 @@ function $rt_s(index) {
return $rt_stringPool_instance[index];
}
function $dbg_repr(obj) {
return obj.toString();
}
function $dbg_class(obj) {
if (obj instanceof Long) {
return "long";
}
return obj.constructor.$meta.name;
}
Long = function(lo, hi) {
this.lo = lo | 0;
this.hi = hi | 0;