diff options
Diffstat (limited to 'apps/plugins/lua/ldump.c')
-rw-r--r-- | apps/plugins/lua/ldump.c | 43 |
1 files changed, 17 insertions, 26 deletions
diff --git a/apps/plugins/lua/ldump.c b/apps/plugins/lua/ldump.c index 61fa2cd892..c9d3d4870f 100644 --- a/apps/plugins/lua/ldump.c +++ b/apps/plugins/lua/ldump.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: ldump.c,v 2.17.1.1 2013/04/12 18:48:47 roberto Exp $ | 2 | ** $Id: ldump.c,v 2.8.1.1 2007/12/27 13:02:25 roberto Exp $ |
3 | ** save precompiled Lua chunks | 3 | ** save precompiled Lua chunks |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -24,7 +24,7 @@ typedef struct { | |||
24 | } DumpState; | 24 | } DumpState; |
25 | 25 | ||
26 | #define DumpMem(b,n,size,D) DumpBlock(b,(n)*(size),D) | 26 | #define DumpMem(b,n,size,D) DumpBlock(b,(n)*(size),D) |
27 | #define DumpVar(x,D) DumpMem(&x,1,sizeof(x),D) | 27 | #define DumpVar(x,D) DumpMem(&x,1,sizeof(x),D) |
28 | 28 | ||
29 | static void DumpBlock(const void* b, size_t size, DumpState* D) | 29 | static void DumpBlock(const void* b, size_t size, DumpState* D) |
30 | { | 30 | { |
@@ -60,7 +60,7 @@ static void DumpVector(const void* b, int n, size_t size, DumpState* D) | |||
60 | 60 | ||
61 | static void DumpString(const TString* s, DumpState* D) | 61 | static void DumpString(const TString* s, DumpState* D) |
62 | { | 62 | { |
63 | if (s==NULL) | 63 | if (s==NULL || getstr(s)==NULL) |
64 | { | 64 | { |
65 | size_t size=0; | 65 | size_t size=0; |
66 | DumpVar(size,D); | 66 | DumpVar(size,D); |
@@ -69,13 +69,13 @@ static void DumpString(const TString* s, DumpState* D) | |||
69 | { | 69 | { |
70 | size_t size=s->tsv.len+1; /* include trailing '\0' */ | 70 | size_t size=s->tsv.len+1; /* include trailing '\0' */ |
71 | DumpVar(size,D); | 71 | DumpVar(size,D); |
72 | DumpBlock(getstr(s),size*sizeof(char),D); | 72 | DumpBlock(getstr(s),size,D); |
73 | } | 73 | } |
74 | } | 74 | } |
75 | 75 | ||
76 | #define DumpCode(f,D) DumpVector(f->code,f->sizecode,sizeof(Instruction),D) | 76 | #define DumpCode(f,D) DumpVector(f->code,f->sizecode,sizeof(Instruction),D) |
77 | 77 | ||
78 | static void DumpFunction(const Proto* f, DumpState* D); | 78 | static void DumpFunction(const Proto* f, const TString* p, DumpState* D); |
79 | 79 | ||
80 | static void DumpConstants(const Proto* f, DumpState* D) | 80 | static void DumpConstants(const Proto* f, DumpState* D) |
81 | { | 81 | { |
@@ -84,8 +84,8 @@ static void DumpConstants(const Proto* f, DumpState* D) | |||
84 | for (i=0; i<n; i++) | 84 | for (i=0; i<n; i++) |
85 | { | 85 | { |
86 | const TValue* o=&f->k[i]; | 86 | const TValue* o=&f->k[i]; |
87 | DumpChar(ttypenv(o),D); | 87 | DumpChar(ttype(o),D); |
88 | switch (ttypenv(o)) | 88 | switch (ttype(o)) |
89 | { | 89 | { |
90 | case LUA_TNIL: | 90 | case LUA_TNIL: |
91 | break; | 91 | break; |
@@ -98,29 +98,19 @@ static void DumpConstants(const Proto* f, DumpState* D) | |||
98 | case LUA_TSTRING: | 98 | case LUA_TSTRING: |
99 | DumpString(rawtsvalue(o),D); | 99 | DumpString(rawtsvalue(o),D); |
100 | break; | 100 | break; |
101 | default: lua_assert(0); | 101 | default: |
102 | lua_assert(0); /* cannot happen */ | ||
103 | break; | ||
102 | } | 104 | } |
103 | } | 105 | } |
104 | n=f->sizep; | 106 | n=f->sizep; |
105 | DumpInt(n,D); | 107 | DumpInt(n,D); |
106 | for (i=0; i<n; i++) DumpFunction(f->p[i],D); | 108 | for (i=0; i<n; i++) DumpFunction(f->p[i],f->source,D); |
107 | } | ||
108 | |||
109 | static void DumpUpvalues(const Proto* f, DumpState* D) | ||
110 | { | ||
111 | int i,n=f->sizeupvalues; | ||
112 | DumpInt(n,D); | ||
113 | for (i=0; i<n; i++) | ||
114 | { | ||
115 | DumpChar(f->upvalues[i].instack,D); | ||
116 | DumpChar(f->upvalues[i].idx,D); | ||
117 | } | ||
118 | } | 109 | } |
119 | 110 | ||
120 | static void DumpDebug(const Proto* f, DumpState* D) | 111 | static void DumpDebug(const Proto* f, DumpState* D) |
121 | { | 112 | { |
122 | int i,n; | 113 | int i,n; |
123 | DumpString((D->strip) ? NULL : f->source,D); | ||
124 | n= (D->strip) ? 0 : f->sizelineinfo; | 114 | n= (D->strip) ? 0 : f->sizelineinfo; |
125 | DumpVector(f->lineinfo,n,sizeof(int),D); | 115 | DumpVector(f->lineinfo,n,sizeof(int),D); |
126 | n= (D->strip) ? 0 : f->sizelocvars; | 116 | n= (D->strip) ? 0 : f->sizelocvars; |
@@ -133,25 +123,26 @@ static void DumpDebug(const Proto* f, DumpState* D) | |||
133 | } | 123 | } |
134 | n= (D->strip) ? 0 : f->sizeupvalues; | 124 | n= (D->strip) ? 0 : f->sizeupvalues; |
135 | DumpInt(n,D); | 125 | DumpInt(n,D); |
136 | for (i=0; i<n; i++) DumpString(f->upvalues[i].name,D); | 126 | for (i=0; i<n; i++) DumpString(f->upvalues[i],D); |
137 | } | 127 | } |
138 | 128 | ||
139 | static void DumpFunction(const Proto* f, DumpState* D) | 129 | static void DumpFunction(const Proto* f, const TString* p, DumpState* D) |
140 | { | 130 | { |
131 | DumpString((f->source==p || D->strip) ? NULL : f->source,D); | ||
141 | DumpInt(f->linedefined,D); | 132 | DumpInt(f->linedefined,D); |
142 | DumpInt(f->lastlinedefined,D); | 133 | DumpInt(f->lastlinedefined,D); |
134 | DumpChar(f->nups,D); | ||
143 | DumpChar(f->numparams,D); | 135 | DumpChar(f->numparams,D); |
144 | DumpChar(f->is_vararg,D); | 136 | DumpChar(f->is_vararg,D); |
145 | DumpChar(f->maxstacksize,D); | 137 | DumpChar(f->maxstacksize,D); |
146 | DumpCode(f,D); | 138 | DumpCode(f,D); |
147 | DumpConstants(f,D); | 139 | DumpConstants(f,D); |
148 | DumpUpvalues(f,D); | ||
149 | DumpDebug(f,D); | 140 | DumpDebug(f,D); |
150 | } | 141 | } |
151 | 142 | ||
152 | static void DumpHeader(DumpState* D) | 143 | static void DumpHeader(DumpState* D) |
153 | { | 144 | { |
154 | lu_byte h[LUAC_HEADERSIZE]; | 145 | char h[LUAC_HEADERSIZE]; |
155 | luaU_header(h); | 146 | luaU_header(h); |
156 | DumpBlock(h,LUAC_HEADERSIZE,D); | 147 | DumpBlock(h,LUAC_HEADERSIZE,D); |
157 | } | 148 | } |
@@ -168,6 +159,6 @@ int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip | |||
168 | D.strip=strip; | 159 | D.strip=strip; |
169 | D.status=0; | 160 | D.status=0; |
170 | DumpHeader(&D); | 161 | DumpHeader(&D); |
171 | DumpFunction(f,&D); | 162 | DumpFunction(f,NULL,&D); |
172 | return D.status; | 163 | return D.status; |
173 | } | 164 | } |