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-08-11 00:17:45 +00:00
parent d27f2d6e20
commit a1e8df5a11
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/jse/org/luaj/vm2/luajc/BasicBlock.java
View File

@@ -113,7 +113,9 @@ public class BasicBlock {
break; break;
if ( Lua.GET_OPCODE(code[i+1]) == Lua.OP_JMP ) if ( Lua.GET_OPCODE(code[i+1]) == Lua.OP_JMP )
throw new IllegalArgumentException("OP_LOADBOOL followed by jump at "+i); throw new IllegalArgumentException("OP_LOADBOOL followed by jump at "+i);
break; visitor.visitBranch( i, i+1 );
visitor.visitBranch( i, i+2 );
continue;
case Lua.OP_EQ: case Lua.OP_EQ:
case Lua.OP_LT: case Lua.OP_LT:
case Lua.OP_LE: case Lua.OP_LE:

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

@@ -61,7 +61,7 @@ public class UpvalInfo {
// check for previous assignment // check for previous assignment
loop: while ( true ) { loop: while ( true ) {
// invalid values terminate search // invalid values terminate search
if ( v == VarInfo.INVALID ) if ( v == null || v == VarInfo.INVALID )
return; return;
// basic block for nil values is initial block // basic block for nil values is initial block