From 0183b8030c80f57b87874ff7867ccdb172d9d3dc Mon Sep 17 00:00:00 2001 From: Roberto Ierusalimschy Date: Thu, 28 Dec 2000 10:55:41 -0200 Subject: `free' gets size of the block: complete control over memory use --- lmem.h | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'lmem.h') diff --git a/lmem.h b/lmem.h index c2ee8213..d33473c7 100644 --- a/lmem.h +++ b/lmem.h @@ -1,5 +1,5 @@ /* -** $Id: lmem.h,v 1.17 2000/11/24 17:39:56 roberto Exp roberto $ +** $Id: lmem.h,v 1.18 2000/12/26 18:46:09 roberto Exp roberto $ ** Interface to Memory Manager ** See Copyright Notice in lua.h */ @@ -13,21 +13,29 @@ #include "llimits.h" #include "lua.h" -void *luaM_realloc (lua_State *L, void *oldblock, luint32 size); +void *luaM_realloc (lua_State *L, void *oldblock, luint32 oldsize, + luint32 size); + void *luaM_growaux (lua_State *L, void *block, int *size, int size_elem, int limit, const char *errormsg); -#define luaM_free(L, b) luaM_realloc(L, (b), 0) -#define luaM_malloc(L, t) luaM_realloc(L, NULL, (t)) +#define luaM_free(L, b, s) luaM_realloc(L, (b), (s), 0) +#define luaM_freelem(L, b, t) luaM_realloc(L, (b), sizeof(t), 0) +#define luaM_freearray(L, b, n, t) luaM_realloc(L, (b), \ + ((luint32)(n)*(luint32)sizeof(t)), 0) + +#define luaM_malloc(L, t) luaM_realloc(L, NULL, 0, (t)) #define luaM_new(L, t) ((t *)luaM_malloc(L, sizeof(t))) -#define luaM_newvector(L, n,t) ((t *)luaM_malloc(L, (n)*(luint32)sizeof(t))) +#define luaM_newvector(L, n,t) ((t *)luaM_malloc(L, \ + (luint32)(n)*(luint32)sizeof(t))) #define luaM_growvector(L,v,nelems,size,t,limit,e) \ if (((nelems)+1) > (size)) \ ((v)=(t *)luaM_growaux(L,v,&(size),sizeof(t),limit,e)) -#define luaM_reallocvector(L, v,n,t) \ - ((v)=(t *)luaM_realloc(L, v,(n)*(luint32)sizeof(t))) +#define luaM_reallocvector(L, v,oldn,n,t) \ + ((v)=(t *)luaM_realloc(L, v,(luint32)(oldn)*(luint32)sizeof(t), \ + (luint32)(n)*(luint32)sizeof(t))) #ifdef LUA_DEBUG -- cgit v1.2.3-55-g6feb