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

better control of local variables in luaV_execute

This commit is contained in:
Roberto Ierusalimschy 2005-05-03 16:01:17 -03:00
parent b320d37a80
commit b0abc2ca03
1 changed files with 96 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

175
lvm.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lvm.c,v 2.38 2005/04/11 18:01:29 roberto Exp roberto $ ** $Id: lvm.c,v 2.39 2005/05/02 17:49:43 roberto Exp roberto $
** Lua virtual machine ** Lua virtual machine
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -83,10 +83,10 @@ static void traceexec (lua_State *L, const Instruction *pc) {
static void callTMres (lua_State *L, StkId res, const TValue *f, static void callTMres (lua_State *L, StkId res, const TValue *f,
const TValue *p1, const TValue *p2) { const TValue *p1, const TValue *p2) {
ptrdiff_t result = savestack(L, res); ptrdiff_t result = savestack(L, res);
luaD_checkstack(L, 3);
setobj2s(L, L->top, f); /* push function */ setobj2s(L, L->top, f); /* push function */
setobj2s(L, L->top+1, p1); /* 1st argument */ setobj2s(L, L->top+1, p1); /* 1st argument */
setobj2s(L, L->top+2, p2); /* 2nd argument */ setobj2s(L, L->top+2, p2); /* 2nd argument */
luaD_checkstack(L, 3);
L->top += 3; L->top += 3;
luaD_call(L, L->top - 3, 1); luaD_call(L, L->top - 3, 1);
res = restorestack(L, result); res = restorestack(L, result);
@ -97,11 +97,11 @@ static void callTMres (lua_State *L, StkId res, const TValue *f,
static void callTM (lua_State *L, const TValue *f, const TValue *p1, const TValue *p2, const TValue *p3) { static void callTM (lua_State *L, const TValue *f, const TValue *p1, const TValue *p2, const TValue *p3) {
luaD_checkstack(L, 4);
setobj2s(L, L->top, f); /* push function */ setobj2s(L, L->top, f); /* push function */
setobj2s(L, L->top+1, p1); /* 1st argument */ setobj2s(L, L->top+1, p1); /* 1st argument */
setobj2s(L, L->top+2, p2); /* 2nd argument */ setobj2s(L, L->top+2, p2); /* 2nd argument */
setobj2s(L, L->top+3, p3); /* 3th argument */ setobj2s(L, L->top+3, p3); /* 3th argument */
luaD_checkstack(L, 4);
L->top += 4; L->top += 4;
luaD_call(L, L->top - 4, 0); luaD_call(L, L->top - 4, 0);
} }
@ -354,8 +354,12 @@ static StkId Arith (lua_State *L, StkId ra, const TValue *rb,
#define dojump(L,pc,i) {(pc) += (i); luai_threadyield(L);} #define dojump(L,pc,i) {(pc) += (i); luai_threadyield(L);}
#define Protect(x) { L->savedpc = pc; {x;}; base = L->base; }
StkId luaV_execute (lua_State *L, int nexeccalls) { StkId luaV_execute (lua_State *L, int nexeccalls) {
LClosure *cl; LClosure *cl;
StkId base;
TValue *k; TValue *k;
const Instruction *pc; const Instruction *pc;
callentry: /* entry point when calling new functions */ callentry: /* entry point when calling new functions */
@ -364,25 +368,24 @@ StkId luaV_execute (lua_State *L, int nexeccalls) {
retentry: /* entry point when returning to old functions */ retentry: /* entry point when returning to old functions */
pc = L->savedpc; pc = L->savedpc;
cl = &clvalue(L->ci->func)->l; cl = &clvalue(L->ci->func)->l;
base = L->base;
k = cl->p->k; k = cl->p->k;
/* main loop of interpreter */ /* main loop of interpreter */
for (;;) { for (;;) {
StkId base;
const Instruction i = *pc++; const Instruction i = *pc++;
StkId ra; StkId ra;
if ((L->hookmask & (LUA_MASKLINE | LUA_MASKCOUNT)) && if ((L->hookmask & (LUA_MASKLINE | LUA_MASKCOUNT)) &&
(--L->hookcount == 0 || L->hookmask & LUA_MASKLINE)) { (--L->hookcount == 0 || L->hookmask & LUA_MASKLINE)) {
traceexec(L, pc); /***/ traceexec(L, pc);
if (L->status == LUA_YIELD) { /* did hook yield? */ if (L->status == LUA_YIELD) { /* did hook yield? */
L->savedpc = pc - 1; L->savedpc = pc - 1;
return NULL; return NULL;
} }
base = L->base;
} }
/* warning!! several calls may realloc the stack and invalidate `ra' */ /* warning!! several calls may realloc the stack and invalidate `ra' */
base = L->base;
ra = RA(i); ra = RA(i);
L->savedpc = pc; lua_assert(base == L->base && L->base == L->ci->base);
lua_assert(base == L->ci->base);
lua_assert(base <= L->top && L->top <= L->stack + L->stacksize); lua_assert(base <= L->top && L->top <= L->stack + L->stacksize);
lua_assert(L->top == L->ci->top || luaG_checkopenop(i)); lua_assert(L->top == L->ci->top || luaG_checkopenop(i));
switch (GET_OPCODE(i)) { switch (GET_OPCODE(i)) {
@ -416,18 +419,18 @@ StkId luaV_execute (lua_State *L, int nexeccalls) {
TValue *rb = KBx(i); TValue *rb = KBx(i);
sethvalue(L, &g, cl->env); sethvalue(L, &g, cl->env);
lua_assert(ttisstring(rb)); lua_assert(ttisstring(rb));
luaV_gettable(L, &g, rb, ra); /***/ Protect(luaV_gettable(L, &g, rb, ra));
continue; continue;
} }
case OP_GETTABLE: { case OP_GETTABLE: {
luaV_gettable(L, RB(i), RKC(i), ra); /***/ Protect(luaV_gettable(L, RB(i), RKC(i), ra));
continue; continue;
} }
case OP_SETGLOBAL: { case OP_SETGLOBAL: {
TValue g; TValue g;
sethvalue(L, &g, cl->env); sethvalue(L, &g, cl->env);
lua_assert(ttisstring(KBx(i))); lua_assert(ttisstring(KBx(i)));
luaV_settable(L, &g, KBx(i), ra); /***/ Protect(luaV_settable(L, &g, KBx(i), ra));
continue; continue;
} }
case OP_SETUPVAL: { case OP_SETUPVAL: {
@ -437,20 +440,20 @@ StkId luaV_execute (lua_State *L, int nexeccalls) {
continue; continue;
} }
case OP_SETTABLE: { case OP_SETTABLE: {
luaV_settable(L, ra, RKB(i), RKC(i)); /***/ Protect(luaV_settable(L, ra, RKB(i), RKC(i)));
continue; continue;
} }
case OP_NEWTABLE: { case OP_NEWTABLE: {
int b = GETARG_B(i); int b = GETARG_B(i);
int c = GETARG_C(i); int c = GETARG_C(i);
sethvalue(L, ra, luaH_new(L, luaO_fb2int(b), luaO_fb2int(c))); sethvalue(L, ra, luaH_new(L, luaO_fb2int(b), luaO_fb2int(c)));
luaC_checkGC(L); /***/ Protect(luaC_checkGC(L));
continue; continue;
} }
case OP_SELF: { case OP_SELF: {
StkId rb = RB(i); StkId rb = RB(i);
setobjs2s(L, ra+1, rb); setobjs2s(L, ra+1, rb);
luaV_gettable(L, rb, RKC(i), ra); /***/ Protect(luaV_gettable(L, rb, RKC(i), ra));
continue; continue;
} }
case OP_ADD: { case OP_ADD: {
@ -461,7 +464,7 @@ StkId luaV_execute (lua_State *L, int nexeccalls) {
setnvalue(ra, luai_numadd(nb, nc)); setnvalue(ra, luai_numadd(nb, nc));
} }
else else
Arith(L, ra, rb, rc, TM_ADD); /***/ Protect(Arith(L, ra, rb, rc, TM_ADD));
continue; continue;
} }
case OP_SUB: { case OP_SUB: {
@ -472,7 +475,7 @@ StkId luaV_execute (lua_State *L, int nexeccalls) {
setnvalue(ra, luai_numsub(nb, nc)); setnvalue(ra, luai_numsub(nb, nc));
} }
else else
Arith(L, ra, rb, rc, TM_SUB); /***/ Protect(Arith(L, ra, rb, rc, TM_SUB));
continue; continue;
} }
case OP_MUL: { case OP_MUL: {
@ -483,7 +486,7 @@ StkId luaV_execute (lua_State *L, int nexeccalls) {
setnvalue(ra, luai_nummul(nb, nc)); setnvalue(ra, luai_nummul(nb, nc));
} }
else else
Arith(L, ra, rb, rc, TM_MUL); /***/ Protect(Arith(L, ra, rb, rc, TM_MUL));
continue; continue;
} }
case OP_DIV: { case OP_DIV: {
@ -494,7 +497,7 @@ StkId luaV_execute (lua_State *L, int nexeccalls) {
setnvalue(ra, luai_numdiv(nb, nc)); setnvalue(ra, luai_numdiv(nb, nc));
} }
else else
Arith(L, ra, rb, rc, TM_DIV); /***/ Protect(Arith(L, ra, rb, rc, TM_DIV));
continue; continue;
} }
case OP_MOD: { case OP_MOD: {
@ -505,7 +508,7 @@ StkId luaV_execute (lua_State *L, int nexeccalls) {
setnvalue(ra, luai_nummod(nb, nc)); setnvalue(ra, luai_nummod(nb, nc));
} }
else else
Arith(L, ra, rb, rc, TM_MOD); /***/ Protect(Arith(L, ra, rb, rc, TM_MOD));
continue; continue;
} }
case OP_POW: { case OP_POW: {
@ -516,7 +519,7 @@ StkId luaV_execute (lua_State *L, int nexeccalls) {
setnvalue(ra, luai_numpow(nb, nc)); setnvalue(ra, luai_numpow(nb, nc));
} }
else else
Arith(L, ra, rb, rc, TM_POW); /***/ Protect(Arith(L, ra, rb, rc, TM_POW));
continue; continue;
} }
case OP_UNM: { case OP_UNM: {
@ -528,8 +531,10 @@ StkId luaV_execute (lua_State *L, int nexeccalls) {
} }
else { else {
rb = RB(i); /* `tonumber' erased `rb' */ rb = RB(i); /* `tonumber' erased `rb' */
if (!call_binTM(L, rb, &luaO_nilobject, ra, TM_UNM)) /***/ Protect(
luaG_aritherror(L, rb, &luaO_nilobject); if (!call_binTM(L, rb, &luaO_nilobject, ra, TM_UNM))
luaG_aritherror(L, rb, &luaO_nilobject);
)
} }
continue; continue;
} }
@ -544,17 +549,17 @@ StkId luaV_execute (lua_State *L, int nexeccalls) {
setnvalue(ra, cast(lua_Number, luaH_getn(hvalue(rb)))); setnvalue(ra, cast(lua_Number, luaH_getn(hvalue(rb))));
} }
else { /* try metamethod */ else { /* try metamethod */
if (!call_binTM(L, rb, &luaO_nilobject, ra, TM_SIZ)) /***/ Protect(
luaG_typeerror(L, rb, "get size of"); if (!call_binTM(L, rb, &luaO_nilobject, ra, TM_SIZ))
luaG_typeerror(L, rb, "get size of");
)
} }
continue; continue;
} }
case OP_CONCAT: { case OP_CONCAT: {
int b = GETARG_B(i); int b = GETARG_B(i);
int c = GETARG_C(i); int c = GETARG_C(i);
luaV_concat(L, c-b+1, c); /* may change `base' (and `ra') */ /***/ Protect(luaV_concat(L, c-b+1, c); luaC_checkGC(L));
luaC_checkGC(L); /***/
base = L->base;
setobjs2s(L, RA(i), base+b); setobjs2s(L, RA(i), base+b);
continue; continue;
} }
@ -563,18 +568,27 @@ StkId luaV_execute (lua_State *L, int nexeccalls) {
continue; continue;
} }
case OP_EQ: { case OP_EQ: {
if (equalobj(L, RKB(i), RKC(i)) != GETARG_A(i)) pc++; /***/ Protect(
else dojump(L, pc, GETARG_sBx(*pc) + 1); if (equalobj(L, RKB(i), RKC(i)) == GETARG_A(i))
dojump(L, pc, GETARG_sBx(*pc));
)
pc++;
continue; continue;
} }
case OP_LT: { case OP_LT: {
if (luaV_lessthan(L, RKB(i), RKC(i)) != GETARG_A(i)) pc++; /***/ Protect(
else dojump(L, pc, GETARG_sBx(*pc) + 1); if (luaV_lessthan(L, RKB(i), RKC(i)) == GETARG_A(i))
dojump(L, pc, GETARG_sBx(*pc));
)
pc++;
continue; continue;
} }
case OP_LE: { case OP_LE: {
if (lessequal(L, RKB(i), RKC(i)) != GETARG_A(i)) pc++; /***/ Protect(
else dojump(L, pc, GETARG_sBx(*pc) + 1); if (lessequal(L, RKB(i), RKC(i)) == GETARG_A(i))
dojump(L, pc, GETARG_sBx(*pc));
)
pc++;
continue; continue;
} }
case OP_TEST: { case OP_TEST: {
@ -586,62 +600,65 @@ StkId luaV_execute (lua_State *L, int nexeccalls) {
} }
continue; continue;
} }
case OP_CALL: { /***/ case OP_CALL: {
int pcr;
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 */
pcr = luaD_precall(L, ra, nresults); L->savedpc = pc;
if (pcr == PCRLUA) { switch (luaD_precall(L, ra, nresults)) {
nexeccalls++; case PCRLUA: {
goto callentry; /* restart luaV_execute over new Lua function */ nexeccalls++;
} goto callentry; /* restart luaV_execute over new Lua function */
else if (pcr == PCRC) { }
/* it was a C function (`precall' called it); adjust results */ case PCRC: {
if (nresults >= 0) L->top = L->ci->top; /* it was a C function (`precall' called it); adjust results */
continue; if (nresults >= 0) L->top = L->ci->top;
} base = L->base;
else { continue;
lua_assert(pcr == PCRYIELD); }
return NULL; default: {
return NULL;
}
} }
} }
case OP_TAILCALL: { /***/ case OP_TAILCALL: {
int pcr;
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 */
L->savedpc = pc;
lua_assert(GETARG_C(i) - 1 == LUA_MULTRET); lua_assert(GETARG_C(i) - 1 == LUA_MULTRET);
pcr = luaD_precall(L, ra, LUA_MULTRET); switch (luaD_precall(L, ra, LUA_MULTRET)) {
if (pcr == PCRLUA) { case PCRLUA: {
/* tail call: put new frame in place of previous one */ /* tail call: put new frame in place of previous one */
CallInfo *ci = L->ci - 1; /* previous frame */ CallInfo *ci = L->ci - 1; /* previous frame */
int aux; int aux;
StkId func = ci->func; StkId func = ci->func;
StkId pfunc = (ci+1)->func; /* previous function index */ StkId pfunc = (ci+1)->func; /* previous function index */
if (L->openupval) luaF_close(L, ci->base); if (L->openupval) luaF_close(L, ci->base);
L->base = ci->base = ci->func + ((ci+1)->base - pfunc); L->base = ci->base = ci->func + ((ci+1)->base - pfunc);
for (aux = 0; pfunc+aux < L->top; aux++) /* move frame down */ for (aux = 0; pfunc+aux < L->top; aux++) /* move frame down */
setobjs2s(L, func+aux, pfunc+aux); setobjs2s(L, func+aux, pfunc+aux);
ci->top = L->top = func+aux; /* correct top */ ci->top = L->top = func+aux; /* correct top */
lua_assert(L->top == L->base + clvalue(func)->l.p->maxstacksize); lua_assert(L->top == L->base + clvalue(func)->l.p->maxstacksize);
ci->savedpc = L->savedpc; ci->savedpc = L->savedpc;
ci->tailcalls++; /* one more call lost */ ci->tailcalls++; /* one more call lost */
L->ci--; /* remove new frame */ L->ci--; /* remove new frame */
goto callentry; goto callentry;
} }
else if (pcr == PCRC) { case PCRC: {
/* it was a C function (`precall' called it) */ /* it was a C function (`precall' called it) */
continue; base = L->base;
} continue;
else { }
lua_assert(pcr == PCRYIELD); default: {
return NULL; return NULL;
}
} }
} }
case OP_RETURN: { case 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 (L->openupval) luaF_close(L, base); if (L->openupval) luaF_close(L, base);
L->savedpc = pc;
if (--nexeccalls == 0) /* was previous function running `here'? */ if (--nexeccalls == 0) /* was previous function running `here'? */
return ra; /* no: return */ return ra; /* no: return */
else { /* yes: continue its execution */ else { /* yes: continue its execution */
@ -664,10 +681,11 @@ StkId luaV_execute (lua_State *L, int nexeccalls) {
} }
continue; continue;
} }
case OP_FORPREP: { /***/ case OP_FORPREP: {
const TValue *init = ra; const TValue *init = ra;
const TValue *plimit = ra+1; const TValue *plimit = ra+1;
const TValue *pstep = ra+2; const TValue *pstep = ra+2;
L->savedpc = pc; /* next steps may throw errors */
if (!tonumber(init, ra)) if (!tonumber(init, ra))
luaG_runerror(L, "`for' initial value must be a number"); luaG_runerror(L, "`for' initial value must be a number");
else if (!tonumber(plimit, ra+1)) else if (!tonumber(plimit, ra+1))
@ -684,9 +702,8 @@ StkId luaV_execute (lua_State *L, int nexeccalls) {
setobjs2s(L, cb+1, ra+1); setobjs2s(L, cb+1, ra+1);
setobjs2s(L, cb, ra); setobjs2s(L, cb, ra);
L->top = cb+3; /* func. + 2 args (state and index) */ L->top = cb+3; /* func. + 2 args (state and index) */
luaD_call(L, cb, GETARG_C(i)); /***/ Protect(luaD_call(L, cb, GETARG_C(i)));
L->top = L->ci->top; L->top = L->ci->top;
base = L->base;
cb = RA(i) + 3; /* previous call may change the stack */ cb = RA(i) + 3; /* previous call may change the stack */
if (ttisnil(cb)) /* break loop? */ if (ttisnil(cb)) /* break loop? */
pc++; /* skip jump (break loop) */ pc++; /* skip jump (break loop) */
@ -747,7 +764,7 @@ StkId luaV_execute (lua_State *L, int nexeccalls) {
} }
} }
setclvalue(L, ra, ncl); setclvalue(L, ra, ncl);
luaC_checkGC(L); /***/ Protect(luaC_checkGC(L));
continue; continue;
} }
case OP_VARARG: { case OP_VARARG: {