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

small bugs (state could keep its CI_HASFRAME attribute after returning)

This commit is contained in:
Roberto Ierusalimschy 2002-11-19 06:50:56 -02:00
parent 636c629e56
commit 642af82e81
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lvm.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lvm.c,v 1.262 2002/11/18 11:01:55 roberto Exp roberto $ ** $Id: lvm.c,v 1.263 2002/11/18 15:24:11 roberto Exp roberto $
** Lua virtual machine ** Lua virtual machine
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -382,7 +382,8 @@ StkId luaV_execute (lua_State *L) {
if (L->hookmask & LUA_MASKCALL) if (L->hookmask & LUA_MASKCALL)
luaD_callhook(L, LUA_HOOKCALL, -1); luaD_callhook(L, LUA_HOOKCALL, -1);
retentry: /* entry point when returning to old functions */ retentry: /* entry point when returning to old functions */
lua_assert(L->ci->state & CI_SAVEDPC); lua_assert(L->ci->state == CI_SAVEDPC ||
L->ci->state == (CI_SAVEDPC | CI_CALLING));
L->ci->state = CI_HASFRAME; /* activate frame */ L->ci->state = CI_HASFRAME; /* activate frame */
pc = L->ci->u.l.savedpc; pc = L->ci->u.l.savedpc;
base = L->ci->base; base = L->ci->base;
@ -397,11 +398,12 @@ StkId luaV_execute (lua_State *L) {
traceexec(L); traceexec(L);
if (L->ci->state & CI_YIELD) { /* did hook yield? */ if (L->ci->state & CI_YIELD) { /* did hook yield? */
L->ci->u.l.savedpc = pc - 1; L->ci->u.l.savedpc = pc - 1;
L->ci->state |= CI_SAVEDPC; L->ci->state = CI_YIELD | CI_SAVEDPC;
return NULL; return NULL;
} }
} }
/* warning!! several calls may realloc the stack and invalidate `ra' */ /* warning!! several calls may realloc the stack and invalidate `ra' */
lua_assert((L->ci->state & CI_HASFRAME) && base == L->ci->base);
ra = RA(i); ra = RA(i);
lua_assert(L->top <= L->stack + L->stacksize && L->top >= L->ci->base); lua_assert(L->top <= L->stack + L->stacksize && L->top >= L->ci->base);
lua_assert(L->top == L->ci->top || lua_assert(L->top == L->ci->top ||
@ -600,8 +602,9 @@ StkId luaV_execute (lua_State *L) {
firstResult = luaD_precall(L, ra); firstResult = luaD_precall(L, ra);
if (firstResult) { if (firstResult) {
if (firstResult > L->top) { /* yield? */ if (firstResult > L->top) { /* yield? */
lua_assert(L->ci->state == (CI_C | CI_YIELD));
(L->ci - 1)->u.l.savedpc = pc; (L->ci - 1)->u.l.savedpc = pc;
(L->ci - 1)->state |= CI_SAVEDPC; (L->ci - 1)->state = CI_SAVEDPC;
return NULL; return NULL;
} }
/* it was a C function (`precall' called it); adjust results */ /* it was a C function (`precall' called it); adjust results */
@ -623,7 +626,7 @@ StkId luaV_execute (lua_State *L) {
lua_assert(L->ci->state & CI_SAVEDPC); lua_assert(L->ci->state & CI_SAVEDPC);
(L->ci - 1)->u.l.savedpc = L->ci->u.l.savedpc; (L->ci - 1)->u.l.savedpc = L->ci->u.l.savedpc;
(L->ci - 1)->state = CI_SAVEDPC; (L->ci - 1)->state = CI_SAVEDPC;
L->ci--; /* remove previous frame */ L->ci--; /* remove new frame */
} }
goto callentry; goto callentry;
} }