diff options
Diffstat (limited to 'apps/plugins/lua/lmem.h')
-rw-r--r-- | apps/plugins/lua/lmem.h | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/apps/plugins/lua/lmem.h b/apps/plugins/lua/lmem.h index 97a888c7f8..bd4f4e0726 100644 --- a/apps/plugins/lua/lmem.h +++ b/apps/plugins/lua/lmem.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id$ | 2 | ** $Id: lmem.h,v 1.40.1.1 2013/04/12 18:48:47 roberto Exp $ |
3 | ** Interface to Memory Manager | 3 | ** Interface to Memory Manager |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -13,23 +13,30 @@ | |||
13 | #include "llimits.h" | 13 | #include "llimits.h" |
14 | #include "lua.h" | 14 | #include "lua.h" |
15 | 15 | ||
16 | #define MEMERRMSG "not enough memory" | ||
17 | |||
18 | 16 | ||
17 | /* | ||
18 | ** This macro avoids the runtime division MAX_SIZET/(e), as 'e' is | ||
19 | ** always constant. | ||
20 | ** The macro is somewhat complex to avoid warnings: | ||
21 | ** +1 avoids warnings of "comparison has constant result"; | ||
22 | ** cast to 'void' avoids warnings of "value unused". | ||
23 | */ | ||
19 | #define luaM_reallocv(L,b,on,n,e) \ | 24 | #define luaM_reallocv(L,b,on,n,e) \ |
20 | ((cast(size_t, (n)+1) <= MAX_SIZET/(e)) ? /* +1 to avoid warnings */ \ | 25 | (cast(void, \ |
21 | luaM_realloc_(L, (b), (on)*(e), (n)*(e)) : \ | 26 | (cast(size_t, (n)+1) > MAX_SIZET/(e)) ? (luaM_toobig(L), 0) : 0), \ |
22 | luaM_toobig(L)) | 27 | luaM_realloc_(L, (b), (on)*(e), (n)*(e))) |
23 | 28 | ||
24 | #define luaM_freemem(L, b, s) luaM_realloc_(L, (b), (s), 0) | 29 | #define luaM_freemem(L, b, s) luaM_realloc_(L, (b), (s), 0) |
25 | #define luaM_free(L, b) luaM_realloc_(L, (b), sizeof(*(b)), 0) | 30 | #define luaM_free(L, b) luaM_realloc_(L, (b), sizeof(*(b)), 0) |
26 | #define luaM_freearray(L, b, n, t) luaM_reallocv(L, (b), n, 0, sizeof(t)) | 31 | #define luaM_freearray(L, b, n) luaM_reallocv(L, (b), n, 0, sizeof((b)[0])) |
27 | 32 | ||
28 | #define luaM_malloc(L,t) luaM_realloc_(L, NULL, 0, (t)) | 33 | #define luaM_malloc(L,s) luaM_realloc_(L, NULL, 0, (s)) |
29 | #define luaM_new(L,t) cast(t *, luaM_malloc(L, sizeof(t))) | 34 | #define luaM_new(L,t) cast(t *, luaM_malloc(L, sizeof(t))) |
30 | #define luaM_newvector(L,n,t) \ | 35 | #define luaM_newvector(L,n,t) \ |
31 | cast(t *, luaM_reallocv(L, NULL, 0, n, sizeof(t))) | 36 | cast(t *, luaM_reallocv(L, NULL, 0, n, sizeof(t))) |
32 | 37 | ||
38 | #define luaM_newobject(L,tag,s) luaM_realloc_(L, NULL, tag, (s)) | ||
39 | |||
33 | #define luaM_growvector(L,v,nelems,size,t,limit,e) \ | 40 | #define luaM_growvector(L,v,nelems,size,t,limit,e) \ |
34 | if ((nelems)+1 > (size)) \ | 41 | if ((nelems)+1 > (size)) \ |
35 | ((v)=cast(t *, luaM_growaux_(L,v,&(size),sizeof(t),limit,e))) | 42 | ((v)=cast(t *, luaM_growaux_(L,v,&(size),sizeof(t),limit,e))) |
@@ -37,13 +44,14 @@ | |||
37 | #define luaM_reallocvector(L, v,oldn,n,t) \ | 44 | #define luaM_reallocvector(L, v,oldn,n,t) \ |
38 | ((v)=cast(t *, luaM_reallocv(L, v, oldn, n, sizeof(t)))) | 45 | ((v)=cast(t *, luaM_reallocv(L, v, oldn, n, sizeof(t)))) |
39 | 46 | ||
47 | LUAI_FUNC l_noret luaM_toobig (lua_State *L); | ||
40 | 48 | ||
49 | /* not to be called directly */ | ||
41 | LUAI_FUNC void *luaM_realloc_ (lua_State *L, void *block, size_t oldsize, | 50 | LUAI_FUNC void *luaM_realloc_ (lua_State *L, void *block, size_t oldsize, |
42 | size_t size); | 51 | size_t size); |
43 | LUAI_FUNC void *luaM_toobig (lua_State *L); | ||
44 | LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int *size, | 52 | LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int *size, |
45 | size_t size_elem, int limit, | 53 | size_t size_elem, int limit, |
46 | const char *errormsg); | 54 | const char *what); |
47 | 55 | ||
48 | #endif | 56 | #endif |
49 | 57 | ||