rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

avoid extra increment to 'savedpc' when jumping

This commit is contained in:
Roberto Ierusalimschy 2011-02-01 16:32:55 -02:00
parent dd547c55c8
commit 06c7efb4a9
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lvm.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lvm.c,v 2.127 2010/12/17 12:05:37 roberto Exp roberto $ ** $Id: lvm.c,v 2.128 2011/02/01 18:03:10 roberto Exp roberto $
** Lua virtual machine ** Lua virtual machine
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -467,13 +467,13 @@ void luaV_finishOp (lua_State *L) {
/* execute a jump instruction */ /* execute a jump instruction */
#define dojump(ci,i) \ #define dojump(ci,i,e) \
{ int a = GETARG_A(i); \ { int a = GETARG_A(i); \
if (a > 0) luaF_close(L, ci->u.l.base + a - 1); \ if (a > 0) luaF_close(L, ci->u.l.base + a - 1); \
ci->u.l.savedpc += GETARG_sBx(i); } ci->u.l.savedpc += GETARG_sBx(i) + e; }
/* for test instructions, execute the jump instruction that follows it */ /* for test instructions, execute the jump instruction that follows it */
#define donextjump(ci) dojump(ci, *ci->u.l.savedpc) #define donextjump(ci) { i = *ci->u.l.savedpc; dojump(ci, i, 1); }
#define Protect(x) { {x;}; base = ci->u.l.base; } #define Protect(x) { {x;}; base = ci->u.l.base; }
@ -627,43 +627,48 @@ void luaV_execute (lua_State *L) {
L->top = ci->top; /* restore top */ L->top = ci->top; /* restore top */
) )
vmcase(OP_JMP, vmcase(OP_JMP,
dojump(ci, i); dojump(ci, i, 0);
) )
vmcase(OP_EQ, vmcase(OP_EQ,
TValue *rb = RKB(i); TValue *rb = RKB(i);
TValue *rc = RKC(i); TValue *rc = RKC(i);
Protect( Protect(
if (equalobj(L, rb, rc) == GETARG_A(i)) if (equalobj(L, rb, rc) != GETARG_A(i))
ci->u.l.savedpc++;
else
donextjump(ci); donextjump(ci);
) )
ci->u.l.savedpc++;
) )
vmcase(OP_LT, vmcase(OP_LT,
Protect( Protect(
if (luaV_lessthan(L, RKB(i), RKC(i)) == GETARG_A(i)) if (luaV_lessthan(L, RKB(i), RKC(i)) != GETARG_A(i))
ci->u.l.savedpc++;
else
donextjump(ci); donextjump(ci);
) )
ci->u.l.savedpc++;
) )
vmcase(OP_LE, vmcase(OP_LE,
Protect( Protect(
if (luaV_lessequal(L, RKB(i), RKC(i)) == GETARG_A(i)) if (luaV_lessequal(L, RKB(i), RKC(i)) != GETARG_A(i))
ci->u.l.savedpc++;
else
donextjump(ci); donextjump(ci);
) )
ci->u.l.savedpc++;
) )
vmcase(OP_TEST, vmcase(OP_TEST,
if (GETARG_C(i) ? !l_isfalse(ra) : l_isfalse(ra)) if (GETARG_C(i) ? l_isfalse(ra) : !l_isfalse(ra))
donextjump(ci);
ci->u.l.savedpc++; ci->u.l.savedpc++;
else
donextjump(ci);
) )
vmcase(OP_TESTSET, vmcase(OP_TESTSET,
TValue *rb = RB(i); TValue *rb = RB(i);
if (GETARG_C(i) ? !l_isfalse(rb) : l_isfalse(rb)) { if (GETARG_C(i) ? l_isfalse(rb) : !l_isfalse(rb))
ci->u.l.savedpc++;
else {
setobjs2s(L, ra, rb); setobjs2s(L, ra, rb);
donextjump(ci); donextjump(ci);
} }
ci->u.l.savedpc++;
) )
vmcase(OP_CALL, vmcase(OP_CALL,
int b = GETARG_B(i); int b = GETARG_B(i);