mirrors/lua
1
0
Fork 0
mirror of https://github.com/lua/lua synced 2024-12-24 19:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

new versions by lhf

Browse Source
This commit is contained in:
Roberto Ierusalimschy 2005-11-16 09:55:07 -02:00
parent cbbde11a8a
commit 2753134a38
3 changed files with 203 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
ldump.c
View File

@ -1,6 +1,6 @@
/* /*
** $Id: ldump.c,v 2.5 2005/05/05 20:47:02 roberto Exp roberto $ ** $Id: ldump.c,v 1.13 2005/11/01 17:04:55 lhf Exp lhf $
** save pre-compiled Lua chunks ** save precompiled Lua chunks
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -12,13 +12,9 @@
#include "lua.h" #include "lua.h"
#include "lobject.h" #include "lobject.h"
#include "lopcodes.h"
#include "lstate.h" #include "lstate.h"
#include "lundump.h" #include "lundump.h"
#define DumpVector(b,n,size,D) DumpBlock(b,(n)*(size),D)
#define DumpLiteral(s,D) DumpBlock("" s,(sizeof(s))-1,D)
typedef struct { typedef struct {
lua_State* L; lua_State* L;
lua_Writer writer; lua_Writer writer;
@ -27,6 +23,9 @@ typedef struct {
int status; int status;
} DumpState; } DumpState;
#define DumpMem(b,n,size,D) DumpBlock(b,(n)*(size),D)
#define DumpVar(x,D) DumpMem(&x,1,sizeof(x),D)
static void DumpBlock(const void* b, size_t size, DumpState* D) static void DumpBlock(const void* b, size_t size, DumpState* D)
{ {
if (D->status==0) if (D->status==0)
@ -37,48 +36,84 @@ static void DumpBlock(const void* b, size_t size, DumpState* D)
} }
} }
static void DumpByte(int y, DumpState* D) static void DumpChar(int y, DumpState* D)
{ {
char x=(char)y; char x=(char)y;
DumpBlock(&x,sizeof(x),D); DumpVar(x,D);
} }
static void DumpInt(int x, DumpState* D) static void DumpInt(int x, DumpState* D)
{ {
DumpBlock(&x,sizeof(x),D); DumpVar(x,D);
}
static void DumpSize(size_t x, DumpState* D)
{
DumpBlock(&x,sizeof(x),D);
} }
static void DumpNumber(lua_Number x, DumpState* D) static void DumpNumber(lua_Number x, DumpState* D)
{ {
DumpBlock(&x,sizeof(x),D); DumpVar(x,D);
}
static void DumpVector(const void* b, int n, size_t size, DumpState* D)
{
DumpInt(n,D);
DumpMem(b,n,size,D);
} }
static void DumpString(const TString* s, DumpState* D) static void DumpString(const TString* s, DumpState* D)
{ {
if (s==NULL || getstr(s)==NULL) if (s==NULL || getstr(s)==NULL)
DumpSize(0,D); {
size_t size=0;
DumpVar(size,D);
}
else else
{ {
size_t size=s->tsv.len+1; /* include trailing '\0' */ size_t size=s->tsv.len+1; /* include trailing '\0' */
DumpSize(size,D); DumpVar(size,D);
DumpBlock(getstr(s),size,D); DumpBlock(getstr(s),size,D);
} }
} }
static void DumpCode(const Proto* f, DumpState* D) #define DumpCode(f,D) DumpVector(f->code,f->sizecode,sizeof(Instruction),D)
static void DumpFunction(const Proto* f, const TString* p, DumpState* D);
static void DumpConstants(const Proto* f, DumpState* D)
{ {
DumpInt(f->sizecode,D); int i,n=f->sizek;
DumpVector(f->code,f->sizecode,sizeof(*f->code),D); DumpInt(n,D);
for (i=0; i<n; i++)
{
const TValue* o=&f->k[i];
DumpChar(ttype(o),D);
switch (ttype(o))
{
case LUA_TNIL:
break;
case LUA_TBOOLEAN:
DumpChar(bvalue(o),D);
break;
case LUA_TNUMBER:
DumpNumber(nvalue(o),D);
break;
case LUA_TSTRING:
DumpString(rawtsvalue(o),D);
break;
default:
lua_assert(0); /* cannot happen */
break;
}
}
n=f->sizep;
DumpInt(n,D);
for (i=0; i<n; i++) DumpFunction(f->p[i],f->source,D);
} }
static void DumpLocals(const Proto* f, DumpState* D) static void DumpDebug(const Proto* f, DumpState* D)
{ {
int i,n=f->sizelocvars; int i,n;
n= (D->strip) ? 0 : f->sizelineinfo;
DumpVector(f->lineinfo,n,sizeof(int),D);
n= (D->strip) ? 0 : f->sizelocvars;
DumpInt(n,D); DumpInt(n,D);
for (i=0; i<n; i++) for (i=0; i<n; i++)
{ {
@ -86,86 +121,36 @@ static void DumpLocals(const Proto* f, DumpState* D)
DumpInt(f->locvars[i].startpc,D); DumpInt(f->locvars[i].startpc,D);
DumpInt(f->locvars[i].endpc,D); DumpInt(f->locvars[i].endpc,D);
} }
} n= (D->strip) ? 0 : f->sizeupvalues;
static void DumpLines(const Proto* f, DumpState* D)
{
DumpInt(f->sizelineinfo,D);
DumpVector(f->lineinfo,f->sizelineinfo,sizeof(*f->lineinfo),D);
}
static void DumpUpvalues(const Proto* f, DumpState* D)
{
int i,n=f->sizeupvalues;
DumpInt(n,D); DumpInt(n,D);
for (i=0; i<n; i++) DumpString(f->upvalues[i],D); for (i=0; i<n; i++) DumpString(f->upvalues[i],D);
} }
static void DumpFunction(const Proto* f, const TString* p, DumpState* D);
static void DumpConstants(const Proto* f, DumpState* D)
{
int i,n;
DumpInt(n=f->sizek,D);
for (i=0; i<n; i++)
{
const TValue* o=&f->k[i];
DumpByte(ttype(o),D);
switch (ttype(o))
{
case LUA_TNUMBER:
DumpNumber(nvalue(o),D);
break;
case LUA_TSTRING:
DumpString(rawtsvalue(o),D);
break;
case LUA_TNIL:
break;
case LUA_TBOOLEAN:
DumpByte(bvalue(o),D);
break;
default:
lua_assert(0); /* cannot happen */
break;
}
}
DumpInt(n=f->sizep,D);
for (i=0; i<n; i++) DumpFunction(f->p[i],f->source,D);
}
static void DumpFunction(const Proto* f, const TString* p, DumpState* D) static void DumpFunction(const Proto* f, const TString* p, DumpState* D)
{ {
DumpString((f->source==p) ? NULL : f->source,D); DumpString((f->source==p) ? NULL : f->source,D);
DumpInt(f->linedefined,D); DumpInt(f->linedefined,D);
DumpInt(f->lastlinedefined,D); DumpInt(f->lastlinedefined,D);
DumpByte(f->nups,D); DumpChar(f->nups,D);
DumpByte(f->numparams,D); DumpChar(f->numparams,D);
DumpByte(f->is_vararg,D); DumpChar(f->is_vararg,D);
DumpByte(f->maxstacksize,D); DumpChar(f->maxstacksize,D);
if (D->strip) DumpInt(0,D); else DumpLines(f,D);
if (D->strip) DumpInt(0,D); else DumpLocals(f,D);
if (D->strip) DumpInt(0,D); else DumpUpvalues(f,D);
DumpConstants(f,D);
DumpCode(f,D); DumpCode(f,D);
DumpConstants(f,D);
DumpDebug(f,D);
} }
static void DumpHeader(DumpState* D) static void DumpHeader(DumpState* D)
{ {
DumpLiteral(LUA_SIGNATURE,D); char h[LUAC_HEADERSIZE];
DumpByte(VERSION,D); luaU_header(h);
DumpByte(luaU_endianness(),D); DumpBlock(h,LUAC_HEADERSIZE,D);
DumpByte(sizeof(int),D);
DumpByte(sizeof(size_t),D);
DumpByte(sizeof(Instruction),D);
DumpByte(sizeof(lua_Number),D);
DumpNumber(TEST_NUMBER,D);
} }
/* /*
** dump Lua function as precompiled chunk ** dump Lua function as precompiled chunk
*/ */
int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip)
int strip)
{ {
DumpState D; DumpState D;
D.L=L; D.L=L;

311
lundump.c
View File

@ -1,9 +1,11 @@
/* /*
** $Id: lundump.c,v 2.4 2005/05/05 20:47:02 roberto Exp roberto $ ** $Id: lundump.c,v 1.58 2005/09/02 01:54:47 lhf Exp lhf $
** load pre-compiled Lua chunks ** load precompiled Lua chunks
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
#include <string.h>
#define lundump_c #define lundump_c
#define LUA_CORE #define LUA_CORE
@ -13,115 +15,132 @@
#include "ldo.h" #include "ldo.h"
#include "lfunc.h" #include "lfunc.h"
#include "lmem.h" #include "lmem.h"
#include "lopcodes.h" #include "lobject.h"
#include "lstring.h" #include "lstring.h"
#include "lundump.h" #include "lundump.h"
#include "lzio.h" #include "lzio.h"
#define LoadByte (lu_byte) ezgetc
typedef struct { typedef struct {
lua_State* L; lua_State* L;
ZIO* Z; ZIO* Z;
Mbuffer* b; Mbuffer* b;
int swap;
const char* name; const char* name;
} LoadState; } LoadState;
static void unexpectedEOZ (LoadState* S) #ifdef LUAC_TRUST_BINARIES
#define IF(c,s)
#else
#define IF(c,s) if (c) error(S,s)
static void error(LoadState* S, const char* why)
{ {
luaG_runerror(S->L,"unexpected end of file in %s",S->name); luaO_pushfstring(S->L,"%s: %s in precompiled chunk",S->name,why);
luaD_throw(S->L,LUA_ERRSYNTAX);
}
#endif
#define LoadMem(S,b,n,size) LoadBlock(S,b,(n)*(size))
#define LoadByte(S) (lu_byte)LoadChar(S)
#define LoadVar(S,x) LoadMem(S,&x,1,sizeof(x))
#define LoadVector(S,b,n,size) LoadMem(S,b,n,size)
static void LoadBlock(LoadState* S, void* b, size_t size)
{
size_t r=luaZ_read(S->Z,b,size);
IF (r!=0, "unexpected end");
} }
static int ezgetc (LoadState* S) static int LoadChar(LoadState* S)
{ {
int c=zgetc(S->Z); char x;
if (c==EOZ) unexpectedEOZ(S); LoadVar(S,x);
return c; return x;
} }
static void ezread (LoadState* S, void* b, size_t n) static int LoadInt(LoadState* S)
{
size_t r=luaZ_read(S->Z,b,n);
if (r!=0) unexpectedEOZ(S);
}
static void LoadBlock (LoadState* S, void* b, size_t size)
{
if (S->swap)
{
char* p=(char*) b+size-1;
size_t n=size;
while (n--) *p--=(char)ezgetc(S);
}
else
ezread(S,b,size);
}
static void LoadVector (LoadState* S, void* b, int m, size_t size)
{
if (S->swap)
{
char* q=(char*) b;
while (m--)
{
char* p=q+size-1;
size_t n=size;
while (n--) *p--=(char)ezgetc(S);
q+=size;
}
}
else
ezread(S,b,m*size);
}
static int LoadInt (LoadState* S)
{ {
int x; int x;
LoadBlock(S,&x,sizeof(x)); LoadVar(S,x);
if (x<0) luaG_runerror(S->L,"bad integer in %s",S->name); IF (x<0, "bad integer");
return x; return x;
} }
static size_t LoadSize (LoadState* S) static lua_Number LoadNumber(LoadState* S)
{
size_t x;
LoadBlock(S,&x,sizeof(x));
return x;
}
static lua_Number LoadNumber (LoadState* S)
{ {
lua_Number x; lua_Number x;
LoadBlock(S,&x,sizeof(x)); LoadVar(S,x);
return x; return x;
} }
static TString* LoadString (LoadState* S) static TString* LoadString(LoadState* S)
{ {
size_t size=LoadSize(S); size_t size;
LoadVar(S,size);
if (size==0) if (size==0)
return NULL; return NULL;
else else
{ {
char* s=luaZ_openspace(S->L,S->b,size); char* s=luaZ_openspace(S->L,S->b,size);
ezread(S,s,size); LoadBlock(S,s,size);
return luaS_newlstr(S->L,s,size-1); /* remove trailing '\0' */ return luaS_newlstr(S->L,s,size-1); /* remove trailing '\0' */
} }
} }
static void LoadCode (LoadState* S, Proto* f) static void LoadCode(LoadState* S, Proto* f)
{ {
int size=LoadInt(S); int n=LoadInt(S);
f->code=luaM_newvector(S->L,size,Instruction); f->code=luaM_newvector(S->L,n,Instruction);
f->sizecode=size; f->sizecode=n;
LoadVector(S,f->code,size,sizeof(*f->code)); LoadVector(S,f->code,n,sizeof(Instruction));
} }
static void LoadLocals (LoadState* S, Proto* f) static Proto* LoadFunction(LoadState* S, TString* p);
static void LoadConstants(LoadState* S, Proto* f)
{ {
int i,n; int i,n;
n=LoadInt(S); n=LoadInt(S);
f->k=luaM_newvector(S->L,n,TValue);
f->sizek=n;
for (i=0; i<n; i++) setnilvalue(&f->k[i]);
for (i=0; i<n; i++)
{
TValue* o=&f->k[i];
int t=LoadChar(S);
switch (t)
{
case LUA_TNIL:
setnilvalue(o);
break;
case LUA_TBOOLEAN:
setbvalue(o,LoadChar(S));
break;
case LUA_TNUMBER:
setnvalue(o,LoadNumber(S));
break;
case LUA_TSTRING:
setsvalue2n(S->L,o,LoadString(S));
break;
default:
IF (1, "bad constant");
break;
}
}
n=LoadInt(S);
f->p=luaM_newvector(S->L,n,Proto*);
f->sizep=n;
for (i=0; i<n; i++) f->p[i]=NULL;
for (i=0; i<n; i++) f->p[i]=LoadFunction(S,f->source);
}
static void LoadDebug(LoadState* S, Proto* f)
{
int i,n;
n=LoadInt(S);
f->lineinfo=luaM_newvector(S->L,n,int);
f->sizelineinfo=n;
LoadVector(S,f->lineinfo,n,sizeof(int));
n=LoadInt(S);
f->locvars=luaM_newvector(S->L,n,LocVar); f->locvars=luaM_newvector(S->L,n,LocVar);
f->sizelocvars=n; f->sizelocvars=n;
for (i=0; i<n; i++) f->locvars[i].varname=NULL; for (i=0; i<n; i++) f->locvars[i].varname=NULL;
@ -131,75 +150,17 @@ static void LoadLocals (LoadState* S, Proto* f)
f->locvars[i].startpc=LoadInt(S); f->locvars[i].startpc=LoadInt(S);
f->locvars[i].endpc=LoadInt(S); f->locvars[i].endpc=LoadInt(S);
} }
}
static void LoadLines (LoadState* S, Proto* f)
{
int size=LoadInt(S);
f->lineinfo=luaM_newvector(S->L,size,int);
f->sizelineinfo=size;
LoadVector(S,f->lineinfo,size,sizeof(*f->lineinfo));
}
static void LoadUpvalues (LoadState* S, Proto* f)
{
int i,n;
n=LoadInt(S); n=LoadInt(S);
if (n!=0 && n!=f->nups)
luaG_runerror(S->L,"bad nupvalues in %s: read %d; expected %d",
S->name,n,f->nups);
f->upvalues=luaM_newvector(S->L,n,TString*); f->upvalues=luaM_newvector(S->L,n,TString*);
f->sizeupvalues=n; f->sizeupvalues=n;
for (i=0; i<n; i++) f->upvalues[i]=NULL; for (i=0; i<n; i++) f->upvalues[i]=NULL;
for (i=0; i<n; i++) f->upvalues[i]=LoadString(S); for (i=0; i<n; i++) f->upvalues[i]=LoadString(S);
} }
static Proto* LoadFunction (LoadState* S, TString* p); static Proto* LoadFunction(LoadState* S, TString* p)
static void LoadConstants (LoadState* S, Proto* f)
{ {
int i,n; Proto* f=luaF_newproto(S->L);
lua_State *L=S->L; setptvalue2s(S->L,S->L->top,f); incr_top(S->L);
n=LoadInt(S);
f->k=luaM_newvector(L,n,TValue);
f->sizek=n;
for (i=0; i<n; i++) setnilvalue(&f->k[i]);
for (i=0; i<n; i++)
{
TValue* o=&f->k[i];
int t=LoadByte(S);
switch (t)
{
case LUA_TNUMBER:
setnvalue(o,LoadNumber(S));
break;
case LUA_TSTRING:
setsvalue2n(L, o,LoadString(S));
break;
case LUA_TNIL:
setnilvalue(o);
break;
case LUA_TBOOLEAN:
setbvalue(o, LoadByte(S));
break;
default:
luaG_runerror(L,"bad constant type (%d) in %s",t,S->name);
break;
}
}
n=LoadInt(S);
f->p=luaM_newvector(L,n,Proto*);
f->sizep=n;
for (i=0; i<n; i++) f->p[i]=NULL;
for (i=0; i<n; i++) f->p[i]=LoadFunction(S,f->source);
}
static Proto* LoadFunction (LoadState* S, TString* p)
{
lua_State *L=S->L;
Proto* f=luaF_newproto(L);
setptvalue2s(L, L->top, f);
incr_top(L);
f->source=LoadString(S); if (f->source==NULL) f->source=p; f->source=LoadString(S); if (f->source==NULL) f->source=p;
f->linedefined=LoadInt(S); f->linedefined=LoadInt(S);
f->lastlinedefined=LoadInt(S); f->lastlinedefined=LoadInt(S);
@ -207,90 +168,56 @@ static Proto* LoadFunction (LoadState* S, TString* p)
f->numparams=LoadByte(S); f->numparams=LoadByte(S);
f->is_vararg=LoadByte(S); f->is_vararg=LoadByte(S);
f->maxstacksize=LoadByte(S); f->maxstacksize=LoadByte(S);
LoadLines(S,f);
LoadLocals(S,f);
LoadUpvalues(S,f);
LoadConstants(S,f);
LoadCode(S,f); LoadCode(S,f);
#ifndef TRUST_BINARIES LoadConstants(S,f);
if (!luaG_checkcode(f)) luaG_runerror(L,"bad code in %s",S->name); LoadDebug(S,f);
#endif IF (!luaG_checkcode(f), "bad code");
L->top--; S->L->top--;
return f; return f;
} }
static void LoadSignature (LoadState* S) static void LoadHeader(LoadState* S)
{ {
const char* s=LUA_SIGNATURE; char h[LUAC_HEADERSIZE];
while (*s!=0 && ezgetc(S)==*s) char s[LUAC_HEADERSIZE];
++s; luaU_header(h);
if (*s!=0) luaG_runerror(S->L,"bad signature in %s",S->name); LoadBlock(S,s,LUAC_HEADERSIZE);
} IF (memcmp(h,s,LUAC_HEADERSIZE)!=0, "bad header");
static void TestSize (LoadState* S, int s, const char* what)
{
int r=LoadByte(S);
if (r!=s)
luaG_runerror(S->L,"virtual machine mismatch in %s: "
"size of %s is %d but read %d",S->name,what,s,r);
}
#define TESTSIZE(s,w) TestSize(S,s,w)
#define V(v) v/16,v%16
static void LoadHeader (LoadState* S)
{
int version;
lua_Number x,tx=TEST_NUMBER;
LoadSignature(S);
version=LoadByte(S);
if (version>VERSION)
luaG_runerror(S->L,"%s too new: "
"read version %d.%d; expected at most %d.%d",
S->name,V(version),V(VERSION));
if (version<VERSION0) /* check last major change */
luaG_runerror(S->L,"%s too old: "
"read version %d.%d; expected at least %d.%d",
S->name,V(version),V(VERSION0));
S->swap=(luaU_endianness()!=LoadByte(S)); /* need to swap bytes? */
TESTSIZE(sizeof(int),"int");
TESTSIZE(sizeof(size_t), "size_t");
TESTSIZE(sizeof(Instruction), "Instruction");
TESTSIZE(sizeof(lua_Number), "number");
x=LoadNumber(S);
if ((long)x!=(long)tx) /* disregard errors in last bits of fraction */
luaG_runerror(S->L,"unknown number format in %s",S->name);
}
static Proto* LoadChunk (LoadState* S)
{
LoadHeader(S);
return LoadFunction(S,NULL);
} }
/* /*
** load precompiled chunk ** load precompiled chunk
*/ */
Proto* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff, const char *s) Proto* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff, const char* name)
{ {
LoadState S; LoadState S;
if (*s=='@' || *s=='=') if (*name=='@' || *name=='=')
S.name=s+1; S.name=name+1;
else if (*s==LUA_SIGNATURE[0]) else if (*name==LUA_SIGNATURE[0])
S.name="binary string"; S.name="binary string";
else else
S.name=s; S.name=name;
S.L=L; S.L=L;
S.Z=Z; S.Z=Z;
S.b=buff; S.b=buff;
return LoadChunk(&S); LoadHeader(&S);
return LoadFunction(&S,NULL);
} }
/* /*
** find byte order * make header
*/ */
int luaU_endianness (void) void luaU_header (char* h)
{ {
int x=1; int x=1;
return *(char*)&x; memcpy(h,LUA_SIGNATURE,sizeof(LUA_SIGNATURE)-1);
h+=sizeof(LUA_SIGNATURE)-1;
*h++=(char)LUAC_VERSION;
*h++=(char)LUAC_FORMAT;
*h++=(char)*(char*)&x; /* endianness */
*h++=(char)sizeof(int);
*h++=(char)sizeof(size_t);
*h++=(char)sizeof(Instruction);
*h++=(char)sizeof(lua_Number);
*h++=(char)(((lua_Number)0.5)==0); /* is lua_Number integral? */
} }

31
lundump.h
View File

@ -1,6 +1,6 @@
/* /*
** $Id: lundump.h,v 1.35 2005/04/25 19:24:10 roberto Exp roberto $ ** $Id: lundump.h,v 1.39 2005/11/01 17:04:55 lhf Exp lhf $
** load pre-compiled Lua chunks ** load precompiled Lua chunks
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -11,25 +11,26 @@
#include "lzio.h" #include "lzio.h"
/* load one chunk; from lundump.c */ /* load one chunk; from lundump.c */
LUAI_FUNC Proto* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff, LUAI_FUNC Proto* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff, const char* name);
const char *name);
/* find byte order; from lundump.c */ /* make header; from lundump.c */
LUAI_FUNC int luaU_endianness (void); LUAI_FUNC void luaU_header (char* h);
/* dump one chunk; from ldump.c */ /* dump one chunk; from ldump.c */
LUAI_FUNC int luaU_dump (lua_State* L, const Proto* Main, lua_Writer w, LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip);
void* data, int strip);
#ifdef luac_c
/* print one chunk; from print.c */ /* print one chunk; from print.c */
LUAI_FUNC void luaU_print (const Proto* Main); LUAI_FUNC void luaU_print (const Proto* f, int full);
#endif
/* definitions for headers of binary files */ /* for header of binary files -- this is Lua 5.1 */
#define VERSION 0x50 /* last format change was in 5.0 */ #define LUAC_VERSION 0x51
#define VERSION0 0x50 /* last major change was in 5.0 */
/* a multiple of PI for testing native format */ /* for header of binary files -- this is the official format */
/* multiplying by 1E7 gives non-trivial integer values */ #define LUAC_FORMAT 0
#define TEST_NUMBER ((lua_Number)3.14159265358979323846E7)
/* size of header of binary files */
#define LUAC_HEADERSIZE 12
#endif #endif