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

Improve bytecode generation.

Browse Source
This commit is contained in:
James Roseborough
2010-04-24 18:09:58 +00:00
parent c1f67181fa
commit db3e275a6a
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/jse/org/luaj/vm2/luajc/JavaGen.java
View File

@@ -338,7 +338,7 @@ public class JavaGen {
// a[2] = a[3] = v[1]
builder.createUpvalues(pc, a+3, c);
builder.loadVarresult();
builder.dup();
if ( c>=2 ) builder.dup();
builder.arg( 1 );
builder.dup();
builder.storeLocal(pc, a+2);

18
src/jse/org/luaj/vm2/luajc/Slots.java
View File

@@ -201,20 +201,18 @@ public class Slots {
break;
case Lua.OP_CALL: /* A B C R(A), ... ,R(A+C-2):= R(A)(R(A+1), ... ,R(A+B-1)) */
s[a] |= BIT_ASSIGN | BIT_REFER;
for ( int i=1; i<b; i++ )
for ( int i=0; i<b; i++ )
s[a+i] |= BIT_REFER;
for ( int i=1; i<c-1; i++ )
s[++a] |= BIT_ASSIGN;
while ( ++a<m )
for ( int i=0; i<c-1; i++, a++ )
s[a] |= BIT_ASSIGN;
for ( ; a<m; a++ )
s[a] |= BIT_INVALID;
break;
case Lua.OP_TAILCALL: /* A B C return R(A)(R(A+1), ... ,R(A+B-1)) */
s[a] |= BIT_REFER;
for ( int i=1; i<b; i++ )
s[++a] |= BIT_REFER;
while ( ++a<m )
for ( int i=1; i<b; i++, a++ )
s[a] |= BIT_REFER;
for ( ; a<m; a++ )
s[a] |= BIT_INVALID;
break;
@@ -395,7 +393,7 @@ public class Slots {
}
private int lastAssignBefore(int index, int limit, int j) {
for ( int i=index-1; i>limit; --i )
for ( int i=index; i>limit; --i )
if ( (slots[i][j] & (BIT_ASSIGN | BIT_NIL)) != 0 )
return i;
return index;