diff options
Diffstat (limited to 'apps/plugins/lua/lvm.c')
-rw-r--r-- | apps/plugins/lua/lvm.c | 914 |
1 files changed, 405 insertions, 509 deletions
diff --git a/apps/plugins/lua/lvm.c b/apps/plugins/lua/lvm.c index 141b9fd19c..ee3256ab94 100644 --- a/apps/plugins/lua/lvm.c +++ b/apps/plugins/lua/lvm.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lvm.c,v 2.155.1.1 2013/04/12 18:48:47 roberto Exp $ | 2 | ** $Id: lvm.c,v 2.63.1.3 2007/12/28 15:32:23 roberto Exp $ |
3 | ** Lua virtual machine | 3 | ** Lua virtual machine |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -35,7 +35,7 @@ | |||
35 | const TValue *luaV_tonumber (const TValue *obj, TValue *n) { | 35 | const TValue *luaV_tonumber (const TValue *obj, TValue *n) { |
36 | lua_Number num; | 36 | lua_Number num; |
37 | if (ttisnumber(obj)) return obj; | 37 | if (ttisnumber(obj)) return obj; |
38 | if (ttisstring(obj) && luaO_str2d(svalue(obj), tsvalue(obj)->len, &num)) { | 38 | if (ttisstring(obj) && luaO_str2d(svalue(obj), &num)) { |
39 | setnvalue(n, num); | 39 | setnvalue(n, num); |
40 | return n; | 40 | return n; |
41 | } | 41 | } |
@@ -50,60 +50,58 @@ int luaV_tostring (lua_State *L, StkId obj) { | |||
50 | else { | 50 | else { |
51 | char s[LUAI_MAXNUMBER2STR]; | 51 | char s[LUAI_MAXNUMBER2STR]; |
52 | lua_Number n = nvalue(obj); | 52 | lua_Number n = nvalue(obj); |
53 | int l = lua_number2str(s, n); | 53 | lua_number2str(s, n); |
54 | setsvalue2s(L, obj, luaS_newlstr(L, s, l)); | 54 | setsvalue2s(L, obj, luaS_new(L, s)); |
55 | return 1; | 55 | return 1; |
56 | } | 56 | } |
57 | } | 57 | } |
58 | 58 | ||
59 | 59 | ||
60 | static void traceexec (lua_State *L) { | 60 | static void traceexec (lua_State *L, const Instruction *pc) { |
61 | CallInfo *ci = L->ci; | ||
62 | lu_byte mask = L->hookmask; | 61 | lu_byte mask = L->hookmask; |
63 | int counthook = ((mask & LUA_MASKCOUNT) && L->hookcount == 0); | 62 | const Instruction *oldpc = L->savedpc; |
64 | if (counthook) | 63 | L->savedpc = pc; |
65 | resethookcount(L); /* reset count */ | 64 | if ((mask & LUA_MASKCOUNT) && L->hookcount == 0) { |
66 | if (ci->callstatus & CIST_HOOKYIELD) { /* called hook last time? */ | 65 | resethookcount(L); |
67 | ci->callstatus &= ~CIST_HOOKYIELD; /* erase mark */ | 66 | luaD_callhook(L, LUA_HOOKCOUNT, -1); |
68 | return; /* do not call hook again (VM yielded, so it did not move) */ | ||
69 | } | 67 | } |
70 | if (counthook) | ||
71 | luaD_hook(L, LUA_HOOKCOUNT, -1); /* call count hook */ | ||
72 | if (mask & LUA_MASKLINE) { | 68 | if (mask & LUA_MASKLINE) { |
73 | Proto *p = ci_func(ci)->p; | 69 | Proto *p = ci_func(L->ci)->l.p; |
74 | int npc = pcRel(ci->u.l.savedpc, p); | 70 | int npc = pcRel(pc, p); |
75 | int newline = getfuncline(p, npc); | 71 | int newline = getline(p, npc); |
76 | if (npc == 0 || /* call linehook when enter a new function, */ | 72 | /* call linehook when enter a new function, when jump back (loop), |
77 | ci->u.l.savedpc <= L->oldpc || /* when jump back (loop), or when */ | 73 | or when enter a new line */ |
78 | newline != getfuncline(p, pcRel(L->oldpc, p))) /* enter a new line */ | 74 | if (npc == 0 || pc <= oldpc || newline != getline(p, pcRel(oldpc, p))) |
79 | luaD_hook(L, LUA_HOOKLINE, newline); /* call line hook */ | 75 | luaD_callhook(L, LUA_HOOKLINE, newline); |
80 | } | ||
81 | L->oldpc = ci->u.l.savedpc; | ||
82 | if (L->status == LUA_YIELD) { /* did hook yield? */ | ||
83 | if (counthook) | ||
84 | L->hookcount = 1; /* undo decrement to zero */ | ||
85 | ci->u.l.savedpc--; /* undo increment (resume will increment it again) */ | ||
86 | ci->callstatus |= CIST_HOOKYIELD; /* mark that it yielded */ | ||
87 | ci->func = L->top - 1; /* protect stack below results */ | ||
88 | luaD_throw(L, LUA_YIELD); | ||
89 | } | 76 | } |
90 | } | 77 | } |
91 | 78 | ||
92 | 79 | ||
80 | static void callTMres (lua_State *L, StkId res, const TValue *f, | ||
81 | const TValue *p1, const TValue *p2) { | ||
82 | ptrdiff_t result = savestack(L, res); | ||
83 | setobj2s(L, L->top, f); /* push function */ | ||
84 | setobj2s(L, L->top+1, p1); /* 1st argument */ | ||
85 | setobj2s(L, L->top+2, p2); /* 2nd argument */ | ||
86 | luaD_checkstack(L, 3); | ||
87 | L->top += 3; | ||
88 | luaD_call(L, L->top - 3, 1); | ||
89 | res = restorestack(L, result); | ||
90 | L->top--; | ||
91 | setobjs2s(L, res, L->top); | ||
92 | } | ||
93 | |||
94 | |||
95 | |||
93 | static void callTM (lua_State *L, const TValue *f, const TValue *p1, | 96 | static void callTM (lua_State *L, const TValue *f, const TValue *p1, |
94 | const TValue *p2, TValue *p3, int hasres) { | 97 | const TValue *p2, const TValue *p3) { |
95 | ptrdiff_t result = savestack(L, p3); | 98 | setobj2s(L, L->top, f); /* push function */ |
96 | setobj2s(L, L->top++, f); /* push function */ | 99 | setobj2s(L, L->top+1, p1); /* 1st argument */ |
97 | setobj2s(L, L->top++, p1); /* 1st argument */ | 100 | setobj2s(L, L->top+2, p2); /* 2nd argument */ |
98 | setobj2s(L, L->top++, p2); /* 2nd argument */ | 101 | setobj2s(L, L->top+3, p3); /* 3th argument */ |
99 | if (!hasres) /* no result? 'p3' is third argument */ | 102 | luaD_checkstack(L, 4); |
100 | setobj2s(L, L->top++, p3); /* 3rd argument */ | 103 | L->top += 4; |
101 | /* metamethod may yield only when called from Lua code */ | 104 | luaD_call(L, L->top - 4, 0); |
102 | luaD_call(L, L->top - (4 - hasres), hasres, isLua(L->ci)); | ||
103 | if (hasres) { /* if has result, move it to its place */ | ||
104 | p3 = restorestack(L, result); | ||
105 | setobjs2s(L, p3, --L->top); | ||
106 | } | ||
107 | } | 105 | } |
108 | 106 | ||
109 | 107 | ||
@@ -114,7 +112,7 @@ void luaV_gettable (lua_State *L, const TValue *t, TValue *key, StkId val) { | |||
114 | if (ttistable(t)) { /* `t' is a table? */ | 112 | if (ttistable(t)) { /* `t' is a table? */ |
115 | Table *h = hvalue(t); | 113 | Table *h = hvalue(t); |
116 | const TValue *res = luaH_get(h, key); /* do a primitive get */ | 114 | const TValue *res = luaH_get(h, key); /* do a primitive get */ |
117 | if (!ttisnil(res) || /* result is not nil? */ | 115 | if (!ttisnil(res) || /* result is no nil? */ |
118 | (tm = fasttm(L, h->metatable, TM_INDEX)) == NULL) { /* or no TM? */ | 116 | (tm = fasttm(L, h->metatable, TM_INDEX)) == NULL) { /* or no TM? */ |
119 | setobj2s(L, val, res); | 117 | setobj2s(L, val, res); |
120 | return; | 118 | return; |
@@ -124,10 +122,10 @@ void luaV_gettable (lua_State *L, const TValue *t, TValue *key, StkId val) { | |||
124 | else if (ttisnil(tm = luaT_gettmbyobj(L, t, TM_INDEX))) | 122 | else if (ttisnil(tm = luaT_gettmbyobj(L, t, TM_INDEX))) |
125 | luaG_typeerror(L, t, "index"); | 123 | luaG_typeerror(L, t, "index"); |
126 | if (ttisfunction(tm)) { | 124 | if (ttisfunction(tm)) { |
127 | callTM(L, tm, t, key, val, 1); | 125 | callTMres(L, val, tm, t, key); |
128 | return; | 126 | return; |
129 | } | 127 | } |
130 | t = tm; /* else repeat with 'tm' */ | 128 | t = tm; /* else repeat with `tm' */ |
131 | } | 129 | } |
132 | luaG_runerror(L, "loop in gettable"); | 130 | luaG_runerror(L, "loop in gettable"); |
133 | } | 131 | } |
@@ -139,34 +137,22 @@ void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) { | |||
139 | const TValue *tm; | 137 | const TValue *tm; |
140 | if (ttistable(t)) { /* `t' is a table? */ | 138 | if (ttistable(t)) { /* `t' is a table? */ |
141 | Table *h = hvalue(t); | 139 | Table *h = hvalue(t); |
142 | TValue *oldval = cast(TValue *, luaH_get(h, key)); | 140 | TValue *oldval = luaH_set(L, h, key); /* do a primitive set */ |
143 | /* if previous value is not nil, there must be a previous entry | 141 | if (!ttisnil(oldval) || /* result is no nil? */ |
144 | in the table; moreover, a metamethod has no relevance */ | 142 | (tm = fasttm(L, h->metatable, TM_NEWINDEX)) == NULL) { /* or no TM? */ |
145 | if (!ttisnil(oldval) || | 143 | setobj2t(L, oldval, val); |
146 | /* previous value is nil; must check the metamethod */ | 144 | luaC_barriert(L, h, val); |
147 | ((tm = fasttm(L, h->metatable, TM_NEWINDEX)) == NULL && | ||
148 | /* no metamethod; is there a previous entry in the table? */ | ||
149 | (oldval != luaO_nilobject || | ||
150 | /* no previous entry; must create one. (The next test is | ||
151 | always true; we only need the assignment.) */ | ||
152 | (oldval = luaH_newkey(L, h, key), 1)))) { | ||
153 | /* no metamethod and (now) there is an entry with given key */ | ||
154 | setobj2t(L, oldval, val); /* assign new value to that entry */ | ||
155 | invalidateTMcache(h); | ||
156 | luaC_barrierback(L, obj2gco(h), val); | ||
157 | return; | 145 | return; |
158 | } | 146 | } |
159 | /* else will try the metamethod */ | 147 | /* else will try the tag method */ |
160 | } | 148 | } |
161 | else /* not a table; check metamethod */ | 149 | else if (ttisnil(tm = luaT_gettmbyobj(L, t, TM_NEWINDEX))) |
162 | if (ttisnil(tm = luaT_gettmbyobj(L, t, TM_NEWINDEX))) | 150 | luaG_typeerror(L, t, "index"); |
163 | luaG_typeerror(L, t, "index"); | ||
164 | /* there is a metamethod */ | ||
165 | if (ttisfunction(tm)) { | 151 | if (ttisfunction(tm)) { |
166 | callTM(L, tm, t, key, val, 0); | 152 | callTM(L, tm, t, key, val); |
167 | return; | 153 | return; |
168 | } | 154 | } |
169 | t = tm; /* else repeat with 'tm' */ | 155 | t = tm; /* else repeat with `tm' */ |
170 | } | 156 | } |
171 | luaG_runerror(L, "loop in settable"); | 157 | luaG_runerror(L, "loop in settable"); |
172 | } | 158 | } |
@@ -178,12 +164,12 @@ static int call_binTM (lua_State *L, const TValue *p1, const TValue *p2, | |||
178 | if (ttisnil(tm)) | 164 | if (ttisnil(tm)) |
179 | tm = luaT_gettmbyobj(L, p2, event); /* try second operand */ | 165 | tm = luaT_gettmbyobj(L, p2, event); /* try second operand */ |
180 | if (ttisnil(tm)) return 0; | 166 | if (ttisnil(tm)) return 0; |
181 | callTM(L, tm, p1, p2, res, 1); | 167 | callTMres(L, res, tm, p1, p2); |
182 | return 1; | 168 | return 1; |
183 | } | 169 | } |
184 | 170 | ||
185 | 171 | ||
186 | static const TValue *get_equalTM (lua_State *L, Table *mt1, Table *mt2, | 172 | static const TValue *get_compTM (lua_State *L, Table *mt1, Table *mt2, |
187 | TMS event) { | 173 | TMS event) { |
188 | const TValue *tm1 = fasttm(L, mt1, event); | 174 | const TValue *tm1 = fasttm(L, mt1, event); |
189 | const TValue *tm2; | 175 | const TValue *tm2; |
@@ -191,7 +177,7 @@ static const TValue *get_equalTM (lua_State *L, Table *mt1, Table *mt2, | |||
191 | if (mt1 == mt2) return tm1; /* same metatables => same metamethods */ | 177 | if (mt1 == mt2) return tm1; /* same metatables => same metamethods */ |
192 | tm2 = fasttm(L, mt2, event); | 178 | tm2 = fasttm(L, mt2, event); |
193 | if (tm2 == NULL) return NULL; /* no metamethod */ | 179 | if (tm2 == NULL) return NULL; /* no metamethod */ |
194 | if (luaV_rawequalobj(tm1, tm2)) /* same metamethods? */ | 180 | if (luaO_rawequalObj(tm1, tm2)) /* same metamethods? */ |
195 | return tm1; | 181 | return tm1; |
196 | return NULL; | 182 | return NULL; |
197 | } | 183 | } |
@@ -199,10 +185,14 @@ static const TValue *get_equalTM (lua_State *L, Table *mt1, Table *mt2, | |||
199 | 185 | ||
200 | static int call_orderTM (lua_State *L, const TValue *p1, const TValue *p2, | 186 | static int call_orderTM (lua_State *L, const TValue *p1, const TValue *p2, |
201 | TMS event) { | 187 | TMS event) { |
202 | if (!call_binTM(L, p1, p2, L->top, event)) | 188 | const TValue *tm1 = luaT_gettmbyobj(L, p1, event); |
203 | return -1; /* no metamethod */ | 189 | const TValue *tm2; |
204 | else | 190 | if (ttisnil(tm1)) return -1; /* no metamethod? */ |
205 | return !l_isfalse(L->top); | 191 | tm2 = luaT_gettmbyobj(L, p2, event); |
192 | if (!luaO_rawequalObj(tm1, tm2)) /* different metamethods? */ | ||
193 | return -1; | ||
194 | callTMres(L, L->top, tm1, p1, p2); | ||
195 | return !l_isfalse(L->top); | ||
206 | } | 196 | } |
207 | 197 | ||
208 | 198 | ||
@@ -230,261 +220,125 @@ static int l_strcmp (const TString *ls, const TString *rs) { | |||
230 | 220 | ||
231 | int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r) { | 221 | int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r) { |
232 | int res; | 222 | int res; |
233 | if (ttisnumber(l) && ttisnumber(r)) | 223 | if (ttype(l) != ttype(r)) |
234 | return luai_numlt(L, nvalue(l), nvalue(r)); | 224 | return luaG_ordererror(L, l, r); |
235 | else if (ttisstring(l) && ttisstring(r)) | 225 | else if (ttisnumber(l)) |
226 | return luai_numlt(nvalue(l), nvalue(r)); | ||
227 | else if (ttisstring(l)) | ||
236 | return l_strcmp(rawtsvalue(l), rawtsvalue(r)) < 0; | 228 | return l_strcmp(rawtsvalue(l), rawtsvalue(r)) < 0; |
237 | else if ((res = call_orderTM(L, l, r, TM_LT)) < 0) | 229 | else if ((res = call_orderTM(L, l, r, TM_LT)) != -1) |
238 | luaG_ordererror(L, l, r); | 230 | return res; |
239 | return res; | 231 | return luaG_ordererror(L, l, r); |
240 | } | 232 | } |
241 | 233 | ||
242 | 234 | ||
243 | int luaV_lessequal (lua_State *L, const TValue *l, const TValue *r) { | 235 | static int lessequal (lua_State *L, const TValue *l, const TValue *r) { |
244 | int res; | 236 | int res; |
245 | if (ttisnumber(l) && ttisnumber(r)) | 237 | if (ttype(l) != ttype(r)) |
246 | return luai_numle(L, nvalue(l), nvalue(r)); | 238 | return luaG_ordererror(L, l, r); |
247 | else if (ttisstring(l) && ttisstring(r)) | 239 | else if (ttisnumber(l)) |
240 | return luai_numle(nvalue(l), nvalue(r)); | ||
241 | else if (ttisstring(l)) | ||
248 | return l_strcmp(rawtsvalue(l), rawtsvalue(r)) <= 0; | 242 | return l_strcmp(rawtsvalue(l), rawtsvalue(r)) <= 0; |
249 | else if ((res = call_orderTM(L, l, r, TM_LE)) >= 0) /* first try `le' */ | 243 | else if ((res = call_orderTM(L, l, r, TM_LE)) != -1) /* first try `le' */ |
250 | return res; | 244 | return res; |
251 | else if ((res = call_orderTM(L, r, l, TM_LT)) < 0) /* else try `lt' */ | 245 | else if ((res = call_orderTM(L, r, l, TM_LT)) != -1) /* else try `lt' */ |
252 | luaG_ordererror(L, l, r); | 246 | return !res; |
253 | return !res; | 247 | return luaG_ordererror(L, l, r); |
254 | } | 248 | } |
255 | 249 | ||
256 | 250 | ||
257 | /* | 251 | int luaV_equalval (lua_State *L, const TValue *t1, const TValue *t2) { |
258 | ** equality of Lua values. L == NULL means raw equality (no metamethods) | ||
259 | */ | ||
260 | int luaV_equalobj_ (lua_State *L, const TValue *t1, const TValue *t2) { | ||
261 | const TValue *tm; | 252 | const TValue *tm; |
262 | lua_assert(ttisequal(t1, t2)); | 253 | lua_assert(ttype(t1) == ttype(t2)); |
263 | switch (ttype(t1)) { | 254 | switch (ttype(t1)) { |
264 | case LUA_TNIL: return 1; | 255 | case LUA_TNIL: return 1; |
265 | case LUA_TNUMBER: return luai_numeq(nvalue(t1), nvalue(t2)); | 256 | case LUA_TNUMBER: return luai_numeq(nvalue(t1), nvalue(t2)); |
266 | case LUA_TBOOLEAN: return bvalue(t1) == bvalue(t2); /* true must be 1 !! */ | 257 | case LUA_TBOOLEAN: return bvalue(t1) == bvalue(t2); /* true must be 1 !! */ |
267 | case LUA_TLIGHTUSERDATA: return pvalue(t1) == pvalue(t2); | 258 | case LUA_TLIGHTUSERDATA: return pvalue(t1) == pvalue(t2); |
268 | case LUA_TLCF: return fvalue(t1) == fvalue(t2); | ||
269 | case LUA_TSHRSTR: return eqshrstr(rawtsvalue(t1), rawtsvalue(t2)); | ||
270 | case LUA_TLNGSTR: return luaS_eqlngstr(rawtsvalue(t1), rawtsvalue(t2)); | ||
271 | case LUA_TUSERDATA: { | 259 | case LUA_TUSERDATA: { |
272 | if (uvalue(t1) == uvalue(t2)) return 1; | 260 | if (uvalue(t1) == uvalue(t2)) return 1; |
273 | else if (L == NULL) return 0; | 261 | tm = get_compTM(L, uvalue(t1)->metatable, uvalue(t2)->metatable, |
274 | tm = get_equalTM(L, uvalue(t1)->metatable, uvalue(t2)->metatable, TM_EQ); | 262 | TM_EQ); |
275 | break; /* will try TM */ | 263 | break; /* will try TM */ |
276 | } | 264 | } |
277 | case LUA_TTABLE: { | 265 | case LUA_TTABLE: { |
278 | if (hvalue(t1) == hvalue(t2)) return 1; | 266 | if (hvalue(t1) == hvalue(t2)) return 1; |
279 | else if (L == NULL) return 0; | 267 | tm = get_compTM(L, hvalue(t1)->metatable, hvalue(t2)->metatable, TM_EQ); |
280 | tm = get_equalTM(L, hvalue(t1)->metatable, hvalue(t2)->metatable, TM_EQ); | ||
281 | break; /* will try TM */ | 268 | break; /* will try TM */ |
282 | } | 269 | } |
283 | default: | 270 | default: return gcvalue(t1) == gcvalue(t2); |
284 | lua_assert(iscollectable(t1)); | ||
285 | return gcvalue(t1) == gcvalue(t2); | ||
286 | } | 271 | } |
287 | if (tm == NULL) return 0; /* no TM? */ | 272 | if (tm == NULL) return 0; /* no TM? */ |
288 | callTM(L, tm, t1, t2, L->top, 1); /* call TM */ | 273 | callTMres(L, L->top, tm, t1, t2); /* call TM */ |
289 | return !l_isfalse(L->top); | 274 | return !l_isfalse(L->top); |
290 | } | 275 | } |
291 | 276 | ||
292 | 277 | ||
293 | void luaV_concat (lua_State *L, int total) { | 278 | void luaV_concat (lua_State *L, int total, int last) { |
294 | lua_assert(total >= 2); | ||
295 | do { | 279 | do { |
296 | StkId top = L->top; | 280 | StkId top = L->base + last + 1; |
297 | int n = 2; /* number of elements handled in this pass (at least 2) */ | 281 | int n = 2; /* number of elements handled in this pass (at least 2) */ |
298 | if (!(ttisstring(top-2) || ttisnumber(top-2)) || !tostring(L, top-1)) { | 282 | if (!(ttisstring(top-2) || ttisnumber(top-2)) || !tostring(L, top-1)) { |
299 | if (!call_binTM(L, top-2, top-1, top-2, TM_CONCAT)) | 283 | if (!call_binTM(L, top-2, top-1, top-2, TM_CONCAT)) |
300 | luaG_concaterror(L, top-2, top-1); | 284 | luaG_concaterror(L, top-2, top-1); |
301 | } | 285 | } else if (tsvalue(top-1)->len == 0) /* second op is empty? */ |
302 | else if (tsvalue(top-1)->len == 0) /* second operand is empty? */ | 286 | (void)tostring(L, top - 2); /* result is first op (as string) */ |
303 | (void)tostring(L, top - 2); /* result is first operand */ | ||
304 | else if (ttisstring(top-2) && tsvalue(top-2)->len == 0) { | ||
305 | setobjs2s(L, top - 2, top - 1); /* result is second op. */ | ||
306 | } | ||
307 | else { | 287 | else { |
308 | /* at least two non-empty string values; get as many as possible */ | 288 | /* at least two string values; get as many as possible */ |
309 | size_t tl = tsvalue(top-1)->len; | 289 | size_t tl = tsvalue(top-1)->len; |
310 | char *buffer; | 290 | char *buffer; |
311 | int i; | 291 | int i; |
312 | /* collect total length */ | 292 | /* collect total length */ |
313 | for (i = 1; i < total && tostring(L, top-i-1); i++) { | 293 | for (n = 1; n < total && tostring(L, top-n-1); n++) { |
314 | size_t l = tsvalue(top-i-1)->len; | 294 | size_t l = tsvalue(top-n-1)->len; |
315 | if (l >= (MAX_SIZET/sizeof(char)) - tl) | 295 | if (l >= MAX_SIZET - tl) luaG_runerror(L, "string length overflow"); |
316 | luaG_runerror(L, "string length overflow"); | ||
317 | tl += l; | 296 | tl += l; |
318 | } | 297 | } |
319 | buffer = luaZ_openspace(L, &G(L)->buff, tl); | 298 | buffer = luaZ_openspace(L, &G(L)->buff, tl); |
320 | tl = 0; | 299 | tl = 0; |
321 | n = i; | 300 | for (i=n; i>0; i--) { /* concat all strings */ |
322 | do { /* concat all strings */ | ||
323 | size_t l = tsvalue(top-i)->len; | 301 | size_t l = tsvalue(top-i)->len; |
324 | memcpy(buffer+tl, svalue(top-i), l * sizeof(char)); | 302 | memcpy(buffer+tl, svalue(top-i), l); |
325 | tl += l; | 303 | tl += l; |
326 | } while (--i > 0); | 304 | } |
327 | setsvalue2s(L, top-n, luaS_newlstr(L, buffer, tl)); | 305 | setsvalue2s(L, top-n, luaS_newlstr(L, buffer, tl)); |
328 | } | 306 | } |
329 | total -= n-1; /* got 'n' strings to create 1 new */ | 307 | total -= n-1; /* got `n' strings to create 1 new */ |
330 | L->top -= n-1; /* popped 'n' strings and pushed one */ | 308 | last -= n-1; |
331 | } while (total > 1); /* repeat until only 1 result left */ | 309 | } while (total > 1); /* repeat until only 1 result left */ |
332 | } | 310 | } |
333 | 311 | ||
334 | 312 | ||
335 | void luaV_objlen (lua_State *L, StkId ra, const TValue *rb) { | 313 | static void Arith (lua_State *L, StkId ra, const TValue *rb, |
336 | const TValue *tm; | 314 | const TValue *rc, TMS op) { |
337 | switch (ttypenv(rb)) { | ||
338 | case LUA_TTABLE: { | ||
339 | Table *h = hvalue(rb); | ||
340 | tm = fasttm(L, h->metatable, TM_LEN); | ||
341 | if (tm) break; /* metamethod? break switch to call it */ | ||
342 | setnvalue(ra, cast_num(luaH_getn(h))); /* else primitive len */ | ||
343 | return; | ||
344 | } | ||
345 | case LUA_TSTRING: { | ||
346 | setnvalue(ra, cast_num(tsvalue(rb)->len)); | ||
347 | return; | ||
348 | } | ||
349 | default: { /* try metamethod */ | ||
350 | tm = luaT_gettmbyobj(L, rb, TM_LEN); | ||
351 | if (ttisnil(tm)) /* no metamethod? */ | ||
352 | luaG_typeerror(L, rb, "get length of"); | ||
353 | break; | ||
354 | } | ||
355 | } | ||
356 | callTM(L, tm, rb, rb, ra, 1); | ||
357 | } | ||
358 | |||
359 | |||
360 | void luaV_arith (lua_State *L, StkId ra, const TValue *rb, | ||
361 | const TValue *rc, TMS op) { | ||
362 | TValue tempb, tempc; | 315 | TValue tempb, tempc; |
363 | const TValue *b, *c; | 316 | const TValue *b, *c; |
364 | if ((b = luaV_tonumber(rb, &tempb)) != NULL && | 317 | if ((b = luaV_tonumber(rb, &tempb)) != NULL && |
365 | (c = luaV_tonumber(rc, &tempc)) != NULL) { | 318 | (c = luaV_tonumber(rc, &tempc)) != NULL) { |
366 | lua_Number res = luaO_arith(op - TM_ADD + LUA_OPADD, nvalue(b), nvalue(c)); | 319 | lua_Number nb = nvalue(b), nc = nvalue(c); |
367 | setnvalue(ra, res); | 320 | switch (op) { |
321 | case TM_ADD: setnvalue(ra, luai_numadd(nb, nc)); break; | ||
322 | case TM_SUB: setnvalue(ra, luai_numsub(nb, nc)); break; | ||
323 | case TM_MUL: setnvalue(ra, luai_nummul(nb, nc)); break; | ||
324 | case TM_DIV: setnvalue(ra, luai_numdiv(nb, nc)); break; | ||
325 | case TM_MOD: setnvalue(ra, luai_nummod(nb, nc)); break; | ||
326 | case TM_POW: setnvalue(ra, luai_numpow(nb, nc)); break; | ||
327 | case TM_UNM: setnvalue(ra, luai_numunm(nb)); break; | ||
328 | default: lua_assert(0); break; | ||
329 | } | ||
368 | } | 330 | } |
369 | else if (!call_binTM(L, rb, rc, ra, op)) | 331 | else if (!call_binTM(L, rb, rc, ra, op)) |
370 | luaG_aritherror(L, rb, rc); | 332 | luaG_aritherror(L, rb, rc); |
371 | } | 333 | } |
372 | 334 | ||
373 | 335 | ||
374 | /* | ||
375 | ** check whether cached closure in prototype 'p' may be reused, that is, | ||
376 | ** whether there is a cached closure with the same upvalues needed by | ||
377 | ** new closure to be created. | ||
378 | */ | ||
379 | static Closure *getcached (Proto *p, UpVal **encup, StkId base) { | ||
380 | Closure *c = p->cache; | ||
381 | if (c != NULL) { /* is there a cached closure? */ | ||
382 | int nup = p->sizeupvalues; | ||
383 | Upvaldesc *uv = p->upvalues; | ||
384 | int i; | ||
385 | for (i = 0; i < nup; i++) { /* check whether it has right upvalues */ | ||
386 | TValue *v = uv[i].instack ? base + uv[i].idx : encup[uv[i].idx]->v; | ||
387 | if (c->l.upvals[i]->v != v) | ||
388 | return NULL; /* wrong upvalue; cannot reuse closure */ | ||
389 | } | ||
390 | } | ||
391 | return c; /* return cached closure (or NULL if no cached closure) */ | ||
392 | } | ||
393 | |||
394 | |||
395 | /* | ||
396 | ** create a new Lua closure, push it in the stack, and initialize | ||
397 | ** its upvalues. Note that the call to 'luaC_barrierproto' must come | ||
398 | ** before the assignment to 'p->cache', as the function needs the | ||
399 | ** original value of that field. | ||
400 | */ | ||
401 | static void pushclosure (lua_State *L, Proto *p, UpVal **encup, StkId base, | ||
402 | StkId ra) { | ||
403 | int nup = p->sizeupvalues; | ||
404 | Upvaldesc *uv = p->upvalues; | ||
405 | int i; | ||
406 | Closure *ncl = luaF_newLclosure(L, nup); | ||
407 | ncl->l.p = p; | ||
408 | setclLvalue(L, ra, ncl); /* anchor new closure in stack */ | ||
409 | for (i = 0; i < nup; i++) { /* fill in its upvalues */ | ||
410 | if (uv[i].instack) /* upvalue refers to local variable? */ | ||
411 | ncl->l.upvals[i] = luaF_findupval(L, base + uv[i].idx); | ||
412 | else /* get upvalue from enclosing function */ | ||
413 | ncl->l.upvals[i] = encup[uv[i].idx]; | ||
414 | } | ||
415 | luaC_barrierproto(L, p, ncl); | ||
416 | p->cache = ncl; /* save it on cache for reuse */ | ||
417 | } | ||
418 | |||
419 | |||
420 | /* | ||
421 | ** finish execution of an opcode interrupted by an yield | ||
422 | */ | ||
423 | void luaV_finishOp (lua_State *L) { | ||
424 | CallInfo *ci = L->ci; | ||
425 | StkId base = ci->u.l.base; | ||
426 | Instruction inst = *(ci->u.l.savedpc - 1); /* interrupted instruction */ | ||
427 | OpCode op = GET_OPCODE(inst); | ||
428 | switch (op) { /* finish its execution */ | ||
429 | case OP_ADD: case OP_SUB: case OP_MUL: case OP_DIV: | ||
430 | case OP_MOD: case OP_POW: case OP_UNM: case OP_LEN: | ||
431 | case OP_GETTABUP: case OP_GETTABLE: case OP_SELF: { | ||
432 | setobjs2s(L, base + GETARG_A(inst), --L->top); | ||
433 | break; | ||
434 | } | ||
435 | case OP_LE: case OP_LT: case OP_EQ: { | ||
436 | int res = !l_isfalse(L->top - 1); | ||
437 | L->top--; | ||
438 | /* metamethod should not be called when operand is K */ | ||
439 | lua_assert(!ISK(GETARG_B(inst))); | ||
440 | if (op == OP_LE && /* "<=" using "<" instead? */ | ||
441 | ttisnil(luaT_gettmbyobj(L, base + GETARG_B(inst), TM_LE))) | ||
442 | res = !res; /* invert result */ | ||
443 | lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_JMP); | ||
444 | if (res != GETARG_A(inst)) /* condition failed? */ | ||
445 | ci->u.l.savedpc++; /* skip jump instruction */ | ||
446 | break; | ||
447 | } | ||
448 | case OP_CONCAT: { | ||
449 | StkId top = L->top - 1; /* top when 'call_binTM' was called */ | ||
450 | int b = GETARG_B(inst); /* first element to concatenate */ | ||
451 | int total = cast_int(top - 1 - (base + b)); /* yet to concatenate */ | ||
452 | setobj2s(L, top - 2, top); /* put TM result in proper position */ | ||
453 | if (total > 1) { /* are there elements to concat? */ | ||
454 | L->top = top - 1; /* top is one after last element (at top-2) */ | ||
455 | luaV_concat(L, total); /* concat them (may yield again) */ | ||
456 | } | ||
457 | /* move final result to final position */ | ||
458 | setobj2s(L, ci->u.l.base + GETARG_A(inst), L->top - 1); | ||
459 | L->top = ci->top; /* restore top */ | ||
460 | break; | ||
461 | } | ||
462 | case OP_TFORCALL: { | ||
463 | lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_TFORLOOP); | ||
464 | L->top = ci->top; /* correct top */ | ||
465 | break; | ||
466 | } | ||
467 | case OP_CALL: { | ||
468 | if (GETARG_C(inst) - 1 >= 0) /* nresults >= 0? */ | ||
469 | L->top = ci->top; /* adjust results */ | ||
470 | break; | ||
471 | } | ||
472 | case OP_TAILCALL: case OP_SETTABUP: case OP_SETTABLE: | ||
473 | break; | ||
474 | default: lua_assert(0); | ||
475 | } | ||
476 | } | ||
477 | |||
478 | |||
479 | 336 | ||
480 | /* | 337 | /* |
481 | ** some macros for common tasks in `luaV_execute' | 338 | ** some macros for common tasks in `luaV_execute' |
482 | */ | 339 | */ |
483 | 340 | ||
484 | #if !defined luai_runtimecheck | 341 | #define runtime_check(L, c) { if (!(c)) break; } |
485 | #define luai_runtimecheck(L, c) /* void */ | ||
486 | #endif | ||
487 | |||
488 | 342 | ||
489 | #define RA(i) (base+GETARG_A(i)) | 343 | #define RA(i) (base+GETARG_A(i)) |
490 | /* to be used after possible stack reallocation */ | 344 | /* to be used after possible stack reallocation */ |
@@ -494,27 +348,13 @@ void luaV_finishOp (lua_State *L) { | |||
494 | ISK(GETARG_B(i)) ? k+INDEXK(GETARG_B(i)) : base+GETARG_B(i)) | 348 | ISK(GETARG_B(i)) ? k+INDEXK(GETARG_B(i)) : base+GETARG_B(i)) |
495 | #define RKC(i) check_exp(getCMode(GET_OPCODE(i)) == OpArgK, \ | 349 | #define RKC(i) check_exp(getCMode(GET_OPCODE(i)) == OpArgK, \ |
496 | ISK(GETARG_C(i)) ? k+INDEXK(GETARG_C(i)) : base+GETARG_C(i)) | 350 | ISK(GETARG_C(i)) ? k+INDEXK(GETARG_C(i)) : base+GETARG_C(i)) |
497 | #define KBx(i) \ | 351 | #define KBx(i) check_exp(getBMode(GET_OPCODE(i)) == OpArgK, k+GETARG_Bx(i)) |
498 | (k + (GETARG_Bx(i) != 0 ? GETARG_Bx(i) - 1 : GETARG_Ax(*ci->u.l.savedpc++))) | ||
499 | |||
500 | 352 | ||
501 | /* execute a jump instruction */ | ||
502 | #define dojump(ci,i,e) \ | ||
503 | { int a = GETARG_A(i); \ | ||
504 | if (a > 0) luaF_close(L, ci->u.l.base + a - 1); \ | ||
505 | ci->u.l.savedpc += GETARG_sBx(i) + e; } | ||
506 | 353 | ||
507 | /* for test instructions, execute the jump instruction that follows it */ | 354 | #define dojump(L,pc,i) {(pc) += (i); luai_threadyield(L);} |
508 | #define donextjump(ci) { i = *ci->u.l.savedpc; dojump(ci, i, 1); } | ||
509 | 355 | ||
510 | 356 | ||
511 | #define Protect(x) { {x;}; base = ci->u.l.base; } | 357 | #define Protect(x) { L->savedpc = pc; {x;}; base = L->base; } |
512 | |||
513 | #define checkGC(L,c) \ | ||
514 | Protect( luaC_condGC(L,{L->top = (c); /* limit of live values */ \ | ||
515 | luaC_step(L); \ | ||
516 | L->top = ci->top;}) /* restore top */ \ | ||
517 | luai_threadyield(L); ) | ||
518 | 358 | ||
519 | 359 | ||
520 | #define arith_op(op,tm) { \ | 360 | #define arith_op(op,tm) { \ |
@@ -522,345 +362,401 @@ void luaV_finishOp (lua_State *L) { | |||
522 | TValue *rc = RKC(i); \ | 362 | TValue *rc = RKC(i); \ |
523 | if (ttisnumber(rb) && ttisnumber(rc)) { \ | 363 | if (ttisnumber(rb) && ttisnumber(rc)) { \ |
524 | lua_Number nb = nvalue(rb), nc = nvalue(rc); \ | 364 | lua_Number nb = nvalue(rb), nc = nvalue(rc); \ |
525 | setnvalue(ra, op(L, nb, nc)); \ | 365 | setnvalue(ra, op(nb, nc)); \ |
526 | } \ | 366 | } \ |
527 | else { Protect(luaV_arith(L, ra, rb, rc, tm)); } } | 367 | else \ |
368 | Protect(Arith(L, ra, rb, rc, tm)); \ | ||
369 | } | ||
528 | 370 | ||
529 | 371 | ||
530 | #define vmdispatch(o) switch(o) | ||
531 | #define vmcase(l,b) case l: {b} break; | ||
532 | #define vmcasenb(l,b) case l: {b} /* nb = no break */ | ||
533 | 372 | ||
534 | void luaV_execute (lua_State *L) { | 373 | void luaV_execute (lua_State *L, int nexeccalls) { |
535 | CallInfo *ci = L->ci; | ||
536 | LClosure *cl; | 374 | LClosure *cl; |
537 | TValue *k; | ||
538 | StkId base; | 375 | StkId base; |
539 | newframe: /* reentry point when frame changes (call/return) */ | 376 | TValue *k; |
540 | lua_assert(ci == L->ci); | 377 | const Instruction *pc; |
541 | cl = clLvalue(ci->func); | 378 | reentry: /* entry point */ |
379 | lua_assert(isLua(L->ci)); | ||
380 | pc = L->savedpc; | ||
381 | cl = &clvalue(L->ci->func)->l; | ||
382 | base = L->base; | ||
542 | k = cl->p->k; | 383 | k = cl->p->k; |
543 | base = ci->u.l.base; | ||
544 | /* main loop of interpreter */ | 384 | /* main loop of interpreter */ |
545 | for (;;) { | 385 | for (;;) { |
546 | Instruction i = *(ci->u.l.savedpc++); | 386 | const Instruction i = *pc++; |
547 | StkId ra; | 387 | StkId ra; |
548 | if ((L->hookmask & (LUA_MASKLINE | LUA_MASKCOUNT)) && | 388 | if ((L->hookmask & (LUA_MASKLINE | LUA_MASKCOUNT)) && |
549 | (--L->hookcount == 0 || L->hookmask & LUA_MASKLINE)) { | 389 | (--L->hookcount == 0 || L->hookmask & LUA_MASKLINE)) { |
550 | Protect(traceexec(L)); | 390 | traceexec(L, pc); |
391 | if (L->status == LUA_YIELD) { /* did hook yield? */ | ||
392 | L->savedpc = pc - 1; | ||
393 | return; | ||
394 | } | ||
395 | base = L->base; | ||
551 | } | 396 | } |
552 | /* WARNING: several calls may realloc the stack and invalidate `ra' */ | 397 | /* warning!! several calls may realloc the stack and invalidate `ra' */ |
553 | ra = RA(i); | 398 | ra = RA(i); |
554 | lua_assert(base == ci->u.l.base); | 399 | lua_assert(base == L->base && L->base == L->ci->base); |
555 | lua_assert(base <= L->top && L->top < L->stack + L->stacksize); | 400 | lua_assert(base <= L->top && L->top <= L->stack + L->stacksize); |
556 | vmdispatch (GET_OPCODE(i)) { | 401 | lua_assert(L->top == L->ci->top || luaG_checkopenop(i)); |
557 | vmcase(OP_MOVE, | 402 | switch (GET_OPCODE(i)) { |
403 | case OP_MOVE: { | ||
558 | setobjs2s(L, ra, RB(i)); | 404 | setobjs2s(L, ra, RB(i)); |
559 | ) | 405 | continue; |
560 | vmcase(OP_LOADK, | 406 | } |
561 | TValue *rb = k + GETARG_Bx(i); | 407 | case OP_LOADK: { |
562 | setobj2s(L, ra, rb); | 408 | setobj2s(L, ra, KBx(i)); |
563 | ) | 409 | continue; |
564 | vmcase(OP_LOADKX, | 410 | } |
565 | TValue *rb; | 411 | case OP_LOADBOOL: { |
566 | lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_EXTRAARG); | ||
567 | rb = k + GETARG_Ax(*ci->u.l.savedpc++); | ||
568 | setobj2s(L, ra, rb); | ||
569 | ) | ||
570 | vmcase(OP_LOADBOOL, | ||
571 | setbvalue(ra, GETARG_B(i)); | 412 | setbvalue(ra, GETARG_B(i)); |
572 | if (GETARG_C(i)) ci->u.l.savedpc++; /* skip next instruction (if C) */ | 413 | if (GETARG_C(i)) pc++; /* skip next instruction (if C) */ |
573 | ) | 414 | continue; |
574 | vmcase(OP_LOADNIL, | 415 | } |
575 | int b = GETARG_B(i); | 416 | case OP_LOADNIL: { |
417 | TValue *rb = RB(i); | ||
576 | do { | 418 | do { |
577 | setnilvalue(ra++); | 419 | setnilvalue(rb--); |
578 | } while (b--); | 420 | } while (rb >= ra); |
579 | ) | 421 | continue; |
580 | vmcase(OP_GETUPVAL, | 422 | } |
423 | case OP_GETUPVAL: { | ||
581 | int b = GETARG_B(i); | 424 | int b = GETARG_B(i); |
582 | setobj2s(L, ra, cl->upvals[b]->v); | 425 | setobj2s(L, ra, cl->upvals[b]->v); |
583 | ) | 426 | continue; |
584 | vmcase(OP_GETTABUP, | 427 | } |
585 | int b = GETARG_B(i); | 428 | case OP_GETGLOBAL: { |
586 | Protect(luaV_gettable(L, cl->upvals[b]->v, RKC(i), ra)); | 429 | TValue g; |
587 | ) | 430 | TValue *rb = KBx(i); |
588 | vmcase(OP_GETTABLE, | 431 | sethvalue(L, &g, cl->env); |
432 | lua_assert(ttisstring(rb)); | ||
433 | Protect(luaV_gettable(L, &g, rb, ra)); | ||
434 | continue; | ||
435 | } | ||
436 | case OP_GETTABLE: { | ||
589 | Protect(luaV_gettable(L, RB(i), RKC(i), ra)); | 437 | Protect(luaV_gettable(L, RB(i), RKC(i), ra)); |
590 | ) | 438 | continue; |
591 | vmcase(OP_SETTABUP, | 439 | } |
592 | int a = GETARG_A(i); | 440 | case OP_SETGLOBAL: { |
593 | Protect(luaV_settable(L, cl->upvals[a]->v, RKB(i), RKC(i))); | 441 | TValue g; |
594 | ) | 442 | sethvalue(L, &g, cl->env); |
595 | vmcase(OP_SETUPVAL, | 443 | lua_assert(ttisstring(KBx(i))); |
444 | Protect(luaV_settable(L, &g, KBx(i), ra)); | ||
445 | continue; | ||
446 | } | ||
447 | case OP_SETUPVAL: { | ||
596 | UpVal *uv = cl->upvals[GETARG_B(i)]; | 448 | UpVal *uv = cl->upvals[GETARG_B(i)]; |
597 | setobj(L, uv->v, ra); | 449 | setobj(L, uv->v, ra); |
598 | luaC_barrier(L, uv, ra); | 450 | luaC_barrier(L, uv, ra); |
599 | ) | 451 | continue; |
600 | vmcase(OP_SETTABLE, | 452 | } |
453 | case OP_SETTABLE: { | ||
601 | Protect(luaV_settable(L, ra, RKB(i), RKC(i))); | 454 | Protect(luaV_settable(L, ra, RKB(i), RKC(i))); |
602 | ) | 455 | continue; |
603 | vmcase(OP_NEWTABLE, | 456 | } |
457 | case OP_NEWTABLE: { | ||
604 | int b = GETARG_B(i); | 458 | int b = GETARG_B(i); |
605 | int c = GETARG_C(i); | 459 | int c = GETARG_C(i); |
606 | Table *t = luaH_new(L); | 460 | sethvalue(L, ra, luaH_new(L, luaO_fb2int(b), luaO_fb2int(c))); |
607 | sethvalue(L, ra, t); | 461 | Protect(luaC_checkGC(L)); |
608 | if (b != 0 || c != 0) | 462 | continue; |
609 | luaH_resize(L, t, luaO_fb2int(b), luaO_fb2int(c)); | 463 | } |
610 | checkGC(L, ra + 1); | 464 | case OP_SELF: { |
611 | ) | ||
612 | vmcase(OP_SELF, | ||
613 | StkId rb = RB(i); | 465 | StkId rb = RB(i); |
614 | setobjs2s(L, ra+1, rb); | 466 | setobjs2s(L, ra+1, rb); |
615 | Protect(luaV_gettable(L, rb, RKC(i), ra)); | 467 | Protect(luaV_gettable(L, rb, RKC(i), ra)); |
616 | ) | 468 | continue; |
617 | vmcase(OP_ADD, | 469 | } |
470 | case OP_ADD: { | ||
618 | arith_op(luai_numadd, TM_ADD); | 471 | arith_op(luai_numadd, TM_ADD); |
619 | ) | 472 | continue; |
620 | vmcase(OP_SUB, | 473 | } |
474 | case OP_SUB: { | ||
621 | arith_op(luai_numsub, TM_SUB); | 475 | arith_op(luai_numsub, TM_SUB); |
622 | ) | 476 | continue; |
623 | vmcase(OP_MUL, | 477 | } |
478 | case OP_MUL: { | ||
624 | arith_op(luai_nummul, TM_MUL); | 479 | arith_op(luai_nummul, TM_MUL); |
625 | ) | 480 | continue; |
626 | vmcase(OP_DIV, | 481 | } |
482 | case OP_DIV: { | ||
627 | arith_op(luai_numdiv, TM_DIV); | 483 | arith_op(luai_numdiv, TM_DIV); |
628 | ) | 484 | continue; |
629 | vmcase(OP_MOD, | 485 | } |
486 | case OP_MOD: { | ||
630 | arith_op(luai_nummod, TM_MOD); | 487 | arith_op(luai_nummod, TM_MOD); |
631 | ) | 488 | continue; |
632 | vmcase(OP_POW, | 489 | } |
490 | case OP_POW: { | ||
633 | arith_op(luai_numpow, TM_POW); | 491 | arith_op(luai_numpow, TM_POW); |
634 | ) | 492 | continue; |
635 | vmcase(OP_UNM, | 493 | } |
494 | case OP_UNM: { | ||
636 | TValue *rb = RB(i); | 495 | TValue *rb = RB(i); |
637 | if (ttisnumber(rb)) { | 496 | if (ttisnumber(rb)) { |
638 | lua_Number nb = nvalue(rb); | 497 | lua_Number nb = nvalue(rb); |
639 | setnvalue(ra, luai_numunm(L, nb)); | 498 | setnvalue(ra, luai_numunm(nb)); |
640 | } | 499 | } |
641 | else { | 500 | else { |
642 | Protect(luaV_arith(L, ra, rb, rb, TM_UNM)); | 501 | Protect(Arith(L, ra, rb, rb, TM_UNM)); |
643 | } | 502 | } |
644 | ) | 503 | continue; |
645 | vmcase(OP_NOT, | 504 | } |
646 | TValue *rb = RB(i); | 505 | case OP_NOT: { |
647 | int res = l_isfalse(rb); /* next assignment may change this value */ | 506 | int res = l_isfalse(RB(i)); /* next assignment may change this value */ |
648 | setbvalue(ra, res); | 507 | setbvalue(ra, res); |
649 | ) | 508 | continue; |
650 | vmcase(OP_LEN, | 509 | } |
651 | Protect(luaV_objlen(L, ra, RB(i))); | 510 | case OP_LEN: { |
652 | ) | 511 | const TValue *rb = RB(i); |
653 | vmcase(OP_CONCAT, | 512 | switch (ttype(rb)) { |
513 | case LUA_TTABLE: { | ||
514 | setnvalue(ra, cast_num(luaH_getn(hvalue(rb)))); | ||
515 | break; | ||
516 | } | ||
517 | case LUA_TSTRING: { | ||
518 | setnvalue(ra, cast_num(tsvalue(rb)->len)); | ||
519 | break; | ||
520 | } | ||
521 | default: { /* try metamethod */ | ||
522 | Protect( | ||
523 | if (!call_binTM(L, rb, luaO_nilobject, ra, TM_LEN)) | ||
524 | luaG_typeerror(L, rb, "get length of"); | ||
525 | ) | ||
526 | } | ||
527 | } | ||
528 | continue; | ||
529 | } | ||
530 | case OP_CONCAT: { | ||
654 | int b = GETARG_B(i); | 531 | int b = GETARG_B(i); |
655 | int c = GETARG_C(i); | 532 | int c = GETARG_C(i); |
656 | StkId rb; | 533 | Protect(luaV_concat(L, c-b+1, c); luaC_checkGC(L)); |
657 | L->top = base + c + 1; /* mark the end of concat operands */ | 534 | setobjs2s(L, RA(i), base+b); |
658 | Protect(luaV_concat(L, c - b + 1)); | 535 | continue; |
659 | ra = RA(i); /* 'luav_concat' may invoke TMs and move the stack */ | 536 | } |
660 | rb = b + base; | 537 | case OP_JMP: { |
661 | setobjs2s(L, ra, rb); | 538 | dojump(L, pc, GETARG_sBx(i)); |
662 | checkGC(L, (ra >= rb ? ra + 1 : rb)); | 539 | continue; |
663 | L->top = ci->top; /* restore top */ | 540 | } |
664 | ) | 541 | case OP_EQ: { |
665 | vmcase(OP_JMP, | ||
666 | dojump(ci, i, 0); | ||
667 | ) | ||
668 | vmcase(OP_EQ, | ||
669 | TValue *rb = RKB(i); | 542 | TValue *rb = RKB(i); |
670 | TValue *rc = RKC(i); | 543 | TValue *rc = RKC(i); |
671 | Protect( | 544 | Protect( |
672 | if (cast_int(equalobj(L, rb, rc)) != GETARG_A(i)) | 545 | if (equalobj(L, rb, rc) == GETARG_A(i)) |
673 | ci->u.l.savedpc++; | 546 | dojump(L, pc, GETARG_sBx(*pc)); |
674 | else | ||
675 | donextjump(ci); | ||
676 | ) | 547 | ) |
677 | ) | 548 | pc++; |
678 | vmcase(OP_LT, | 549 | continue; |
550 | } | ||
551 | case OP_LT: { | ||
679 | Protect( | 552 | Protect( |
680 | if (luaV_lessthan(L, RKB(i), RKC(i)) != GETARG_A(i)) | 553 | if (luaV_lessthan(L, RKB(i), RKC(i)) == GETARG_A(i)) |
681 | ci->u.l.savedpc++; | 554 | dojump(L, pc, GETARG_sBx(*pc)); |
682 | else | ||
683 | donextjump(ci); | ||
684 | ) | 555 | ) |
685 | ) | 556 | pc++; |
686 | vmcase(OP_LE, | 557 | continue; |
558 | } | ||
559 | case OP_LE: { | ||
687 | Protect( | 560 | Protect( |
688 | if (luaV_lessequal(L, RKB(i), RKC(i)) != GETARG_A(i)) | 561 | if (lessequal(L, RKB(i), RKC(i)) == GETARG_A(i)) |
689 | ci->u.l.savedpc++; | 562 | dojump(L, pc, GETARG_sBx(*pc)); |
690 | else | ||
691 | donextjump(ci); | ||
692 | ) | 563 | ) |
693 | ) | 564 | pc++; |
694 | vmcase(OP_TEST, | 565 | continue; |
695 | if (GETARG_C(i) ? l_isfalse(ra) : !l_isfalse(ra)) | 566 | } |
696 | ci->u.l.savedpc++; | 567 | case OP_TEST: { |
697 | else | 568 | if (l_isfalse(ra) != GETARG_C(i)) |
698 | donextjump(ci); | 569 | dojump(L, pc, GETARG_sBx(*pc)); |
699 | ) | 570 | pc++; |
700 | vmcase(OP_TESTSET, | 571 | continue; |
572 | } | ||
573 | case OP_TESTSET: { | ||
701 | TValue *rb = RB(i); | 574 | TValue *rb = RB(i); |
702 | if (GETARG_C(i) ? l_isfalse(rb) : !l_isfalse(rb)) | 575 | if (l_isfalse(rb) != GETARG_C(i)) { |
703 | ci->u.l.savedpc++; | ||
704 | else { | ||
705 | setobjs2s(L, ra, rb); | 576 | setobjs2s(L, ra, rb); |
706 | donextjump(ci); | 577 | dojump(L, pc, GETARG_sBx(*pc)); |
707 | } | 578 | } |
708 | ) | 579 | pc++; |
709 | vmcase(OP_CALL, | 580 | continue; |
581 | } | ||
582 | case OP_CALL: { | ||
710 | int b = GETARG_B(i); | 583 | int b = GETARG_B(i); |
711 | int nresults = GETARG_C(i) - 1; | 584 | int nresults = GETARG_C(i) - 1; |
712 | if (b != 0) L->top = ra+b; /* else previous instruction set top */ | 585 | if (b != 0) L->top = ra+b; /* else previous instruction set top */ |
713 | if (luaD_precall(L, ra, nresults)) { /* C function? */ | 586 | L->savedpc = pc; |
714 | if (nresults >= 0) L->top = ci->top; /* adjust results */ | 587 | switch (luaD_precall(L, ra, nresults)) { |
715 | base = ci->u.l.base; | 588 | case PCRLUA: { |
716 | } | 589 | nexeccalls++; |
717 | else { /* Lua function */ | 590 | goto reentry; /* restart luaV_execute over new Lua function */ |
718 | ci = L->ci; | 591 | } |
719 | ci->callstatus |= CIST_REENTRY; | 592 | case PCRC: { |
720 | goto newframe; /* restart luaV_execute over new Lua function */ | 593 | /* it was a C function (`precall' called it); adjust results */ |
594 | if (nresults >= 0) L->top = L->ci->top; | ||
595 | base = L->base; | ||
596 | continue; | ||
597 | } | ||
598 | default: { | ||
599 | return; /* yield */ | ||
600 | } | ||
721 | } | 601 | } |
722 | ) | 602 | } |
723 | vmcase(OP_TAILCALL, | 603 | case OP_TAILCALL: { |
724 | int b = GETARG_B(i); | 604 | int b = GETARG_B(i); |
725 | if (b != 0) L->top = ra+b; /* else previous instruction set top */ | 605 | if (b != 0) L->top = ra+b; /* else previous instruction set top */ |
606 | L->savedpc = pc; | ||
726 | lua_assert(GETARG_C(i) - 1 == LUA_MULTRET); | 607 | lua_assert(GETARG_C(i) - 1 == LUA_MULTRET); |
727 | if (luaD_precall(L, ra, LUA_MULTRET)) /* C function? */ | 608 | switch (luaD_precall(L, ra, LUA_MULTRET)) { |
728 | base = ci->u.l.base; | 609 | case PCRLUA: { |
729 | else { | 610 | /* tail call: put new frame in place of previous one */ |
730 | /* tail call: put called frame (n) in place of caller one (o) */ | 611 | CallInfo *ci = L->ci - 1; /* previous frame */ |
731 | CallInfo *nci = L->ci; /* called frame */ | 612 | int aux; |
732 | CallInfo *oci = nci->previous; /* caller frame */ | 613 | StkId func = ci->func; |
733 | StkId nfunc = nci->func; /* called function */ | 614 | StkId pfunc = (ci+1)->func; /* previous function index */ |
734 | StkId ofunc = oci->func; /* caller function */ | 615 | if (L->openupval) luaF_close(L, ci->base); |
735 | /* last stack slot filled by 'precall' */ | 616 | L->base = ci->base = ci->func + ((ci+1)->base - pfunc); |
736 | StkId lim = nci->u.l.base + getproto(nfunc)->numparams; | 617 | for (aux = 0; pfunc+aux < L->top; aux++) /* move frame down */ |
737 | int aux; | 618 | setobjs2s(L, func+aux, pfunc+aux); |
738 | /* close all upvalues from previous call */ | 619 | ci->top = L->top = func+aux; /* correct top */ |
739 | if (cl->p->sizep > 0) luaF_close(L, oci->u.l.base); | 620 | lua_assert(L->top == L->base + clvalue(func)->l.p->maxstacksize); |
740 | /* move new frame into old one */ | 621 | ci->savedpc = L->savedpc; |
741 | for (aux = 0; nfunc + aux < lim; aux++) | 622 | ci->tailcalls++; /* one more call lost */ |
742 | setobjs2s(L, ofunc + aux, nfunc + aux); | 623 | L->ci--; /* remove new frame */ |
743 | oci->u.l.base = ofunc + (nci->u.l.base - nfunc); /* correct base */ | 624 | goto reentry; |
744 | oci->top = L->top = ofunc + (L->top - nfunc); /* correct top */ | 625 | } |
745 | oci->u.l.savedpc = nci->u.l.savedpc; | 626 | case PCRC: { /* it was a C function (`precall' called it) */ |
746 | oci->callstatus |= CIST_TAIL; /* function was tail called */ | 627 | base = L->base; |
747 | ci = L->ci = oci; /* remove new frame */ | 628 | continue; |
748 | lua_assert(L->top == oci->u.l.base + getproto(ofunc)->maxstacksize); | 629 | } |
749 | goto newframe; /* restart luaV_execute over new Lua function */ | 630 | default: { |
631 | return; /* yield */ | ||
632 | } | ||
750 | } | 633 | } |
751 | ) | 634 | } |
752 | vmcasenb(OP_RETURN, | 635 | case OP_RETURN: { |
753 | int b = GETARG_B(i); | 636 | int b = GETARG_B(i); |
754 | if (b != 0) L->top = ra+b-1; | 637 | if (b != 0) L->top = ra+b-1; |
755 | if (cl->p->sizep > 0) luaF_close(L, base); | 638 | if (L->openupval) luaF_close(L, base); |
639 | L->savedpc = pc; | ||
756 | b = luaD_poscall(L, ra); | 640 | b = luaD_poscall(L, ra); |
757 | if (!(ci->callstatus & CIST_REENTRY)) /* 'ci' still the called one */ | 641 | if (--nexeccalls == 0) /* was previous function running `here'? */ |
758 | return; /* external invocation: return */ | 642 | return; /* no: return */ |
759 | else { /* invocation via reentry: continue execution */ | 643 | else { /* yes: continue its execution */ |
760 | ci = L->ci; | 644 | if (b) L->top = L->ci->top; |
761 | if (b) L->top = ci->top; | 645 | lua_assert(isLua(L->ci)); |
762 | lua_assert(isLua(ci)); | 646 | lua_assert(GET_OPCODE(*((L->ci)->savedpc - 1)) == OP_CALL); |
763 | lua_assert(GET_OPCODE(*((ci)->u.l.savedpc - 1)) == OP_CALL); | 647 | goto reentry; |
764 | goto newframe; /* restart luaV_execute over new Lua function */ | ||
765 | } | 648 | } |
766 | ) | 649 | } |
767 | vmcase(OP_FORLOOP, | 650 | case OP_FORLOOP: { |
768 | lua_Number step = nvalue(ra+2); | 651 | lua_Number step = nvalue(ra+2); |
769 | lua_Number idx = luai_numadd(L, nvalue(ra), step); /* increment index */ | 652 | lua_Number idx = luai_numadd(nvalue(ra), step); /* increment index */ |
770 | lua_Number limit = nvalue(ra+1); | 653 | lua_Number limit = nvalue(ra+1); |
771 | if (luai_numlt(L, 0, step) ? luai_numle(L, idx, limit) | 654 | if (luai_numlt(0, step) ? luai_numle(idx, limit) |
772 | : luai_numle(L, limit, idx)) { | 655 | : luai_numle(limit, idx)) { |
773 | ci->u.l.savedpc += GETARG_sBx(i); /* jump back */ | 656 | dojump(L, pc, GETARG_sBx(i)); /* jump back */ |
774 | setnvalue(ra, idx); /* update internal index... */ | 657 | setnvalue(ra, idx); /* update internal index... */ |
775 | setnvalue(ra+3, idx); /* ...and external index */ | 658 | setnvalue(ra+3, idx); /* ...and external index */ |
776 | } | 659 | } |
777 | ) | 660 | continue; |
778 | vmcase(OP_FORPREP, | 661 | } |
662 | case OP_FORPREP: { | ||
779 | const TValue *init = ra; | 663 | const TValue *init = ra; |
780 | const TValue *plimit = ra+1; | 664 | const TValue *plimit = ra+1; |
781 | const TValue *pstep = ra+2; | 665 | const TValue *pstep = ra+2; |
666 | L->savedpc = pc; /* next steps may throw errors */ | ||
782 | if (!tonumber(init, ra)) | 667 | if (!tonumber(init, ra)) |
783 | luaG_runerror(L, LUA_QL("for") " initial value must be a number"); | 668 | luaG_runerror(L, LUA_QL("for") " initial value must be a number"); |
784 | else if (!tonumber(plimit, ra+1)) | 669 | else if (!tonumber(plimit, ra+1)) |
785 | luaG_runerror(L, LUA_QL("for") " limit must be a number"); | 670 | luaG_runerror(L, LUA_QL("for") " limit must be a number"); |
786 | else if (!tonumber(pstep, ra+2)) | 671 | else if (!tonumber(pstep, ra+2)) |
787 | luaG_runerror(L, LUA_QL("for") " step must be a number"); | 672 | luaG_runerror(L, LUA_QL("for") " step must be a number"); |
788 | setnvalue(ra, luai_numsub(L, nvalue(ra), nvalue(pstep))); | 673 | setnvalue(ra, luai_numsub(nvalue(ra), nvalue(pstep))); |
789 | ci->u.l.savedpc += GETARG_sBx(i); | 674 | dojump(L, pc, GETARG_sBx(i)); |
790 | ) | 675 | continue; |
791 | vmcasenb(OP_TFORCALL, | 676 | } |
677 | case OP_TFORLOOP: { | ||
792 | StkId cb = ra + 3; /* call base */ | 678 | StkId cb = ra + 3; /* call base */ |
793 | setobjs2s(L, cb+2, ra+2); | 679 | setobjs2s(L, cb+2, ra+2); |
794 | setobjs2s(L, cb+1, ra+1); | 680 | setobjs2s(L, cb+1, ra+1); |
795 | setobjs2s(L, cb, ra); | 681 | setobjs2s(L, cb, ra); |
796 | L->top = cb + 3; /* func. + 2 args (state and index) */ | 682 | L->top = cb+3; /* func. + 2 args (state and index) */ |
797 | Protect(luaD_call(L, cb, GETARG_C(i), 1)); | 683 | Protect(luaD_call(L, cb, GETARG_C(i))); |
798 | L->top = ci->top; | 684 | L->top = L->ci->top; |
799 | i = *(ci->u.l.savedpc++); /* go to next instruction */ | 685 | cb = RA(i) + 3; /* previous call may change the stack */ |
800 | ra = RA(i); | 686 | if (!ttisnil(cb)) { /* continue loop? */ |
801 | lua_assert(GET_OPCODE(i) == OP_TFORLOOP); | 687 | setobjs2s(L, cb-1, cb); /* save control variable */ |
802 | goto l_tforloop; | 688 | dojump(L, pc, GETARG_sBx(*pc)); /* jump back */ |
803 | ) | ||
804 | vmcase(OP_TFORLOOP, | ||
805 | l_tforloop: | ||
806 | if (!ttisnil(ra + 1)) { /* continue loop? */ | ||
807 | setobjs2s(L, ra, ra + 1); /* save control variable */ | ||
808 | ci->u.l.savedpc += GETARG_sBx(i); /* jump back */ | ||
809 | } | 689 | } |
810 | ) | 690 | pc++; |
811 | vmcase(OP_SETLIST, | 691 | continue; |
692 | } | ||
693 | case OP_SETLIST: { | ||
812 | int n = GETARG_B(i); | 694 | int n = GETARG_B(i); |
813 | int c = GETARG_C(i); | 695 | int c = GETARG_C(i); |
814 | int last; | 696 | int last; |
815 | Table *h; | 697 | Table *h; |
816 | if (n == 0) n = cast_int(L->top - ra) - 1; | 698 | if (n == 0) { |
817 | if (c == 0) { | 699 | n = cast_int(L->top - ra) - 1; |
818 | lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_EXTRAARG); | 700 | L->top = L->ci->top; |
819 | c = GETARG_Ax(*ci->u.l.savedpc++); | ||
820 | } | 701 | } |
821 | luai_runtimecheck(L, ttistable(ra)); | 702 | if (c == 0) c = cast_int(*pc++); |
703 | runtime_check(L, ttistable(ra)); | ||
822 | h = hvalue(ra); | 704 | h = hvalue(ra); |
823 | last = ((c-1)*LFIELDS_PER_FLUSH) + n; | 705 | last = ((c-1)*LFIELDS_PER_FLUSH) + n; |
824 | if (last > h->sizearray) /* needs more space? */ | 706 | if (last > h->sizearray) /* needs more space? */ |
825 | luaH_resizearray(L, h, last); /* pre-allocate it at once */ | 707 | luaH_resizearray(L, h, last); /* pre-alloc it at once */ |
826 | for (; n > 0; n--) { | 708 | for (; n > 0; n--) { |
827 | TValue *val = ra+n; | 709 | TValue *val = ra+n; |
828 | luaH_setint(L, h, last--, val); | 710 | setobj2t(L, luaH_setnum(L, h, last--), val); |
829 | luaC_barrierback(L, obj2gco(h), val); | 711 | luaC_barriert(L, h, val); |
830 | } | 712 | } |
831 | L->top = ci->top; /* correct top (in case of previous open call) */ | 713 | continue; |
832 | ) | 714 | } |
833 | vmcase(OP_CLOSURE, | 715 | case OP_CLOSE: { |
834 | Proto *p = cl->p->p[GETARG_Bx(i)]; | 716 | luaF_close(L, ra); |
835 | Closure *ncl = getcached(p, cl->upvals, base); /* cached closure */ | 717 | continue; |
836 | if (ncl == NULL) /* no match? */ | 718 | } |
837 | pushclosure(L, p, cl->upvals, base, ra); /* create a new one */ | 719 | case OP_CLOSURE: { |
838 | else | 720 | Proto *p; |
839 | setclLvalue(L, ra, ncl); /* push cashed closure */ | 721 | Closure *ncl; |
840 | checkGC(L, ra + 1); | 722 | int nup, j; |
841 | ) | 723 | p = cl->p->p[GETARG_Bx(i)]; |
842 | vmcase(OP_VARARG, | 724 | nup = p->nups; |
725 | ncl = luaF_newLclosure(L, nup, cl->env); | ||
726 | ncl->l.p = p; | ||
727 | for (j=0; j<nup; j++, pc++) { | ||
728 | if (GET_OPCODE(*pc) == OP_GETUPVAL) | ||
729 | ncl->l.upvals[j] = cl->upvals[GETARG_B(*pc)]; | ||
730 | else { | ||
731 | lua_assert(GET_OPCODE(*pc) == OP_MOVE); | ||
732 | ncl->l.upvals[j] = luaF_findupval(L, base + GETARG_B(*pc)); | ||
733 | } | ||
734 | } | ||
735 | setclvalue(L, ra, ncl); | ||
736 | Protect(luaC_checkGC(L)); | ||
737 | continue; | ||
738 | } | ||
739 | case OP_VARARG: { | ||
843 | int b = GETARG_B(i) - 1; | 740 | int b = GETARG_B(i) - 1; |
844 | int j; | 741 | int j; |
845 | int n = cast_int(base - ci->func) - cl->p->numparams - 1; | 742 | CallInfo *ci = L->ci; |
846 | if (b < 0) { /* B == 0? */ | 743 | int n = cast_int(ci->base - ci->func) - cl->p->numparams - 1; |
847 | b = n; /* get all var. arguments */ | 744 | if (b == LUA_MULTRET) { |
848 | Protect(luaD_checkstack(L, n)); | 745 | Protect(luaD_checkstack(L, n)); |
849 | ra = RA(i); /* previous call may change the stack */ | 746 | ra = RA(i); /* previous call may change the stack */ |
747 | b = n; | ||
850 | L->top = ra + n; | 748 | L->top = ra + n; |
851 | } | 749 | } |
852 | for (j = 0; j < b; j++) { | 750 | for (j = 0; j < b; j++) { |
853 | if (j < n) { | 751 | if (j < n) { |
854 | setobjs2s(L, ra + j, base - n + j); | 752 | setobjs2s(L, ra + j, ci->base - n + j); |
855 | } | 753 | } |
856 | else { | 754 | else { |
857 | setnilvalue(ra + j); | 755 | setnilvalue(ra + j); |
858 | } | 756 | } |
859 | } | 757 | } |
860 | ) | 758 | continue; |
861 | vmcase(OP_EXTRAARG, | 759 | } |
862 | lua_assert(0); | ||
863 | ) | ||
864 | } | 760 | } |
865 | } | 761 | } |
866 | } | 762 | } |