open-autonomous-connection/luaj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Revert "Update LuaClosure.java"

Browse Source 
This reverts commit 7ed120b704.
This commit is contained in:
Lobby
2020-09-01 10:29:49 +02:00
parent 7ed120b704
commit 1084047e47
1 changed files with 12 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/core/org/luaj/vm2/LuaClosure.java
View File

@@ -23,9 +23,6 @@ package org.luaj.vm2;
import org.luaj.vm2.lib.DebugLib.CallFrame; import org.luaj.vm2.lib.DebugLib.CallFrame;
import java.util.ArrayList;
import java.util.List;
/** /**
* Extension of {@link LuaFunction} which executes lua bytecode. * Extension of {@link LuaFunction} which executes lua bytecode.
* <p> * <p>
@@ -132,97 +129,43 @@ public class LuaClosure extends LuaFunction {
return "function: " + p.toString(); return "function: " + p.toString();
} }
private List<LuaValue[]> stackPool = new ArrayList<>();
private LuaValue[] getNewStack() { private LuaValue[] getNewStack() {
if (stackPool.isEmpty()) {
return getNewStackRaw();
} else {
return stackPool.remove(stackPool.size() - 1);
}
}
private LuaValue[] getNewStackRaw() {
int max = p.maxstacksize; int max = p.maxstacksize;
LuaValue[] stack = new LuaValue[max]; LuaValue[] stack = new LuaValue[max];
System.arraycopy(NILS, 0, stack, 0, max); System.arraycopy(NILS, 0, stack, 0, max);
return stack; return stack;
} }
private void releaseStack(LuaValue[] stack) {
System.arraycopy(NILS, 0, stack, 0, stack.length);
stackPool.add(stack);
}
public final LuaValue call() { public final LuaValue call() {
LuaValue[] stack = getNewStack(); LuaValue[] stack = getNewStack();
LuaValue result = execute(stack,NONE).arg1(); return execute(stack,NONE).arg1();
releaseStack(stack);
return result;
} }
public final LuaValue call(LuaValue arg) { public final LuaValue call(LuaValue arg) {
LuaValue[] stack = getNewStack(); LuaValue[] stack = getNewStack();
LuaValue result;
switch ( p.numparams ) { switch ( p.numparams ) {
default: default: stack[0]=arg; return execute(stack,NONE).arg1();
stack[0]=arg; case 0: return execute(stack,arg).arg1();
result = execute(stack,NONE).arg1();
break;
case 0:
result = execute(stack,arg).arg1();
break;
} }
releaseStack(stack);
return result;
} }
public final LuaValue call(LuaValue arg1, LuaValue arg2) { public final LuaValue call(LuaValue arg1, LuaValue arg2) {
LuaValue[] stack = getNewStack(); LuaValue[] stack = getNewStack();
LuaValue result;
switch ( p.numparams ) { switch ( p.numparams ) {
default: default: stack[0]=arg1; stack[1]=arg2; return execute(stack,NONE).arg1();
stack[0]=arg1; case 1: stack[0]=arg1; return execute(stack,arg2).arg1();
stack[1]=arg2; case 0: return execute(stack,p.is_vararg!=0? varargsOf(arg1,arg2): NONE).arg1();
result = execute(stack,NONE).arg1();
break;
case 1:
stack[0]=arg1;
result = execute(stack,arg2).arg1();
break;
case 0:
result = execute(stack,p.is_vararg!=0 ? varargsOf(arg1,arg2) : NONE).arg1();
break;
} }
releaseStack(stack);
return result;
} }
public final LuaValue call(LuaValue arg1, LuaValue arg2, LuaValue arg3) { public final LuaValue call(LuaValue arg1, LuaValue arg2, LuaValue arg3) {
LuaValue[] stack = getNewStack(); LuaValue[] stack = getNewStack();
LuaValue result;
switch ( p.numparams ) { switch ( p.numparams ) {
default: default: stack[0]=arg1; stack[1]=arg2; stack[2]=arg3; return execute(stack,NONE).arg1();
stack[0]=arg1; case 2: stack[0]=arg1; stack[1]=arg2; return execute(stack,arg3).arg1();
stack[1]=arg2; case 1: stack[0]=arg1; return execute(stack,p.is_vararg!=0? varargsOf(arg2,arg3): NONE).arg1();
stack[2]=arg3; case 0: return execute(stack,p.is_vararg!=0? varargsOf(arg1,arg2,arg3): NONE).arg1();
result = execute(stack,NONE).arg1();
break;
case 2:
stack[0]=arg1;
stack[1]=arg2;
result = execute(stack,arg3).arg1();
break;
case 1:
stack[0]=arg1;
result = execute(stack,p.is_vararg!=0 ? varargsOf(arg2,arg3) : NONE).arg1();
break;
case 0:
result = execute(stack,p.is_vararg!=0 ? varargsOf(arg1,arg2,arg3) : NONE).arg1();
break;
} }
releaseStack(stack);
return result;
} }
public final Varargs invoke(Varargs varargs) { public final Varargs invoke(Varargs varargs) {
@@ -233,11 +176,7 @@ public class LuaClosure extends LuaFunction {
LuaValue[] stack = getNewStack(); LuaValue[] stack = getNewStack();
for ( int i=0; i<p.numparams; i++ ) for ( int i=0; i<p.numparams; i++ )
stack[i] = varargs.arg(i+1); stack[i] = varargs.arg(i+1);
Varargs result = execute(stack,p.is_vararg!=0 ? varargs.subargs(p.numparams+1) : NONE); return execute(stack,p.is_vararg!=0? varargs.subargs(p.numparams+1): NONE);
if (result instanceof LuaValue) {
releaseStack(stack);
}
return result;
} }
protected Varargs execute( LuaValue[] stack, Varargs varargs ) { protected Varargs execute( LuaValue[] stack, Varargs varargs ) {