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

Allow jit to find upvalues.

Browse Source
This commit is contained in:
James Roseborough
2008-05-21 00:37:10 +00:00
parent 3582b97d8b
commit 539b0ea57f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/org/luaj/vm/LuaState.java
View File

@@ -878,7 +878,7 @@ public class LuaState extends Lua {
} }
} }
private UpVal findUpVal( int target ) { public UpVal findUpVal( int target ) {
UpVal up; UpVal up;
int i; int i;
for ( i = this.upvals.size() - 1; i >= 0; --i ) { for ( i = this.upvals.size() - 1; i >= 0; --i ) {
@@ -895,7 +895,7 @@ public class LuaState extends Lua {
return up; return up;
} }
private void closeUpVals( int limit ) { public void closeUpVals( int limit ) {
while ( !upvals.empty() && ( (UpVal) this.upvals.lastElement() ).close( limit ) ) { while ( !upvals.empty() && ( (UpVal) this.upvals.lastElement() ).close( limit ) ) {
this.upvals.pop(); this.upvals.pop();
} }

8
src/script/org/luaj/jit/LuaJit.java
View File

@@ -663,14 +663,14 @@ public class LuaJit extends Lua implements LuaCompiler {
//continue; //continue;
b = LuaState.GETARG_Bx(i); b = LuaState.GETARG_Bx(i);
ps.println("\t\ts"+a+" = newcl = p.p["+b+"].newClosure(env);"); ps.println("\t\ts"+a+" = newcl = p.p["+b+"].newClosure(env);");
for (int j = 0, nj=p.p[b].nups; j < nj; j++, pc++) { for (int j = 0, nj=p.p[b].nups; j < nj; j++) {
i = code[pc]; i = code[++pc];
o = LuaState.GET_OPCODE(i); o = LuaState.GET_OPCODE(i);
b = LuaState.GETARG_B(i); b = LuaState.GETARG_B(i);
if (o == LuaState.OP_GETUPVAL) { if (o == LuaState.OP_GETUPVAL) {
ps.println("\t\tnewcl.upVals[j] = newcl.upVals["+b+"];"); ps.println("\t\tnewcl.upVals["+j+"] = newcl.upVals["+b+"];");
} else if (o == LuaState.OP_MOVE) { } else if (o == LuaState.OP_MOVE) {
ps.println("\t\tnewcl.upVals[j] = vm.findUpVal(base+"+b+");"); ps.println("\t\tnewcl.upVals["+j+"] = vm.findUpVal(base+"+b+");");
} else { } else {
throw new java.lang.IllegalArgumentException("bad opcode: " + o); throw new java.lang.IllegalArgumentException("bad opcode: " + o);
} }