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

run-time stack now is controled at run time, instead of 

compilation time.
This commit is contained in:
Waldemar Celes 1995-04-11 14:56:30 -03:00
parent 36b6fdda83
commit 8156604823
3 changed files with 108 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
lua.stx
View File

@ -1,6 +1,6 @@
%{ %{
char *rcs_luastx = "$Id: lua.stx,v 3.16 1994/12/27 20:41:11 celes Exp roberto $"; char *rcs_luastx = "$Id: lua.stx,v 3.17 1995/01/13 22:11:12 roberto Exp celes $";
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -41,7 +41,8 @@ static Long varbuffer[MAXVAR]; /* variables in an assignment list;
it's long to store negative Word values */ it's long to store negative Word values */
static int nvarbuffer=0; /* number of variables at a list */ static int nvarbuffer=0; /* number of variables at a list */
static Word localvar[STACKGAP]; /* store local variable names */ #define MAXLOCALS 32
static Word localvar[MAXLOCALS]; /* store local variable names */
static int nlocalvar=0; /* number of local variables */ static int nlocalvar=0; /* number of local variables */
#define MAXFIELDS FIELDS_PER_FLUSH*2 #define MAXFIELDS FIELDS_PER_FLUSH*2
@ -103,10 +104,10 @@ static void code_word_at (Byte *p, Word n)
static void push_field (Word name) static void push_field (Word name)
{ {
if (nfields < STACKGAP-1) if (nfields < MAXFIELDS)
fields[nfields++] = name; fields[nfields++] = name;
else else
lua_error ("too many fields in a constructor"); lua_error ("too many fields in nested constructors");
} }
static void flush_record (int n) static void flush_record (int n)
@ -135,18 +136,26 @@ static void flush_list (int m, int n)
code_byte(n); code_byte(n);
} }
static void add_nlocalvar (int n) static void add_localvar (Word name)
{ {
if (MAX_TEMPS+nlocalvar+MAXVAR+n < STACKGAP) if (nlocalvar < MAXLOCALS)
nlocalvar += n; localvar[nlocalvar++] = name;
else else
lua_error ("too many local variables"); lua_error ("too many local variables");
} }
static void incr_nvarbuffer (void) static void store_localvar (Word name, int n)
{ {
if (nvarbuffer < MAXVAR-1) if (nlocalvar+n < MAXLOCALS)
nvarbuffer++; localvar[nlocalvar+n] = name;
else
lua_error ("too many local variables");
}
static void add_varbuffer (Long var)
{
if (nvarbuffer < MAXVAR)
varbuffer[nvarbuffer++] = var;
else else
lua_error ("variable buffer overflow"); lua_error ("variable buffer overflow");
} }
@ -436,8 +445,7 @@ function : FUNCTION NAME
method : FUNCTION NAME ':' NAME method : FUNCTION NAME ':' NAME
{ {
init_function($4); init_function($4);
localvar[nlocalvar]=luaI_findsymbolbyname("self"); add_localvar(luaI_findsymbolbyname("self"));
add_nlocalvar(1);
} }
body body
{ {
@ -506,9 +514,9 @@ stat1 : IF expr1 THEN PrepJump block PrepJump elsepart END
} }
| functioncall { code_byte(0); } | functioncall { code_byte(0); }
| LOCAL localdeclist decinit | LOCAL localdeclist decinit
{ add_nlocalvar($2); { nlocalvar += $2;
adjust_mult_assign($2, $3, 0); adjust_mult_assign($2, $3, 0);
} }
; ;
elsepart : /* empty */ elsepart : /* empty */
@ -632,13 +640,11 @@ parlist : /* empty */ { lua_codeadjust(0); }
parlist1 : NAME parlist1 : NAME
{ {
localvar[nlocalvar]=luaI_findsymbol($1); add_localvar(luaI_findsymbol($1));
add_nlocalvar(1);
} }
| parlist1 ',' NAME | parlist1 ',' NAME
{ {
localvar[nlocalvar]=luaI_findsymbol($3); add_localvar(luaI_findsymbol($3));
add_nlocalvar(1);
} }
; ;
@ -683,12 +689,12 @@ lfieldlist1 : expr1 {$$=1;}
varlist1 : var varlist1 : var
{ {
nvarbuffer = 0; nvarbuffer = 0;
varbuffer[nvarbuffer] = $1; incr_nvarbuffer(); add_varbuffer($1);
$$ = ($1 == 0) ? 1 : 0; $$ = ($1 == 0) ? 1 : 0;
} }
| varlist1 ',' var | varlist1 ',' var
{ {
varbuffer[nvarbuffer] = $3; incr_nvarbuffer(); add_varbuffer($3);
$$ = ($3 == 0) ? $1 + 1 : $1; $$ = ($3 == 0) ? $1 + 1 : $1;
} }
; ;
@ -720,10 +726,10 @@ singlevar : NAME
varexp : var { lua_pushvar($1); } varexp : var { lua_pushvar($1); }
; ;
localdeclist : NAME {localvar[nlocalvar]=luaI_findsymbol($1); $$ = 1;} localdeclist : NAME {store_localvar(luaI_findsymbol($1), 0); $$ = 1;}
| localdeclist ',' NAME | localdeclist ',' NAME
{ {
localvar[nlocalvar+$1]=luaI_findsymbol($3); store_localvar(luaI_findsymbol($3), $1);
$$ = $1+1; $$ = $1+1;
} }
; ;

136
opcode.c
View File

@ -3,7 +3,7 @@
** TecCGraf - PUC-Rio ** TecCGraf - PUC-Rio
*/ */
char *rcs_opcode="$Id: opcode.c,v 3.34 1995/02/06 19:35:09 roberto Exp roberto $"; char *rcs_opcode="$Id: opcode.c,v 3.35 1995/02/10 12:51:29 roberto Exp celes $";
#include <setjmp.h> #include <setjmp.h>
#include <stdlib.h> #include <stdlib.h>
@ -23,13 +23,15 @@ char *rcs_opcode="$Id: opcode.c,v 3.34 1995/02/06 19:35:09 roberto Exp roberto $
#define tostring(o) ((tag(o) != LUA_T_STRING) && (lua_tostring(o) != 0)) #define tostring(o) ((tag(o) != LUA_T_STRING) && (lua_tostring(o) != 0))
#define STACK_BUFFER (STACKGAP+128) #define STACK_SIZE 128
typedef int StkId; /* index to stack elements */ typedef int StkId; /* index to stack elements */
static Long maxstack = 0L; static Object initial_stack;
static Object *stack = NULL;
static Object *top = NULL; static Object *stackLimit = &initial_stack+1;
static Object *stack = &initial_stack;
static Object *top = &initial_stack;
/* macros to convert from lua_Object to (Object *) and back */ /* macros to convert from lua_Object to (Object *) and back */
@ -38,6 +40,11 @@ static Object *top = NULL;
#define Ref(st) ((st)-stack+1) #define Ref(st) ((st)-stack+1)
/* macro to increment stack top. There must be always an empty slot in
* the stack
*/
#define incr_top if (++top >= stackLimit) growstack()
static StkId CBase = 0; /* when Lua calls C or C calls Lua, points to */ static StkId CBase = 0; /* when Lua calls C or C calls Lua, points to */
/* the first slot after the last parameter. */ /* the first slot after the last parameter. */
static int CnResults = 0; /* when Lua calls C, has the number of parameters; */ static int CnResults = 0; /* when Lua calls C, has the number of parameters; */
@ -88,29 +95,35 @@ void lua_error (char *s)
*/ */
static void lua_initstack (void) static void lua_initstack (void)
{ {
maxstack = STACK_BUFFER; Long maxstack = STACK_SIZE;
stack = newvector(maxstack, Object); stack = newvector(maxstack, Object);
stackLimit = stack+maxstack;
top = stack; top = stack;
*top = initial_stack;
} }
/* /*
** Check stack overflow and, if necessary, realloc vector ** Check stack overflow and, if necessary, realloc vector
*/ */
#define lua_checkstack(n) if ((Long)(n) > maxstack) checkstack(n) #define lua_checkstack(nt) if ((nt) >= stackLimit) growstack()
static void checkstack (StkId n) static void growstack (void)
{ {
StkId t; StkId t = top-stack;
if (stack == NULL) if (stack == &initial_stack)
lua_initstack(); lua_initstack();
if (maxstack >= MAX_INT) else
lua_error("stack size overflow"); {
t = top-stack; Long maxstack = stackLimit - stack;
maxstack *= 2; if (maxstack >= MAX_INT)
if (maxstack >= MAX_INT) lua_error("stack size overflow");
maxstack = MAX_INT; maxstack *= 2;
stack = growvector(stack, maxstack, Object); if (maxstack >= MAX_INT)
maxstack = MAX_INT;
stack = growvector(stack, maxstack, Object);
stackLimit = stack+maxstack;
}
top = stack + t; top = stack + t;
} }
@ -185,8 +198,8 @@ static int lua_tostring (Object *obj)
static void adjust_top (StkId newtop) static void adjust_top (StkId newtop)
{ {
Object *nt; Object *nt;
lua_checkstack(newtop); lua_checkstack(stack+newtop);
nt = stack+newtop; nt = stack+newtop; /* warning: previous call may change stack */
while (top < nt) tag(top++) = LUA_T_NIL; while (top < nt) tag(top++) = LUA_T_NIL;
top = nt; /* top could be bigger than newtop */ top = nt; /* top could be bigger than newtop */
} }
@ -227,7 +240,7 @@ static void call_funcFB (Object *func, StkId base, int nResults, StkId whereRes)
/* open space for first parameter (func) */ /* open space for first parameter (func) */
for (i=top-stack; i>base; i--) for (i=top-stack; i>base; i--)
stack[i] = stack[i-1]; stack[i] = stack[i-1];
top++; incr_top;
stack[base] = *func; stack[base] = *func;
do_call(&luaI_fallBacks[FB_FUNCTION].function, base, nResults, whereRes); do_call(&luaI_fallBacks[FB_FUNCTION].function, base, nResults, whereRes);
} }
@ -499,7 +512,7 @@ lua_Object lua_createtable (void)
adjustC(0); adjustC(0);
avalue(top) = lua_createarray(0); avalue(top) = lua_createarray(0);
tag(top) = LUA_T_ARRAY; tag(top) = LUA_T_ARRAY;
top++; incr_top;
CBase++; /* incorporate object in the stack */ CBase++; /* incorporate object in the stack */
return Ref(top-1); return Ref(top-1);
} }
@ -561,7 +574,7 @@ lua_Object lua_getlocked (int ref)
{ {
adjustC(0); adjustC(0);
*top = *luaI_getlocked(ref); *top = *luaI_getlocked(ref);
top++; incr_top;
CBase++; /* incorporate object in the stack */ CBase++; /* incorporate object in the stack */
return Ref(top-1); return Ref(top-1);
} }
@ -569,9 +582,8 @@ lua_Object lua_getlocked (int ref)
void lua_pushlocked (int ref) void lua_pushlocked (int ref)
{ {
lua_checkstack(top-stack+1);
*top = *luaI_getlocked(ref); *top = *luaI_getlocked(ref);
top++; incr_top;
} }
@ -590,7 +602,7 @@ lua_Object lua_getglobal (char *name)
Word n = luaI_findsymbolbyname(name); Word n = luaI_findsymbolbyname(name);
adjustC(0); adjustC(0);
*top = s_object(n); *top = s_object(n);
top++; incr_top;
CBase++; /* incorporate object in the stack */ CBase++; /* incorporate object in the stack */
return Ref(top-1); return Ref(top-1);
} }
@ -610,8 +622,8 @@ void lua_storeglobal (char *name)
*/ */
void lua_pushnil (void) void lua_pushnil (void)
{ {
lua_checkstack(top-stack+1); tag(top) = LUA_T_NIL;
tag(top++) = LUA_T_NIL; incr_top;
} }
/* /*
@ -619,8 +631,8 @@ void lua_pushnil (void)
*/ */
void lua_pushnumber (real n) void lua_pushnumber (real n)
{ {
lua_checkstack(top-stack+1); tag(top) = LUA_T_NUMBER; nvalue(top) = n;
tag(top) = LUA_T_NUMBER; nvalue(top++) = n; incr_top;
} }
/* /*
@ -628,10 +640,9 @@ void lua_pushnumber (real n)
*/ */
void lua_pushstring (char *s) void lua_pushstring (char *s)
{ {
lua_checkstack(top-stack+1);
tsvalue(top) = lua_createstring(s); tsvalue(top) = lua_createstring(s);
tag(top) = LUA_T_STRING; tag(top) = LUA_T_STRING;
top++; incr_top;
} }
/* /*
@ -639,10 +650,9 @@ void lua_pushstring (char *s)
*/ */
void lua_pushliteral (char *s) void lua_pushliteral (char *s)
{ {
lua_checkstack(top-stack+1);
tsvalue(top) = lua_constant[luaI_findconstant(lua_constcreate(s))]; tsvalue(top) = lua_constant[luaI_findconstant(lua_constcreate(s))];
tag(top) = LUA_T_STRING; tag(top) = LUA_T_STRING;
top++; incr_top;
} }
/* /*
@ -650,8 +660,8 @@ void lua_pushliteral (char *s)
*/ */
void lua_pushcfunction (lua_CFunction fn) void lua_pushcfunction (lua_CFunction fn)
{ {
lua_checkstack(top-stack+1); tag(top) = LUA_T_CFUNCTION; fvalue(top) = fn;
tag(top) = LUA_T_CFUNCTION; fvalue(top++) = fn; incr_top;
} }
/* /*
@ -660,8 +670,8 @@ void lua_pushcfunction (lua_CFunction fn)
void lua_pushusertag (void *u, int tag) void lua_pushusertag (void *u, int tag)
{ {
if (tag < LUA_T_USERDATA) return; if (tag < LUA_T_USERDATA) return;
lua_checkstack(top-stack+1); tag(top) = tag; uvalue(top) = u;
tag(top) = tag; uvalue(top++) = u; incr_top;
} }
/* /*
@ -669,8 +679,8 @@ void lua_pushusertag (void *u, int tag)
*/ */
void lua_pushobject (lua_Object o) void lua_pushobject (lua_Object o)
{ {
lua_checkstack(top-stack+1); *top = *Address(o);
*top++ = *Address(o); incr_top;
} }
/* /*
@ -678,8 +688,8 @@ void lua_pushobject (lua_Object o)
*/ */
void luaI_pushobject (Object *o) void luaI_pushobject (Object *o)
{ {
lua_checkstack(top-stack+1); *top = *o;
*top++ = *o; incr_top;
} }
int lua_type (lua_Object o) int lua_type (lua_Object o)
@ -693,7 +703,8 @@ int lua_type (lua_Object o)
void luaI_gcFB (Object *o) void luaI_gcFB (Object *o)
{ {
*(top++) = *o; *top = *o;
incr_top;
do_call(&luaI_fallBacks[FB_GC].function, (top-stack)-1, 0, (top-stack)-1); do_call(&luaI_fallBacks[FB_GC].function, (top-stack)-1, 0, (top-stack)-1);
} }
@ -734,26 +745,28 @@ static void comparison (lua_Type tag_less, lua_Type tag_equal,
*/ */
static StkId lua_execute (Byte *pc, StkId base) static StkId lua_execute (Byte *pc, StkId base)
{ {
lua_checkstack(STACKGAP+MAX_TEMPS+base);
while (1) while (1)
{ {
OpCode opcode; OpCode opcode;
switch (opcode = (OpCode)*pc++) switch (opcode = (OpCode)*pc++)
{ {
case PUSHNIL: tag(top++) = LUA_T_NIL; break; case PUSHNIL: tag(top) = LUA_T_NIL; incr_top; break;
case PUSH0: case PUSH1: case PUSH2: case PUSH0: case PUSH1: case PUSH2:
tag(top) = LUA_T_NUMBER; tag(top) = LUA_T_NUMBER;
nvalue(top++) = opcode-PUSH0; nvalue(top) = opcode-PUSH0;
incr_top;
break; break;
case PUSHBYTE: tag(top) = LUA_T_NUMBER; nvalue(top++) = *pc++; break; case PUSHBYTE:
tag(top) = LUA_T_NUMBER; nvalue(top) = *pc++; incr_top; break;
case PUSHWORD: case PUSHWORD:
{ {
CodeWord code; CodeWord code;
get_word(code,pc); get_word(code,pc);
tag(top) = LUA_T_NUMBER; nvalue(top++) = code.w; tag(top) = LUA_T_NUMBER; nvalue(top) = code.w;
incr_top;
} }
break; break;
@ -761,7 +774,8 @@ static StkId lua_execute (Byte *pc, StkId base)
{ {
CodeFloat code; CodeFloat code;
get_float(code,pc); get_float(code,pc);
tag(top) = LUA_T_NUMBER; nvalue(top++) = code.f; tag(top) = LUA_T_NUMBER; nvalue(top) = code.f;
incr_top;
} }
break; break;
@ -769,7 +783,8 @@ static StkId lua_execute (Byte *pc, StkId base)
{ {
CodeWord code; CodeWord code;
get_word(code,pc); get_word(code,pc);
tag(top) = LUA_T_STRING; tsvalue(top++) = lua_constant[code.w]; tag(top) = LUA_T_STRING; tsvalue(top) = lua_constant[code.w];
incr_top;
} }
break; break;
@ -777,22 +792,25 @@ static StkId lua_execute (Byte *pc, StkId base)
{ {
CodeCode code; CodeCode code;
get_code(code,pc); get_code(code,pc);
tag(top) = LUA_T_FUNCTION; bvalue(top++) = code.b; tag(top) = LUA_T_FUNCTION; bvalue(top) = code.b;
incr_top;
} }
break; break;
case PUSHLOCAL0: case PUSHLOCAL1: case PUSHLOCAL2: case PUSHLOCAL0: case PUSHLOCAL1: case PUSHLOCAL2:
case PUSHLOCAL3: case PUSHLOCAL4: case PUSHLOCAL5: case PUSHLOCAL3: case PUSHLOCAL4: case PUSHLOCAL5:
case PUSHLOCAL6: case PUSHLOCAL7: case PUSHLOCAL8: case PUSHLOCAL6: case PUSHLOCAL7: case PUSHLOCAL8:
case PUSHLOCAL9: *top++ = *((stack+base) + (int)(opcode-PUSHLOCAL0)); break; case PUSHLOCAL9:
*top = *((stack+base) + (int)(opcode-PUSHLOCAL0)); incr_top; break;
case PUSHLOCAL: *top++ = *((stack+base) + (*pc++)); break; case PUSHLOCAL: *top = *((stack+base) + (*pc++)); incr_top; break;
case PUSHGLOBAL: case PUSHGLOBAL:
{ {
CodeWord code; CodeWord code;
get_word(code,pc); get_word(code,pc);
*top++ = s_object(code.w); *top = s_object(code.w);
incr_top;
} }
break; break;
@ -805,9 +823,11 @@ static StkId lua_execute (Byte *pc, StkId base)
Object receiver = *(top-1); Object receiver = *(top-1);
CodeWord code; CodeWord code;
get_word(code,pc); get_word(code,pc);
tag(top) = LUA_T_STRING; tsvalue(top++) = lua_constant[code.w]; tag(top) = LUA_T_STRING; tsvalue(top) = lua_constant[code.w];
incr_top;
pushsubscript(); pushsubscript();
*(top++) = receiver; *top = receiver;
incr_top;
break; break;
} }
@ -837,6 +857,7 @@ static StkId lua_execute (Byte *pc, StkId base)
int n = *pc++; int n = *pc++;
if (tag(top-3-n) != LUA_T_ARRAY) if (tag(top-3-n) != LUA_T_ARRAY)
{ {
lua_checkstack(top+2);
*(top+1) = *(top-1); *(top+1) = *(top-1);
*(top) = *(top-2-n); *(top) = *(top-2-n);
*(top-1) = *(top-3-n); *(top-1) = *(top-3-n);
@ -901,7 +922,7 @@ static StkId lua_execute (Byte *pc, StkId base)
get_word(size,pc); get_word(size,pc);
avalue(top) = lua_createarray(size.w); avalue(top) = lua_createarray(size.w);
tag(top) = LUA_T_ARRAY; tag(top) = LUA_T_ARRAY;
top++; incr_top;
} }
break; break;
@ -1007,7 +1028,8 @@ static StkId lua_execute (Byte *pc, StkId base)
case MINUSOP: case MINUSOP:
if (tonumber(top-1)) if (tonumber(top-1))
{ {
tag(top++) = LUA_T_NIL; tag(top) = LUA_T_NIL;
incr_top;
call_arith("unm"); call_arith("unm");
} }
else else

8
opcode.h
View File

@ -1,6 +1,6 @@
/* /*
** TeCGraf - PUC-Rio ** TeCGraf - PUC-Rio
** $Id: opcode.h,v 3.9 1994/11/23 14:31:11 roberto Stab $ ** $Id: opcode.h,v 3.10 1994/12/20 21:20:36 roberto Exp celes $
*/ */
#ifndef opcode_h #ifndef opcode_h
@ -10,18 +10,12 @@
#include "types.h" #include "types.h"
#include "tree.h" #include "tree.h"
#ifndef STACKGAP
#define STACKGAP 128
#endif
#ifndef real #ifndef real
#define real float #define real float
#endif #endif
#define FIELDS_PER_FLUSH 40 #define FIELDS_PER_FLUSH 40
#define MAX_TEMPS 20
typedef enum typedef enum
{ {