new version by lhf.

This commit is contained in:
Roberto Ierusalimschy
1999-03-30 17:29:34 -03:00
parent e0ff4e5d22
commit 7c9aee64c2
2 changed files with 134 additions and 70 deletions

108
lundump.c
View File

@@ -1,13 +1,15 @@
/*
** $Id: lundump.c,v 1.6 1998/12/27 20:23:22 roberto Exp roberto $
** $Id: lundump.c,v 1.17 1999/03/29 16:16:18 lhf Exp $
** load bytecodes from files
** See Copyright Notice in lua.h
*/
#include <stdio.h>
#include <string.h>
#include "lauxlib.h"
#include "lfunc.h"
#include "lmem.h"
#include "lopcodes.h"
#include "lstring.h"
#include "lundump.h"
@@ -52,19 +54,18 @@ static unsigned long LoadLong (ZIO* Z)
return (hi<<16)|lo;
}
#if ID_NUMBER==ID_REAL4
/* LUA_NUMBER */
#if ID_NUMBER==ID_REAL4 /* LUA_NUMBER */
/* assumes sizeof(long)==4 and sizeof(float)==4 (IEEE) */
static float LoadFloat (ZIO* Z)
{
unsigned long l=LoadLong(Z);
float f=*(float*)&l;
float f;
memcpy(&f,&l,sizeof(f));
return f;
}
#endif
#if ID_NUMBER==ID_REAL8
/* LUA_NUMBER */
#if ID_NUMBER==ID_REAL8 /* LUA_NUMBER */
/* assumes sizeof(long)==4 and sizeof(double)==8 (IEEE) */
static double LoadDouble (ZIO* Z)
{
@@ -81,25 +82,34 @@ static double LoadDouble (ZIO* Z)
l[0]=LoadLong(Z);
l[1]=LoadLong(Z);
}
f=*(double*)l;
memcpy(&f,l,sizeof(f));
return f;
}
#endif
static int LoadInt (ZIO* Z, char* message)
{
unsigned long l=LoadLong(Z);
unsigned int i=l;
if (i!=l) luaL_verror(message,l,zname(Z));
return i;
}
#define PAD 5 /* two word operands plus opcode */
static Byte* LoadCode (ZIO* Z)
{
unsigned long size=LoadLong(Z);
unsigned int s=size;
void* b;
if (s!=size) luaL_verror("code too long (%ld bytes) in %s",size,zname(Z));
b=luaM_malloc(size);
int size=LoadInt(Z,"code too long (%ld bytes) in %s");
Byte* b=luaM_malloc(size+PAD);
LoadBlock(b,size,Z);
if (b[size-1]!=ENDCODE) luaL_verror("bad code in %s",zname(Z));
memset(b+size,ENDCODE,PAD); /* pad for safety */
return b;
}
static TaggedString* LoadTString (ZIO* Z)
{
int size=LoadWord(Z);
long size=LoadLong(Z);
if (size==0)
return NULL;
else
@@ -112,46 +122,45 @@ static TaggedString* LoadTString (ZIO* Z)
static void LoadLocals (TProtoFunc* tf, ZIO* Z)
{
int i,n=LoadWord(Z);
int i,n=LoadInt(Z,"too many locals (%ld) in %s");
if (n==0) return;
tf->locvars=luaM_newvector(n+1,LocVar);
for (i=0; i<n; i++)
{
tf->locvars[i].line=LoadWord(Z);
tf->locvars[i].line=LoadInt(Z,"too many lines (%ld) in %s");
tf->locvars[i].varname=LoadTString(Z);
}
tf->locvars[i].line=-1; /* flag end of vector */
tf->locvars[i].varname=NULL;
}
static TProtoFunc* LoadFunction (ZIO* Z);
static TProtoFunc* LoadFunction(ZIO* Z);
static void LoadConstants (TProtoFunc* tf, ZIO* Z)
{
int i,n=LoadWord(Z);
int i,n=LoadInt(Z,"too many constants (%ld) in %s");
tf->nconsts=n;
if (n==0) return;
tf->consts=luaM_newvector(n,TObject);
for (i=0; i<n; i++)
{
TObject* o=tf->consts+i;
int c=ezgetc(Z);
switch (c)
ttype(o)=-ezgetc(Z); /* ttype(o) is negative - ORDER LUA_T */
switch (ttype(o))
{
case ID_NUM:
ttype(o)=LUA_T_NUMBER;
case LUA_T_NUMBER:
doLoadNumber(nvalue(o),Z);
break;
case ID_STR:
ttype(o)=LUA_T_STRING;
case LUA_T_STRING:
tsvalue(o)=LoadTString(Z);
break;
case ID_FUN:
ttype(o)=LUA_T_PROTO;
case LUA_T_PROTO:
tfvalue(o)=LoadFunction(Z);
break;
default:
luaL_verror("bad constant #%d in %s: type=%d ('%c')",i,zname(Z),c,c);
case LUA_T_NIL:
break;
default: /* cannot happen */
luaU_badconstant("load",i,o,tf);
break;
}
}
@@ -160,8 +169,9 @@ static void LoadConstants (TProtoFunc* tf, ZIO* Z)
static TProtoFunc* LoadFunction (ZIO* Z)
{
TProtoFunc* tf=luaF_newproto();
tf->lineDefined=LoadWord(Z);
tf->lineDefined=LoadInt(Z,"lineDefined too large (%ld) in %s");
tf->source=LoadTString(Z);
if (tf->source==NULL) tf->source=luaS_new(zname(Z));
tf->code=LoadCode(Z);
LoadLocals(tf,Z);
LoadConstants(tf,Z);
@@ -180,6 +190,7 @@ static void LoadHeader (ZIO* Z)
{
int version,id,sizeofR;
real f=-TEST_NUMBER,tf=TEST_NUMBER;
luaU_testnumber();
LoadSignature(Z);
version=ezgetc(Z);
if (version>VERSION)
@@ -193,15 +204,14 @@ static void LoadHeader (ZIO* Z)
id=ezgetc(Z); /* test number representation */
sizeofR=ezgetc(Z);
if (id!=ID_NUMBER || sizeofR!=sizeof(real))
{
luaL_verror("unknown number signature in %s: "
"read 0x%02x%02x; expected 0x%02x%02x",
zname(Z),id,sizeofR,ID_NUMBER,sizeof(real));
}
doLoadNumber(f,Z);
if (f!=tf)
luaL_verror("unknown number representation in %s: read %g; expected %g",
zname(Z),(double)f,(double)tf); /* LUA_NUMBER */
luaL_verror("unknown number representation in %s: "
"read " NUMBER_FMT "; expected " NUMBER_FMT,
zname(Z),f,tf);
}
static TProtoFunc* LoadChunk (ZIO* Z)
@@ -214,7 +224,7 @@ static TProtoFunc* LoadChunk (ZIO* Z)
** load one chunk from a file or buffer
** return main if ok and NULL at EOF
*/
TProtoFunc* luaU_undump1 (ZIO* Z)
TProtoFunc* luaU_undump1(ZIO* Z)
{
int c=zgetc(Z);
if (c==ID_CHUNK)
@@ -223,3 +233,35 @@ TProtoFunc* luaU_undump1 (ZIO* Z)
luaL_verror("%s is not a Lua binary file",zname(Z));
return NULL;
}
/*
** test number representation
*/
void luaU_testnumber(void)
{
if (sizeof(real)!=SIZEOF_NUMBER)
luaL_verror("numbers have %d bytes; expected %d. see lundump.h",
(int)sizeof(real),SIZEOF_NUMBER);
#if ID_NUMBER==ID_REAL4 || ID_NUMBER==ID_REAL8
if (sizeof(long)!=4)
luaL_verror("longs have %d bytes; expected %d. see lundump.h",
(int)sizeof(long),4);
#endif
{
real t=TEST_NUMBER;
TYPEOF_NUMBER v=TEST_NUMBER;
if (t!=v)
luaL_verror("unsupported number type; expected %d-byte " NAMEOF_NUMBER "."
" see config and lundump.h",SIZEOF_NUMBER);
}
}
/*
* handle constants that cannot happen
*/
void luaU_badconstant(char* s, int i, TObject* o, TProtoFunc* tf)
{
int t=ttype(o);
char* name= (t>0 || t<LUA_T_LINE) ? "?" : luaO_typenames[-t];
luaL_verror("cannot %s constant #%d: type=%d [%s]" IN,s,i,t,name,INLOC);
}