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

JS: reduce size of wrapped virtual methods

Browse Source
This commit is contained in:
Alexey Andreev 2020-03-02 11:50:45 +03:00
parent 8d1eb3fcc6
commit 81235ac714
2 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/main/java/org/teavm/backend/javascript/rendering/Renderer.java
View File

@ -251,7 +251,8 @@ public class Renderer implements RenderingManager {
String[] names = { "$rt_throw", "$rt_compare", "$rt_nullCheck", "$rt_cls", "$rt_createArray", String[] names = { "$rt_throw", "$rt_compare", "$rt_nullCheck", "$rt_cls", "$rt_createArray",
"$rt_isInstance", "$rt_nativeThread", "$rt_suspending", "$rt_resuming", "$rt_invalidPointer", "$rt_isInstance", "$rt_nativeThread", "$rt_suspending", "$rt_resuming", "$rt_invalidPointer",
"$rt_s", "$rt_eraseClinit", "$rt_imul", "$rt_wrapException", "$rt_checkBounds", "$rt_s", "$rt_eraseClinit", "$rt_imul", "$rt_wrapException", "$rt_checkBounds",
"$rt_checkUpperBound", "$rt_checkLowerBound" }; "$rt_checkUpperBound", "$rt_checkLowerBound", "$rt_wrapFunction0", "$rt_wrapFunction1",
"$rt_wrapFunction2", "$rt_wrapFunction3", "$rt_wrapFunction4" };
boolean first = true; boolean first = true;
for (String name : names) { for (String name : names) {
if (!first) { if (!first) {
@ -789,9 +790,20 @@ public class Renderer implements RenderingManager {
private void emitVirtualDeclaration(MethodReference ref) throws IOException { private void emitVirtualDeclaration(MethodReference ref) throws IOException {
String methodName = naming.getNameFor(ref.getDescriptor()); String methodName = naming.getNameFor(ref.getDescriptor());
writer.append("\"").append(methodName).append("\""); writer.append("\"").append(methodName).append("\"");
writer.append(",").ws().append("function("); writer.append(",").ws();
emitVirtualFunctionWrapper(ref);
}
private void emitVirtualFunctionWrapper(MethodReference method) throws IOException {
if (method.parameterCount() <= 4) {
writer.appendFunction("$rt_wrapFunction" + method.parameterCount());
writer.append("(").appendMethodBody(method).append(")");
return;
}
writer.append("function(");
List<String> args = new ArrayList<>(); List<String> args = new ArrayList<>();
for (int i = 1; i <= ref.parameterCount(); ++i) { for (int i = 1; i <= method.parameterCount(); ++i) {
args.add(variableNameForInitializer(i)); args.add(variableNameForInitializer(i));
} }
for (int i = 0; i < args.size(); ++i) { for (int i = 0; i < args.size(); ++i) {
@ -801,10 +813,10 @@ public class Renderer implements RenderingManager {
writer.append(args.get(i)); writer.append(args.get(i));
} }
writer.append(")").ws().append("{").ws(); writer.append(")").ws().append("{").ws();
if (ref.getDescriptor().getResultType() != ValueType.VOID) { if (method.getDescriptor().getResultType() != ValueType.VOID) {
writer.append("return "); writer.append("return ");
} }
writer.appendMethodBody(ref).append("("); writer.appendMethodBody(method).append("(");
writer.append("this"); writer.append("this");
for (String arg : args) { for (String arg : args) {
writer.append(",").ws().append(arg); writer.append(",").ws().append(arg);

25
core/src/main/resources/org/teavm/backend/javascript/runtime.js
View File

@ -500,6 +500,31 @@ function $rt_metadata(data) {
cls.$array = null; cls.$array = null;
} }
} }
function $rt_wrapFunction0(f) {
return function() {
return f(this);
}
}
function $rt_wrapFunction1(f) {
return function(p1) {
return f(this, p1);
}
}
function $rt_wrapFunction2(f) {
return function(p1, p2) {
return f(this, p1, p2);
}
}
function $rt_wrapFunction3(f) {
return function(p1, p2, p3) {
return f(this, p1, p2, p3, p3);
}
}
function $rt_wrapFunction4(f) {
return function(p1, p2, p3, p4) {
return f(this, p1, p2, p3, p4);
}
}
function $rt_threadStarter(f) { function $rt_threadStarter(f) {
return function() { return function() {
var args = Array.prototype.slice.apply(arguments); var args = Array.prototype.slice.apply(arguments);