diff options
author | Marcin Bukat <marcin.bukat@gmail.com> | 2014-04-02 20:46:06 +0200 |
---|---|---|
committer | Marcin Bukat <marcin.bukat@gmail.com> | 2014-04-02 20:46:06 +0200 |
commit | bfd0179042b0b02fb88748d54e56e7e208bb117f (patch) | |
tree | 42d5fd51574054caaf673420fca1ec962d62d2f2 /apps/plugins/lua/lfunc.c | |
parent | 36378988ad4059982742f05f5eb50580b456840a (diff) | |
download | rockbox-bfd0179042b0b02fb88748d54e56e7e208bb117f.tar.gz rockbox-bfd0179042b0b02fb88748d54e56e7e208bb117f.zip |
Revert "Update lua plugin to 5.2.3"
FILE typedef to *void needs more work to not break sim and
application builds. I checked only a few random native builds
unfortunately. Sorry for inconvenience.
Diffstat (limited to 'apps/plugins/lua/lfunc.c')
-rw-r--r-- | apps/plugins/lua/lfunc.c | 81 |
1 files changed, 47 insertions, 34 deletions
diff --git a/apps/plugins/lua/lfunc.c b/apps/plugins/lua/lfunc.c index e90e1520ce..813e88f583 100644 --- a/apps/plugins/lua/lfunc.c +++ b/apps/plugins/lua/lfunc.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lfunc.c,v 2.30.1.1 2013/04/12 18:48:47 roberto Exp $ | 2 | ** $Id: lfunc.c,v 2.12.1.2 2007/12/28 14:58:43 roberto Exp $ |
3 | ** Auxiliary functions to manipulate prototypes and closures | 3 | ** Auxiliary functions to manipulate prototypes and closures |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -20,24 +20,30 @@ | |||
20 | 20 | ||
21 | 21 | ||
22 | 22 | ||
23 | Closure *luaF_newCclosure (lua_State *L, int n) { | 23 | Closure *luaF_newCclosure (lua_State *L, int nelems, Table *e) { |
24 | Closure *c = &luaC_newobj(L, LUA_TCCL, sizeCclosure(n), NULL, 0)->cl; | 24 | Closure *c = cast(Closure *, luaM_malloc(L, sizeCclosure(nelems))); |
25 | c->c.nupvalues = cast_byte(n); | 25 | luaC_link(L, obj2gco(c), LUA_TFUNCTION); |
26 | c->c.isC = 1; | ||
27 | c->c.env = e; | ||
28 | c->c.nupvalues = cast_byte(nelems); | ||
26 | return c; | 29 | return c; |
27 | } | 30 | } |
28 | 31 | ||
29 | 32 | ||
30 | Closure *luaF_newLclosure (lua_State *L, int n) { | 33 | Closure *luaF_newLclosure (lua_State *L, int nelems, Table *e) { |
31 | Closure *c = &luaC_newobj(L, LUA_TLCL, sizeLclosure(n), NULL, 0)->cl; | 34 | Closure *c = cast(Closure *, luaM_malloc(L, sizeLclosure(nelems))); |
32 | c->l.p = NULL; | 35 | luaC_link(L, obj2gco(c), LUA_TFUNCTION); |
33 | c->l.nupvalues = cast_byte(n); | 36 | c->l.isC = 0; |
34 | while (n--) c->l.upvals[n] = NULL; | 37 | c->l.env = e; |
38 | c->l.nupvalues = cast_byte(nelems); | ||
39 | while (nelems--) c->l.upvals[nelems] = NULL; | ||
35 | return c; | 40 | return c; |
36 | } | 41 | } |
37 | 42 | ||
38 | 43 | ||
39 | UpVal *luaF_newupval (lua_State *L) { | 44 | UpVal *luaF_newupval (lua_State *L) { |
40 | UpVal *uv = &luaC_newobj(L, LUA_TUPVAL, sizeof(UpVal), NULL, 0)->uv; | 45 | UpVal *uv = luaM_new(L, UpVal); |
46 | luaC_link(L, obj2gco(uv), LUA_TUPVAL); | ||
41 | uv->v = &uv->u.value; | 47 | uv->v = &uv->u.value; |
42 | setnilvalue(uv->v); | 48 | setnilvalue(uv->v); |
43 | return uv; | 49 | return uv; |
@@ -49,20 +55,21 @@ UpVal *luaF_findupval (lua_State *L, StkId level) { | |||
49 | GCObject **pp = &L->openupval; | 55 | GCObject **pp = &L->openupval; |
50 | UpVal *p; | 56 | UpVal *p; |
51 | UpVal *uv; | 57 | UpVal *uv; |
52 | while (*pp != NULL && (p = gco2uv(*pp))->v >= level) { | 58 | while (*pp != NULL && (p = ngcotouv(*pp))->v >= level) { |
53 | GCObject *o = obj2gco(p); | ||
54 | lua_assert(p->v != &p->u.value); | 59 | lua_assert(p->v != &p->u.value); |
55 | lua_assert(!isold(o) || isold(obj2gco(L))); | ||
56 | if (p->v == level) { /* found a corresponding upvalue? */ | 60 | if (p->v == level) { /* found a corresponding upvalue? */ |
57 | if (isdead(g, o)) /* is it dead? */ | 61 | if (isdead(g, obj2gco(p))) /* is it dead? */ |
58 | changewhite(o); /* resurrect it */ | 62 | changewhite(obj2gco(p)); /* ressurect it */ |
59 | return p; | 63 | return p; |
60 | } | 64 | } |
61 | pp = &p->next; | 65 | pp = &p->next; |
62 | } | 66 | } |
63 | /* not found: create a new one */ | 67 | uv = luaM_new(L, UpVal); /* not found: create a new one */ |
64 | uv = &luaC_newobj(L, LUA_TUPVAL, sizeof(UpVal), pp, 0)->uv; | 68 | uv->tt = LUA_TUPVAL; |
69 | uv->marked = luaC_white(g); | ||
65 | uv->v = level; /* current value lives in the stack */ | 70 | uv->v = level; /* current value lives in the stack */ |
71 | uv->next = *pp; /* chain it in the proper position */ | ||
72 | *pp = obj2gco(uv); | ||
66 | uv->u.l.prev = &g->uvhead; /* double link it in `uvhead' list */ | 73 | uv->u.l.prev = &g->uvhead; /* double link it in `uvhead' list */ |
67 | uv->u.l.next = g->uvhead.u.l.next; | 74 | uv->u.l.next = g->uvhead.u.l.next; |
68 | uv->u.l.next->u.l.prev = uv; | 75 | uv->u.l.next->u.l.prev = uv; |
@@ -89,42 +96,41 @@ void luaF_freeupval (lua_State *L, UpVal *uv) { | |||
89 | void luaF_close (lua_State *L, StkId level) { | 96 | void luaF_close (lua_State *L, StkId level) { |
90 | UpVal *uv; | 97 | UpVal *uv; |
91 | global_State *g = G(L); | 98 | global_State *g = G(L); |
92 | while (L->openupval != NULL && (uv = gco2uv(L->openupval))->v >= level) { | 99 | while (L->openupval != NULL && (uv = ngcotouv(L->openupval))->v >= level) { |
93 | GCObject *o = obj2gco(uv); | 100 | GCObject *o = obj2gco(uv); |
94 | lua_assert(!isblack(o) && uv->v != &uv->u.value); | 101 | lua_assert(!isblack(o) && uv->v != &uv->u.value); |
95 | L->openupval = uv->next; /* remove from `open' list */ | 102 | L->openupval = uv->next; /* remove from `open' list */ |
96 | if (isdead(g, o)) | 103 | if (isdead(g, o)) |
97 | luaF_freeupval(L, uv); /* free upvalue */ | 104 | luaF_freeupval(L, uv); /* free upvalue */ |
98 | else { | 105 | else { |
99 | unlinkupval(uv); /* remove upvalue from 'uvhead' list */ | 106 | unlinkupval(uv); |
100 | setobj(L, &uv->u.value, uv->v); /* move value to upvalue slot */ | 107 | setobj(L, &uv->u.value, uv->v); |
101 | uv->v = &uv->u.value; /* now current value lives here */ | 108 | uv->v = &uv->u.value; /* now current value lives here */ |
102 | gch(o)->next = g->allgc; /* link upvalue into 'allgc' list */ | 109 | luaC_linkupval(L, uv); /* link upvalue into `gcroot' list */ |
103 | g->allgc = o; | ||
104 | luaC_checkupvalcolor(g, uv); | ||
105 | } | 110 | } |
106 | } | 111 | } |
107 | } | 112 | } |
108 | 113 | ||
109 | 114 | ||
110 | Proto *luaF_newproto (lua_State *L) { | 115 | Proto *luaF_newproto (lua_State *L) { |
111 | Proto *f = &luaC_newobj(L, LUA_TPROTO, sizeof(Proto), NULL, 0)->p; | 116 | Proto *f = luaM_new(L, Proto); |
117 | luaC_link(L, obj2gco(f), LUA_TPROTO); | ||
112 | f->k = NULL; | 118 | f->k = NULL; |
113 | f->sizek = 0; | 119 | f->sizek = 0; |
114 | f->p = NULL; | 120 | f->p = NULL; |
115 | f->sizep = 0; | 121 | f->sizep = 0; |
116 | f->code = NULL; | 122 | f->code = NULL; |
117 | f->cache = NULL; | ||
118 | f->sizecode = 0; | 123 | f->sizecode = 0; |
119 | f->lineinfo = NULL; | ||
120 | f->sizelineinfo = 0; | 124 | f->sizelineinfo = 0; |
121 | f->upvalues = NULL; | ||
122 | f->sizeupvalues = 0; | 125 | f->sizeupvalues = 0; |
126 | f->nups = 0; | ||
127 | f->upvalues = NULL; | ||
123 | f->numparams = 0; | 128 | f->numparams = 0; |
124 | f->is_vararg = 0; | 129 | f->is_vararg = 0; |
125 | f->maxstacksize = 0; | 130 | f->maxstacksize = 0; |
126 | f->locvars = NULL; | 131 | f->lineinfo = NULL; |
127 | f->sizelocvars = 0; | 132 | f->sizelocvars = 0; |
133 | f->locvars = NULL; | ||
128 | f->linedefined = 0; | 134 | f->linedefined = 0; |
129 | f->lastlinedefined = 0; | 135 | f->lastlinedefined = 0; |
130 | f->source = NULL; | 136 | f->source = NULL; |
@@ -133,16 +139,23 @@ Proto *luaF_newproto (lua_State *L) { | |||
133 | 139 | ||
134 | 140 | ||
135 | void luaF_freeproto (lua_State *L, Proto *f) { | 141 | void luaF_freeproto (lua_State *L, Proto *f) { |
136 | luaM_freearray(L, f->code, f->sizecode); | 142 | luaM_freearray(L, f->code, f->sizecode, Instruction); |
137 | luaM_freearray(L, f->p, f->sizep); | 143 | luaM_freearray(L, f->p, f->sizep, Proto *); |
138 | luaM_freearray(L, f->k, f->sizek); | 144 | luaM_freearray(L, f->k, f->sizek, TValue); |
139 | luaM_freearray(L, f->lineinfo, f->sizelineinfo); | 145 | luaM_freearray(L, f->lineinfo, f->sizelineinfo, int); |
140 | luaM_freearray(L, f->locvars, f->sizelocvars); | 146 | luaM_freearray(L, f->locvars, f->sizelocvars, struct LocVar); |
141 | luaM_freearray(L, f->upvalues, f->sizeupvalues); | 147 | luaM_freearray(L, f->upvalues, f->sizeupvalues, TString *); |
142 | luaM_free(L, f); | 148 | luaM_free(L, f); |
143 | } | 149 | } |
144 | 150 | ||
145 | 151 | ||
152 | void luaF_freeclosure (lua_State *L, Closure *c) { | ||
153 | int size = (c->c.isC) ? sizeCclosure(c->c.nupvalues) : | ||
154 | sizeLclosure(c->l.nupvalues); | ||
155 | luaM_freemem(L, c, size); | ||
156 | } | ||
157 | |||
158 | |||
146 | /* | 159 | /* |
147 | ** Look for n-th local variable at line `line' in function `func'. | 160 | ** Look for n-th local variable at line `line' in function `func'. |
148 | ** Returns NULL if not found. | 161 | ** Returns NULL if not found. |