nik/lush
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change in macro 'vmcase', avoding code inside it. (Code inside the

Browse Source 
macro harms tools such as debuggers.)
This commit is contained in:
Roberto Ierusalimschy
2014-12-27 18:30:38 -02:00
parent 94eb37dc73
commit 50e2eb8954
1 changed files with 142 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

239
lvm.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lvm.c,v 2.230 2014/11/21 12:15:00 roberto Exp roberto $ ** $Id: lvm.c,v 2.231 2014/12/19 13:36:32 roberto Exp roberto $
** Lua virtual machine ** Lua virtual machine
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -644,8 +644,8 @@ void luaV_finishOp (lua_State *L) {
#define vmdispatch(o) switch(o) #define vmdispatch(o) switch(o)
#define vmcase(l,b) case l: {b} break; #define vmcase(l) case l:
#define vmcasenb(l,b) case l: {b} /* nb = no break */ #define vmbreak break
void luaV_execute (lua_State *L) { void luaV_execute (lua_State *L) {
CallInfo *ci = L->ci; CallInfo *ci = L->ci;
@@ -670,53 +670,64 @@ void luaV_execute (lua_State *L) {
lua_assert(base == ci->u.l.base); lua_assert(base == ci->u.l.base);
lua_assert(base <= L->top && L->top < L->stack + L->stacksize); lua_assert(base <= L->top && L->top < L->stack + L->stacksize);
vmdispatch (GET_OPCODE(i)) { vmdispatch (GET_OPCODE(i)) {
vmcase(OP_MOVE, vmcase(OP_MOVE) {
setobjs2s(L, ra, RB(i)); setobjs2s(L, ra, RB(i));
) vmbreak;
vmcase(OP_LOADK, }
vmcase(OP_LOADK) {
TValue *rb = k + GETARG_Bx(i); TValue *rb = k + GETARG_Bx(i);
setobj2s(L, ra, rb); setobj2s(L, ra, rb);
) vmbreak;
vmcase(OP_LOADKX, }
vmcase(OP_LOADKX) {
TValue *rb; TValue *rb;
lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_EXTRAARG); lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_EXTRAARG);
rb = k + GETARG_Ax(*ci->u.l.savedpc++); rb = k + GETARG_Ax(*ci->u.l.savedpc++);
setobj2s(L, ra, rb); setobj2s(L, ra, rb);
) vmbreak;
vmcase(OP_LOADBOOL, }
vmcase(OP_LOADBOOL) {
setbvalue(ra, GETARG_B(i)); setbvalue(ra, GETARG_B(i));
if (GETARG_C(i)) ci->u.l.savedpc++; /* skip next instruction (if C) */ if (GETARG_C(i)) ci->u.l.savedpc++; /* skip next instruction (if C) */
) vmbreak;
vmcase(OP_LOADNIL, }
vmcase(OP_LOADNIL) {
int b = GETARG_B(i); int b = GETARG_B(i);
do { do {
setnilvalue(ra++); setnilvalue(ra++);
} while (b--); } while (b--);
) vmbreak;
vmcase(OP_GETUPVAL, }
vmcase(OP_GETUPVAL) {
int b = GETARG_B(i); int b = GETARG_B(i);
setobj2s(L, ra, cl->upvals[b]->v); setobj2s(L, ra, cl->upvals[b]->v);
) vmbreak;
vmcase(OP_GETTABUP, }
vmcase(OP_GETTABUP) {
int b = GETARG_B(i); int b = GETARG_B(i);
Protect(luaV_gettable(L, cl->upvals[b]->v, RKC(i), ra)); Protect(luaV_gettable(L, cl->upvals[b]->v, RKC(i), ra));
) vmbreak;
vmcase(OP_GETTABLE, }
vmcase(OP_GETTABLE) {
Protect(luaV_gettable(L, RB(i), RKC(i), ra)); Protect(luaV_gettable(L, RB(i), RKC(i), ra));
) vmbreak;
vmcase(OP_SETTABUP, }
vmcase(OP_SETTABUP) {
int a = GETARG_A(i); int a = GETARG_A(i);
Protect(luaV_settable(L, cl->upvals[a]->v, RKB(i), RKC(i))); Protect(luaV_settable(L, cl->upvals[a]->v, RKB(i), RKC(i)));
) vmbreak;
vmcase(OP_SETUPVAL, }
vmcase(OP_SETUPVAL) {
UpVal *uv = cl->upvals[GETARG_B(i)]; UpVal *uv = cl->upvals[GETARG_B(i)];
setobj(L, uv->v, ra); setobj(L, uv->v, ra);
luaC_upvalbarrier(L, uv); luaC_upvalbarrier(L, uv);
) vmbreak;
vmcase(OP_SETTABLE, }
vmcase(OP_SETTABLE) {
Protect(luaV_settable(L, ra, RKB(i), RKC(i))); Protect(luaV_settable(L, ra, RKB(i), RKC(i)));
) vmbreak;
vmcase(OP_NEWTABLE, }
vmcase(OP_NEWTABLE) {
int b = GETARG_B(i); int b = GETARG_B(i);
int c = GETARG_C(i); int c = GETARG_C(i);
Table *t = luaH_new(L); Table *t = luaH_new(L);
@@ -724,13 +735,15 @@ void luaV_execute (lua_State *L) {
if (b != 0 || c != 0) if (b != 0 || c != 0)
luaH_resize(L, t, luaO_fb2int(b), luaO_fb2int(c)); luaH_resize(L, t, luaO_fb2int(b), luaO_fb2int(c));
checkGC(L, ra + 1); checkGC(L, ra + 1);
) vmbreak;
vmcase(OP_SELF, }
vmcase(OP_SELF) {
StkId rb = RB(i); StkId rb = RB(i);
setobjs2s(L, ra+1, rb); setobjs2s(L, ra+1, rb);
Protect(luaV_gettable(L, rb, RKC(i), ra)); Protect(luaV_gettable(L, rb, RKC(i), ra));
) vmbreak;
vmcase(OP_ADD, }
vmcase(OP_ADD) {
TValue *rb = RKB(i); TValue *rb = RKB(i);
TValue *rc = RKC(i); TValue *rc = RKC(i);
lua_Number nb; lua_Number nc; lua_Number nb; lua_Number nc;
@@ -742,8 +755,9 @@ void luaV_execute (lua_State *L) {
setfltvalue(ra, luai_numadd(L, nb, nc)); setfltvalue(ra, luai_numadd(L, nb, nc));
} }
else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_ADD)); } else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_ADD)); }
) vmbreak;
vmcase(OP_SUB, }
vmcase(OP_SUB) {
TValue *rb = RKB(i); TValue *rb = RKB(i);
TValue *rc = RKC(i); TValue *rc = RKC(i);
lua_Number nb; lua_Number nc; lua_Number nb; lua_Number nc;
@@ -755,8 +769,9 @@ void luaV_execute (lua_State *L) {
setfltvalue(ra, luai_numsub(L, nb, nc)); setfltvalue(ra, luai_numsub(L, nb, nc));
} }
else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_SUB)); } else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_SUB)); }
) vmbreak;
vmcase(OP_MUL, }
vmcase(OP_MUL) {
TValue *rb = RKB(i); TValue *rb = RKB(i);
TValue *rc = RKC(i); TValue *rc = RKC(i);
lua_Number nb; lua_Number nc; lua_Number nb; lua_Number nc;
@@ -768,8 +783,9 @@ void luaV_execute (lua_State *L) {
setfltvalue(ra, luai_nummul(L, nb, nc)); setfltvalue(ra, luai_nummul(L, nb, nc));
} }
else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_MUL)); } else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_MUL)); }
) vmbreak;
vmcase(OP_DIV, /* float division (always with floats) */ }
vmcase(OP_DIV) { /* float division (always with floats) */
TValue *rb = RKB(i); TValue *rb = RKB(i);
TValue *rc = RKC(i); TValue *rc = RKC(i);
lua_Number nb; lua_Number nc; lua_Number nb; lua_Number nc;
@@ -777,8 +793,9 @@ void luaV_execute (lua_State *L) {
setfltvalue(ra, luai_numdiv(L, nb, nc)); setfltvalue(ra, luai_numdiv(L, nb, nc));
} }
else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_DIV)); } else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_DIV)); }
) vmbreak;
vmcase(OP_BAND, }
vmcase(OP_BAND) {
TValue *rb = RKB(i); TValue *rb = RKB(i);
TValue *rc = RKC(i); TValue *rc = RKC(i);
lua_Integer ib; lua_Integer ic; lua_Integer ib; lua_Integer ic;
@@ -786,8 +803,9 @@ void luaV_execute (lua_State *L) {
setivalue(ra, intop(&, ib, ic)); setivalue(ra, intop(&, ib, ic));
} }
else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_BAND)); } else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_BAND)); }
) vmbreak;
vmcase(OP_BOR, }
vmcase(OP_BOR) {
TValue *rb = RKB(i); TValue *rb = RKB(i);
TValue *rc = RKC(i); TValue *rc = RKC(i);
lua_Integer ib; lua_Integer ic; lua_Integer ib; lua_Integer ic;
@@ -795,8 +813,9 @@ void luaV_execute (lua_State *L) {
setivalue(ra, intop(|, ib, ic)); setivalue(ra, intop(|, ib, ic));
} }
else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_BOR)); } else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_BOR)); }
) vmbreak;
vmcase(OP_BXOR, }
vmcase(OP_BXOR) {
TValue *rb = RKB(i); TValue *rb = RKB(i);
TValue *rc = RKC(i); TValue *rc = RKC(i);
lua_Integer ib; lua_Integer ic; lua_Integer ib; lua_Integer ic;
@@ -804,8 +823,9 @@ void luaV_execute (lua_State *L) {
setivalue(ra, intop(^, ib, ic)); setivalue(ra, intop(^, ib, ic));
} }
else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_BXOR)); } else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_BXOR)); }
) vmbreak;
vmcase(OP_SHL, }
vmcase(OP_SHL) {
TValue *rb = RKB(i); TValue *rb = RKB(i);
TValue *rc = RKC(i); TValue *rc = RKC(i);
lua_Integer ib; lua_Integer ic; lua_Integer ib; lua_Integer ic;
@@ -813,8 +833,9 @@ void luaV_execute (lua_State *L) {
setivalue(ra, luaV_shiftl(ib, ic)); setivalue(ra, luaV_shiftl(ib, ic));
} }
else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_SHL)); } else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_SHL)); }
) vmbreak;
vmcase(OP_SHR, }
vmcase(OP_SHR) {
TValue *rb = RKB(i); TValue *rb = RKB(i);
TValue *rc = RKC(i); TValue *rc = RKC(i);
lua_Integer ib; lua_Integer ic; lua_Integer ib; lua_Integer ic;
@@ -822,8 +843,9 @@ void luaV_execute (lua_State *L) {
setivalue(ra, luaV_shiftl(ib, -ic)); setivalue(ra, luaV_shiftl(ib, -ic));
} }
else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_SHR)); } else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_SHR)); }
) vmbreak;
vmcase(OP_MOD, }
vmcase(OP_MOD) {
TValue *rb = RKB(i); TValue *rb = RKB(i);
TValue *rc = RKC(i); TValue *rc = RKC(i);
lua_Number nb; lua_Number nc; lua_Number nb; lua_Number nc;
@@ -837,8 +859,9 @@ void luaV_execute (lua_State *L) {
setfltvalue(ra, m); setfltvalue(ra, m);
} }
else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_MOD)); } else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_MOD)); }
) vmbreak;
vmcase(OP_IDIV, /* floor division */ }
vmcase(OP_IDIV) { /* floor division */
TValue *rb = RKB(i); TValue *rb = RKB(i);
TValue *rc = RKC(i); TValue *rc = RKC(i);
lua_Number nb; lua_Number nc; lua_Number nb; lua_Number nc;
@@ -850,8 +873,9 @@ void luaV_execute (lua_State *L) {
setfltvalue(ra, luai_numidiv(L, nb, nc)); setfltvalue(ra, luai_numidiv(L, nb, nc));
} }
else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_IDIV)); } else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_IDIV)); }
) vmbreak;
vmcase(OP_POW, }
vmcase(OP_POW) {
TValue *rb = RKB(i); TValue *rb = RKB(i);
TValue *rc = RKC(i); TValue *rc = RKC(i);
lua_Number nb; lua_Number nc; lua_Number nb; lua_Number nc;
@@ -859,8 +883,9 @@ void luaV_execute (lua_State *L) {
setfltvalue(ra, luai_numpow(L, nb, nc)); setfltvalue(ra, luai_numpow(L, nb, nc));
} }
else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_POW)); } else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_POW)); }
) vmbreak;
vmcase(OP_UNM, }
vmcase(OP_UNM) {
TValue *rb = RB(i); TValue *rb = RB(i);
lua_Number nb; lua_Number nb;
if (ttisinteger(rb)) { if (ttisinteger(rb)) {
@@ -873,8 +898,9 @@ void luaV_execute (lua_State *L) {
else { else {
Protect(luaT_trybinTM(L, rb, rb, ra, TM_UNM)); Protect(luaT_trybinTM(L, rb, rb, ra, TM_UNM));
} }
) vmbreak;
vmcase(OP_BNOT, }
vmcase(OP_BNOT) {
TValue *rb = RB(i); TValue *rb = RB(i);
lua_Integer ib; lua_Integer ib;
if (tointeger(rb, &ib)) { if (tointeger(rb, &ib)) {
@@ -883,16 +909,19 @@ void luaV_execute (lua_State *L) {
else { else {
Protect(luaT_trybinTM(L, rb, rb, ra, TM_BNOT)); Protect(luaT_trybinTM(L, rb, rb, ra, TM_BNOT));
} }
) vmbreak;
vmcase(OP_NOT, }
vmcase(OP_NOT) {
TValue *rb = RB(i); TValue *rb = RB(i);
int res = l_isfalse(rb); /* next assignment may change this value */ int res = l_isfalse(rb); /* next assignment may change this value */
setbvalue(ra, res); setbvalue(ra, res);
) vmbreak;
vmcase(OP_LEN, }
vmcase(OP_LEN) {
Protect(luaV_objlen(L, ra, RB(i))); Protect(luaV_objlen(L, ra, RB(i)));
) vmbreak;
vmcase(OP_CONCAT, }
vmcase(OP_CONCAT) {
int b = GETARG_B(i); int b = GETARG_B(i);
int c = GETARG_C(i); int c = GETARG_C(i);
StkId rb; StkId rb;
@@ -903,11 +932,13 @@ void luaV_execute (lua_State *L) {
setobjs2s(L, ra, rb); setobjs2s(L, ra, rb);
checkGC(L, (ra >= rb ? ra + 1 : rb)); checkGC(L, (ra >= rb ? ra + 1 : rb));
L->top = ci->top; /* restore top */ L->top = ci->top; /* restore top */
) vmbreak;
vmcase(OP_JMP, }
vmcase(OP_JMP) {
dojump(ci, i, 0); dojump(ci, i, 0);
) vmbreak;
vmcase(OP_EQ, }
vmcase(OP_EQ) {
TValue *rb = RKB(i); TValue *rb = RKB(i);
TValue *rc = RKC(i); TValue *rc = RKC(i);
Protect( Protect(
@@ -916,30 +947,34 @@ void luaV_execute (lua_State *L) {
else else
donextjump(ci); donextjump(ci);
) )
) vmbreak;
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++; ci->u.l.savedpc++;
else else
donextjump(ci); donextjump(ci);
) )
) vmbreak;
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++; ci->u.l.savedpc++;
else else
donextjump(ci); donextjump(ci);
) )
) vmbreak;
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))
ci->u.l.savedpc++; ci->u.l.savedpc++;
else else
donextjump(ci); donextjump(ci);
) vmbreak;
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++; ci->u.l.savedpc++;
@@ -947,8 +982,9 @@ void luaV_execute (lua_State *L) {
setobjs2s(L, ra, rb); setobjs2s(L, ra, rb);
donextjump(ci); donextjump(ci);
} }
) vmbreak;
vmcase(OP_CALL, }
vmcase(OP_CALL) {
int b = GETARG_B(i); int b = GETARG_B(i);
int nresults = GETARG_C(i) - 1; int nresults = GETARG_C(i) - 1;
if (b != 0) L->top = ra+b; /* else previous instruction set top */ if (b != 0) L->top = ra+b; /* else previous instruction set top */
@@ -961,8 +997,9 @@ void luaV_execute (lua_State *L) {
ci->callstatus |= CIST_REENTRY; ci->callstatus |= CIST_REENTRY;
goto newframe; /* restart luaV_execute over new Lua function */ goto newframe; /* restart luaV_execute over new Lua function */
} }
) vmbreak;
vmcase(OP_TAILCALL, }
vmcase(OP_TAILCALL) {
int b = GETARG_B(i); int b = GETARG_B(i);
if (b != 0) L->top = ra+b; /* else previous instruction set top */ if (b != 0) L->top = ra+b; /* else previous instruction set top */
lua_assert(GETARG_C(i) - 1 == LUA_MULTRET); lua_assert(GETARG_C(i) - 1 == LUA_MULTRET);
@@ -990,8 +1027,9 @@ void luaV_execute (lua_State *L) {
lua_assert(L->top == oci->u.l.base + getproto(ofunc)->maxstacksize); lua_assert(L->top == oci->u.l.base + getproto(ofunc)->maxstacksize);
goto newframe; /* restart luaV_execute over new Lua function */ goto newframe; /* restart luaV_execute over new Lua function */
} }
) vmbreak;
vmcasenb(OP_RETURN, }
vmcase(OP_RETURN) {
int b = GETARG_B(i); int b = GETARG_B(i);
if (b != 0) L->top = ra+b-1; if (b != 0) L->top = ra+b-1;
if (cl->p->sizep > 0) luaF_close(L, base); if (cl->p->sizep > 0) luaF_close(L, base);
@@ -1005,8 +1043,8 @@ void luaV_execute (lua_State *L) {
lua_assert(GET_OPCODE(*((ci)->u.l.savedpc - 1)) == OP_CALL); lua_assert(GET_OPCODE(*((ci)->u.l.savedpc - 1)) == OP_CALL);
goto newframe; /* restart luaV_execute over new Lua function */ goto newframe; /* restart luaV_execute over new Lua function */
} }
) }
vmcase(OP_FORLOOP, vmcase(OP_FORLOOP) {
if (ttisinteger(ra)) { /* integer loop? */ if (ttisinteger(ra)) { /* integer loop? */
lua_Integer step = ivalue(ra + 2); lua_Integer step = ivalue(ra + 2);
lua_Integer idx = ivalue(ra) + step; /* increment index */ lua_Integer idx = ivalue(ra) + step; /* increment index */
@@ -1028,8 +1066,9 @@ void luaV_execute (lua_State *L) {
setfltvalue(ra + 3, idx); /* ...and external index */ setfltvalue(ra + 3, idx); /* ...and external index */
} }
} }
) vmbreak;
vmcase(OP_FORPREP, }
vmcase(OP_FORPREP) {
TValue *init = ra; TValue *init = ra;
TValue *plimit = ra + 1; TValue *plimit = ra + 1;
TValue *pstep = ra + 2; TValue *pstep = ra + 2;
@@ -1055,8 +1094,9 @@ void luaV_execute (lua_State *L) {
setfltvalue(init, luai_numsub(L, ninit, nstep)); setfltvalue(init, luai_numsub(L, ninit, nstep));
} }
ci->u.l.savedpc += GETARG_sBx(i); ci->u.l.savedpc += GETARG_sBx(i);
) vmbreak;
vmcasenb(OP_TFORCALL, }
vmcase(OP_TFORCALL) {
StkId cb = ra + 3; /* call base */ StkId cb = ra + 3; /* call base */
setobjs2s(L, cb+2, ra+2); setobjs2s(L, cb+2, ra+2);
setobjs2s(L, cb+1, ra+1); setobjs2s(L, cb+1, ra+1);
@@ -1068,15 +1108,16 @@ void luaV_execute (lua_State *L) {
ra = RA(i); ra = RA(i);
lua_assert(GET_OPCODE(i) == OP_TFORLOOP); lua_assert(GET_OPCODE(i) == OP_TFORLOOP);
goto l_tforloop; goto l_tforloop;
) }
vmcase(OP_TFORLOOP, vmcase(OP_TFORLOOP) {
l_tforloop: l_tforloop:
if (!ttisnil(ra + 1)) { /* continue loop? */ if (!ttisnil(ra + 1)) { /* continue loop? */
setobjs2s(L, ra, ra + 1); /* save control variable */ setobjs2s(L, ra, ra + 1); /* save control variable */
ci->u.l.savedpc += GETARG_sBx(i); /* jump back */ ci->u.l.savedpc += GETARG_sBx(i); /* jump back */
} }
) vmbreak;
vmcase(OP_SETLIST, }
vmcase(OP_SETLIST) {
int n = GETARG_B(i); int n = GETARG_B(i);
int c = GETARG_C(i); int c = GETARG_C(i);
unsigned int last; unsigned int last;
@@ -1097,8 +1138,9 @@ void luaV_execute (lua_State *L) {
luaC_barrierback(L, h, val); luaC_barrierback(L, h, val);
} }
L->top = ci->top; /* correct top (in case of previous open call) */ L->top = ci->top; /* correct top (in case of previous open call) */
) vmbreak;
vmcase(OP_CLOSURE, }
vmcase(OP_CLOSURE) {
Proto *p = cl->p->p[GETARG_Bx(i)]; Proto *p = cl->p->p[GETARG_Bx(i)];
LClosure *ncl = getcached(p, cl->upvals, base); /* cached closure */ LClosure *ncl = getcached(p, cl->upvals, base); /* cached closure */
if (ncl == NULL) /* no match? */ if (ncl == NULL) /* no match? */
@@ -1106,8 +1148,9 @@ void luaV_execute (lua_State *L) {
else else
setclLvalue(L, ra, ncl); /* push cashed closure */ setclLvalue(L, ra, ncl); /* push cashed closure */
checkGC(L, ra + 1); checkGC(L, ra + 1);
) vmbreak;
vmcase(OP_VARARG, }
vmcase(OP_VARARG) {
int b = GETARG_B(i) - 1; int b = GETARG_B(i) - 1;
int j; int j;
int n = cast_int(base - ci->func) - cl->p->numparams - 1; int n = cast_int(base - ci->func) - cl->p->numparams - 1;
@@ -1125,10 +1168,12 @@ void luaV_execute (lua_State *L) {
setnilvalue(ra + j); setnilvalue(ra + j);
} }
} }
) vmbreak;
vmcase(OP_EXTRAARG, }
vmcase(OP_EXTRAARG) {
lua_assert(0); lua_assert(0);
) vmbreak;
}
} }
} }
} }