GitHub/lua
1
0
Fork 0
mirror of https://github.com/lua/lua.git synced 2025-01-14 05:43:00 +08:00
Code Issues Projects Releases Wiki Activity

otimizacao do codigo para construtores.

Browse Source 
correcao do tamanho do buffer de codigo.
This commit is contained in:
Roberto Ierusalimschy 1994-02-13 18:38:20 -02:00
parent 0ea84a3e79
commit 7f3d01c200
1 changed files with 115 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

169
lua.stx
View File

@ -1,6 +1,6 @@
%{ %{
char *rcs_luastx = "$Id: lua.stx,v 1.2 1993/12/22 21:19:23 roberto Exp roberto $"; char *rcs_luastx = "$Id: lua.stx,v 1.3 1993/12/28 16:42:29 roberto Exp roberto $";
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -12,6 +12,8 @@ char *rcs_luastx = "$Id: lua.stx,v 1.2 1993/12/22 21:19:23 roberto Exp roberto $
#include "table.h" #include "table.h"
#include "lua.h" #include "lua.h"
#define LISTING 0
#ifndef ALIGNMENT #ifndef ALIGNMENT
#define ALIGNMENT (sizeof(void *)) #define ALIGNMENT (sizeof(void *))
#endif #endif
@ -19,7 +21,7 @@ char *rcs_luastx = "$Id: lua.stx,v 1.2 1993/12/22 21:19:23 roberto Exp roberto $
#ifndef MAXCODE #ifndef MAXCODE
#define MAXCODE 1024 #define MAXCODE 1024
#endif #endif
static long buffer[MAXCODE]; static long buffer[MAXCODE*sizeof(Byte)/sizeof(long)];
static Byte *code = (Byte *)buffer; static Byte *code = (Byte *)buffer;
static long mainbuffer[MAXCODE]; static long mainbuffer[MAXCODE];
static Byte *maincode = (Byte *)mainbuffer; static Byte *maincode = (Byte *)mainbuffer;
@ -27,16 +29,20 @@ static Byte *basepc;
static Byte *pc; static Byte *pc;
#define MAXVAR 32 #define MAXVAR 32
static long varbuffer[MAXVAR]; static long varbuffer[MAXVAR]; /* variables in an assignment list;
static Byte nvarbuffer=0; /* number of variables at a list */ it's long to store negative Word values */
static int nvarbuffer=0; /* number of variables at a list */
static Word localvar[STACKGAP]; static Word localvar[STACKGAP]; /* store local variable names */
static Byte nlocalvar=0; /* number of local variables */ static int nlocalvar=0; /* number of local variables */
#define MAXFIELDS FIELDS_PER_FLUSH*2
static Word fields[MAXFIELDS]; /* fieldnames to be flushed */
static int nfields=0;
static int ntemp; /* number of temporary var into stack */ static int ntemp; /* number of temporary var into stack */
static int err; /* flag to indicate error */ static int err; /* flag to indicate error */
/* Internal functions */ /* Internal functions */
#define align(n) align_n(sizeof(n))
static void code_byte (Byte c) static void code_byte (Byte c)
{ {
@ -48,6 +54,14 @@ static void code_byte (Byte c)
*pc++ = c; *pc++ = c;
} }
#define align(t,n) align_n(sizeof(t),n)
static void align_n (unsigned size, int gap)
{
if (size > ALIGNMENT) size = ALIGNMENT;
while (((pc+gap-code)%size) != 0) /* +gap to include BYTECODEs */
code_byte (NOP);
}
static void code_word (Word n) static void code_word (Word n)
{ {
if (pc-basepc>MAXCODE-sizeof(Word)) if (pc-basepc>MAXCODE-sizeof(Word))
@ -70,6 +84,43 @@ static void code_float (float n)
pc += sizeof(float); pc += sizeof(float);
} }
static void push_field (Word name)
{
if (nfields < STACKGAP-1)
fields[nfields++] = name;
else
{
lua_error ("too many fields in a constructor");
err = 1;
}
}
static void flush_record (int n)
{
int i;
if (n == 0) return;
align(Word,2); /* two bytes before the actual word */
code_byte(STORERECORD);
code_byte(n);
for (i=0; i<n; i++)
code_word(lua_findconstant(s_name(fields[--nfields])));
ntemp -= n;
}
static void flush_list (int m, int n)
{
if (n == 0) return;
if (m == 0)
code_byte(STORELIST0);
else
{
code_byte(STORELIST);
code_byte(m);
}
code_byte(n);
ntemp-=n;
}
static void incr_ntemp (void) static void incr_ntemp (void)
{ {
if (ntemp+nlocalvar+MAXVAR+1 < STACKGAP) if (ntemp+nlocalvar+MAXVAR+1 < STACKGAP)
@ -103,13 +154,6 @@ static void incr_nvarbuffer (void)
} }
} }
static void align_n (unsigned size)
{
if (size > ALIGNMENT) size = ALIGNMENT;
while (((pc+1-code)%size) != 0) /* +1 to include BYTECODE */
code_byte (NOP);
}
static void code_number (float f) static void code_number (float f)
{ Word i = (Word)f; { Word i = (Word)f;
if (f == (float)i) /* f has an (short) integer value */ if (f == (float)i) /* f has an (short) integer value */
@ -122,14 +166,14 @@ static void code_number (float f)
} }
else else
{ {
align(Word); align(Word,1);
code_byte(PUSHWORD); code_byte(PUSHWORD);
code_word(i); code_word(i);
} }
} }
else else
{ {
align(float); align(float,1);
code_byte(PUSHFLOAT); code_byte(PUSHFLOAT);
code_float(f); code_float(f);
} }
@ -179,7 +223,13 @@ static void code_number (float f)
functionlist : /* empty */ functionlist : /* empty */
| functionlist {pc=basepc=maincode; nlocalvar=0;} stat sc {maincode=pc;} | functionlist { pc=basepc=maincode; nlocalvar=0;} stat sc
{
maincode=pc;
#if LISTING
PrintCode(basepc,maincode);
#endif
}
| functionlist function | functionlist function
| functionlist setdebug | functionlist setdebug
; ;
@ -188,7 +238,7 @@ function : FUNCTION NAME {pc=basepc=code; nlocalvar=0;} '(' parlist ')'
{ {
if (lua_debug) if (lua_debug)
{ {
align(Word); align(Word,1);
code_byte(SETFUNCTION); code_byte(SETFUNCTION);
code_word($1); code_word($1);
code_word($2); code_word($2);
@ -203,6 +253,9 @@ function : FUNCTION NAME {pc=basepc=code; nlocalvar=0;} '(' parlist ')'
s_tag($2) = T_FUNCTION; s_tag($2) = T_FUNCTION;
s_bvalue($2) = calloc (pc-code, sizeof(Byte)); s_bvalue($2) = calloc (pc-code, sizeof(Byte));
memcpy (s_bvalue($2), code, (pc-code)*sizeof(Byte)); memcpy (s_bvalue($2), code, (pc-code)*sizeof(Byte));
#if LISTING
PrintCode(code,pc);
#endif
} }
; ;
@ -214,7 +267,7 @@ stat : {
ntemp = 0; ntemp = 0;
if (lua_debug) if (lua_debug)
{ {
align(Word); code_byte(SETLINE); code_word(lua_linenumber); align(Word,1); code_byte(SETLINE); code_word(lua_linenumber);
} }
} }
stat1 stat1
@ -311,7 +364,7 @@ block : {$<vInt>$ = nlocalvar;} statlist {ntemp = 0;} ret
; ;
ret : /* empty */ ret : /* empty */
| { if (lua_debug){align(Word);code_byte(SETLINE);code_word(lua_linenumber);}} | { if (lua_debug){align(Word,1);code_byte(SETLINE);code_word(lua_linenumber);}}
RETURN exprlist sc RETURN exprlist sc
{ {
if (lua_debug) code_byte(RESET); if (lua_debug) code_byte(RESET);
@ -321,7 +374,7 @@ ret : /* empty */
PrepJump : /* empty */ PrepJump : /* empty */
{ {
align(Word); align(Word,1);
$$ = pc; $$ = pc;
code_byte(0); /* open space */ code_byte(0); /* open space */
code_word (0); code_word (0);
@ -354,7 +407,7 @@ expr : '(' expr ')' { $$ = $2; }
| NUMBER { code_number($1); $$ = 1; } | NUMBER { code_number($1); $$ = 1; }
| STRING | STRING
{ {
align(Word); align(Word,1);
code_byte(PUSHSTRING); code_byte(PUSHSTRING);
code_word($1); code_word($1);
$$ = 1; $$ = 1;
@ -366,7 +419,7 @@ expr : '(' expr ')' { $$ = $2; }
$$ = 0; $$ = 0;
if (lua_debug) if (lua_debug)
{ {
align(Word); code_byte(SETLINE); code_word(lua_linenumber); align(Word,1); code_byte(SETLINE); code_word(lua_linenumber);
} }
} }
| NOT expr1 { code_byte(NOTOP); $$ = 1;} | NOT expr1 { code_byte(NOTOP); $$ = 1;}
@ -410,7 +463,7 @@ typeconstructor: '@'
$$ = 0; $$ = 0;
if (lua_debug) if (lua_debug)
{ {
align(Word); code_byte(SETLINE); code_word(lua_linenumber); align(Word,1); code_byte(SETLINE); code_word(lua_linenumber);
} }
} }
} }
@ -447,8 +500,12 @@ objectname : /* empty */ {$$=-1;}
| NAME {$$=$1;} | NAME {$$=$1;}
; ;
fieldlist : '{' ffieldlist '}' { $$ = $2; } fieldlist : '{' ffieldlist '}' { flush_record($2%FIELDS_PER_FLUSH); $$ = $2; }
| '[' lfieldlist ']' { $$ = $2; } | '[' lfieldlist ']'
{
flush_list($2/FIELDS_PER_FLUSH, $2%FIELDS_PER_FLUSH);
$$ = $2;
}
; ;
ffieldlist : /* empty */ { $$ = 0; } ffieldlist : /* empty */ { $$ = 0; }
@ -456,36 +513,26 @@ ffieldlist : /* empty */ { $$ = 0; }
; ;
ffieldlist1 : ffield {$$=1;} ffieldlist1 : ffield {$$=1;}
| ffieldlist1 ',' ffield {$$=$1+1;} | ffieldlist1 ',' ffield
{
$$=$1+1;
if ($$%FIELDS_PER_FLUSH == 0) flush_record(FIELDS_PER_FLUSH);
}
; ;
ffield : NAME ffield : NAME '=' expr1 { push_field($1); }
{
align(Word);
code_byte(PUSHSTRING);
code_word(lua_findconstant (s_name($1)));
incr_ntemp();
}
'=' expr1
{
code_byte(STOREFIELD);
ntemp-=2;
}
; ;
lfieldlist : /* empty */ { $$ = 0; } lfieldlist : /* empty */ { $$ = 0; }
| lfieldlist1 { $$ = $1; } | lfieldlist1 { $$ = $1; }
; ;
lfieldlist1 : { code_number(1); } lfield {$$=1;} lfieldlist1 : expr1 {$$=1;}
| lfieldlist1 ',' { code_number($1+1); } lfield | lfieldlist1 ',' expr1
{$$=$1+1;}
;
lfield : expr1
{ {
code_byte(STOREFIELD); $$=$1+1;
ntemp-=2; if ($$%FIELDS_PER_FLUSH == 0)
flush_list($$/FIELDS_PER_FLUSH - 1, FIELDS_PER_FLUSH);
} }
; ;
@ -517,7 +564,7 @@ var : NAME
} }
| var {lua_pushvar ($1);} '.' NAME | var {lua_pushvar ($1);} '.' NAME
{ {
align(Word); align(Word,1);
code_byte(PUSHSTRING); code_byte(PUSHSTRING);
code_word(lua_findconstant (s_name($4))); incr_ntemp(); code_word(lua_findconstant (s_name($4))); incr_ntemp();
$$ = 0; /* indexed variable */ $$ = 0; /* indexed variable */
@ -556,7 +603,7 @@ static void lua_pushvar (long number)
{ {
if (number > 0) /* global var */ if (number > 0) /* global var */
{ {
align(Word); align(Word,1);
code_byte(PUSHGLOBAL); code_byte(PUSHGLOBAL);
code_word(number-1); code_word(number-1);
incr_ntemp(); incr_ntemp();
@ -589,7 +636,7 @@ static void lua_codestore (int i)
{ {
if (varbuffer[i] > 0) /* global var */ if (varbuffer[i] > 0) /* global var */
{ {
align(Word); align(Word,1);
code_byte(STOREGLOBAL); code_byte(STOREGLOBAL);
code_word(varbuffer[i]-1); code_word(varbuffer[i]-1);
} }
@ -652,13 +699,12 @@ int lua_parse (void)
} }
#if 0 #if LISTING
static void PrintCode (void) static void PrintCode (Byte *p, Byte *end)
{ {
Byte *p = code;
printf ("\n\nCODE\n"); printf ("\n\nCODE\n");
while (p != pc) while (p != end)
{ {
switch ((OpCode)*p) switch ((OpCode)*p)
{ {
@ -707,7 +753,7 @@ static void PrintCode (void)
p++; p++;
break; break;
case STORELOCAL: case STORELOCAL:
printf ("%d STORELOCAK %d\n", p-code, *(++p)); printf ("%d STORELOCAL %d\n", p-code, *(++p));
p++; p++;
break; break;
case STOREGLOBAL: case STOREGLOBAL:
@ -718,7 +764,18 @@ static void PrintCode (void)
case STOREINDEXED: printf ("%d STOREINDEXED %d\n", p-code, *(++p)); case STOREINDEXED: printf ("%d STOREINDEXED %d\n", p-code, *(++p));
p++; p++;
break; break;
case STOREFIELD: printf ("%d STOREFIELD\n", (p++)-code); break; case STORELIST0:
printf("%d STORELIST0 %d\n", p-code, *(++p));
p++;
break;
case STORELIST:
printf("%d STORELIST %d %d\n", p-code, *(p+1), *(p+2));
p+=3;
break;
case STORERECORD:
printf("%d STORERECORD %d\n", p-code, *(++p));
p += *p*sizeof(Word) + 1;
break;
case ADJUST: case ADJUST:
printf ("%d ADJUST %d\n", p-code, *(++p)); printf ("%d ADJUST %d\n", p-code, *(++p));
p++; p++;