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

new way to hanlde arg information

Browse Source
This commit is contained in:
Roberto Ierusalimschy
1998-01-12 11:35:37 -02:00
parent 77a6836fef
commit f0dffaa209
3 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lopcodes.h
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lopcodes.h,v 1.13 1997/12/29 17:35:46 roberto Exp roberto $ ** $Id: lopcodes.h,v 1.14 1997/12/30 19:08:23 roberto Exp roberto $
** Opcodes for Lua virtual machine ** Opcodes for Lua virtual machine
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -169,19 +169,14 @@ SETLINEW,/* w - - LINE=w */
POP,/* b - - TOP-=(b+1) */ POP,/* b - - TOP-=(b+1) */
POP0,/* - - - TOP-=1 */ POP0,/* - - - TOP-=1 */
POP1,/* - - - TOP-=2 */ POP1/* - - - TOP-=2 */
ARGS,/* b - - TOP=BASE+b */
ARGS0,/* - - - TOP=BASE+0 */
ARGS1,/* - - - TOP=BASE+1 */
ARGS2,/* - - - TOP=BASE+2 */
ARGS3,/* - - - TOP=BASE+3 */
VARARGS/* b v_x...v_1 {v_1...v_x;n=x} TOP=BASE+b+1 */
} OpCode; } OpCode;
#define RFIELDS_PER_FLUSH 32 /* records (SETMAP) */ #define RFIELDS_PER_FLUSH 32 /* records (SETMAP) */
#define LFIELDS_PER_FLUSH 64 /* lists (SETLIST) */ #define LFIELDS_PER_FLUSH 64 /* lists (SETLIST) */
#define ZEROVARARG 64
#endif #endif

15
lua.stx
View File

@@ -1,6 +1,6 @@
%{ %{
/* /*
** $Id: lua.stx,v 1.31 1997/12/30 19:08:23 roberto Exp roberto $ ** $Id: lua.stx,v 1.32 1998/01/12 13:00:51 roberto Exp roberto $
** Syntax analizer and code generator ** Syntax analizer and code generator
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -448,11 +448,15 @@ static void adjust_mult_assign (int vars, long exps)
static void code_args (int nparams, int dots) static void code_args (int nparams, int dots)
{ {
L->currState->nlocalvar += nparams; L->currState->nlocalvar += nparams; /* "self" may already be there */
if (!dots) nparams = L->currState->nlocalvar;
code_oparg(ARGS, 4, L->currState->nlocalvar, L->currState->nlocalvar); if (!dots) {
L->currState->f->code[1] = nparams; /* fill-in arg information */
deltastack(nparams);
}
else { else {
code_oparg(VARARGS, 0, L->currState->nlocalvar, L->currState->nlocalvar+1); L->currState->f->code[1] = nparams+ZEROVARARG;
deltastack(nparams+1);
add_localvar(luaS_new("arg")); add_localvar(luaS_new("arg"));
} }
} }
@@ -577,6 +581,7 @@ static void init_state (TaggedString *filename)
else else
fs->maxvars = -1; /* flag no debug information */ fs->maxvars = -1; /* flag no debug information */
code_byte(0); /* to be filled with stacksize */ code_byte(0); /* to be filled with stacksize */
code_byte(0); /* to be filled with arg information */
L->lexstate->lastline = 0; /* invalidate it */ L->lexstate->lastline = 0; /* invalidate it */
} }

22
lvm.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lvm.c,v 1.20 1997/12/29 17:35:46 roberto Exp roberto $ ** $Id: lvm.c,v 1.21 1997/12/30 19:08:23 roberto Exp roberto $
** Lua virtual machine ** Lua virtual machine
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -289,6 +289,12 @@ StkId luaV_execute (Closure *cl, TProtoFunc *tf, StkId base)
if (lua_callhook) if (lua_callhook)
luaD_callHook(base, tf, 0); luaD_callHook(base, tf, 0);
luaD_checkstack((*pc++)+EXTRA_STACK); luaD_checkstack((*pc++)+EXTRA_STACK);
if (*pc < ZEROVARARG)
luaD_adjusttop(base+*(pc++));
else { /* varargs */
luaC_checkGC();
adjust_varargs(base+(*pc++)-ZEROVARARG);
}
while (1) { while (1) {
int aux; int aux;
switch ((OpCode)(aux = *pc++)) { switch ((OpCode)(aux = *pc++)) {
@@ -473,20 +479,6 @@ StkId luaV_execute (Closure *cl, TProtoFunc *tf, StkId base)
S->top -= (aux+1); S->top -= (aux+1);
break; break;
case ARGS:
aux = *pc++; goto args;
case ARGS0: case ARGS1: case ARGS2: case ARGS3:
aux -= ARGS0;
args:
luaD_adjusttop(base+aux);
break;
case VARARGS:
luaC_checkGC();
adjust_varargs(base+(*pc++));
break;
case CREATEARRAYW: case CREATEARRAYW:
aux = next_word(pc); goto createarray; aux = next_word(pc); goto createarray;