diff options
Diffstat (limited to 'src/lj_gc.h')
| -rw-r--r-- | src/lj_gc.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lj_gc.h b/src/lj_gc.h index c85d0756..fa415a21 100644 --- a/src/lj_gc.h +++ b/src/lj_gc.h | |||
| @@ -107,8 +107,8 @@ static LJ_AINLINE void lj_gc_barrierback(global_State *g, GCtab *t) | |||
| 107 | lj_gc_barrierf(G(L), obj2gco(p), obj2gco(o)); } | 107 | lj_gc_barrierf(G(L), obj2gco(p), obj2gco(o)); } |
| 108 | 108 | ||
| 109 | /* Allocator. */ | 109 | /* Allocator. */ |
| 110 | LJ_FUNC void *lj_mem_realloc(lua_State *L, void *p, MSize osz, MSize nsz); | 110 | LJ_FUNC void *lj_mem_realloc(lua_State *L, void *p, GCSize osz, GCSize nsz); |
| 111 | LJ_FUNC void * LJ_FASTCALL lj_mem_newgco(lua_State *L, MSize size); | 111 | LJ_FUNC void * LJ_FASTCALL lj_mem_newgco(lua_State *L, GCSize size); |
| 112 | LJ_FUNC void *lj_mem_grow(lua_State *L, void *p, | 112 | LJ_FUNC void *lj_mem_grow(lua_State *L, void *p, |
| 113 | MSize *szp, MSize lim, MSize esz); | 113 | MSize *szp, MSize lim, MSize esz); |
| 114 | 114 | ||
| @@ -116,13 +116,13 @@ LJ_FUNC void *lj_mem_grow(lua_State *L, void *p, | |||
| 116 | 116 | ||
| 117 | static LJ_AINLINE void lj_mem_free(global_State *g, void *p, size_t osize) | 117 | static LJ_AINLINE void lj_mem_free(global_State *g, void *p, size_t osize) |
| 118 | { | 118 | { |
| 119 | g->gc.total -= (MSize)osize; | 119 | g->gc.total -= (GCSize)osize; |
| 120 | g->allocf(g->allocd, p, osize, 0); | 120 | g->allocf(g->allocd, p, osize, 0); |
| 121 | } | 121 | } |
| 122 | 122 | ||
| 123 | #define lj_mem_newvec(L, n, t) ((t *)lj_mem_new(L, (MSize)((n)*sizeof(t)))) | 123 | #define lj_mem_newvec(L, n, t) ((t *)lj_mem_new(L, (GCSize)((n)*sizeof(t)))) |
| 124 | #define lj_mem_reallocvec(L, p, on, n, t) \ | 124 | #define lj_mem_reallocvec(L, p, on, n, t) \ |
| 125 | ((p) = (t *)lj_mem_realloc(L, p, (on)*sizeof(t), (MSize)((n)*sizeof(t)))) | 125 | ((p) = (t *)lj_mem_realloc(L, p, (on)*sizeof(t), (GCSize)((n)*sizeof(t)))) |
| 126 | #define lj_mem_growvec(L, p, n, m, t) \ | 126 | #define lj_mem_growvec(L, p, n, m, t) \ |
| 127 | ((p) = (t *)lj_mem_grow(L, (p), &(n), (m), (MSize)sizeof(t))) | 127 | ((p) = (t *)lj_mem_grow(L, (p), &(n), (m), (MSize)sizeof(t))) |
| 128 | #define lj_mem_freevec(g, p, n, t) lj_mem_free(g, (p), (n)*sizeof(t)) | 128 | #define lj_mem_freevec(g, p, n, t) lj_mem_free(g, (p), (n)*sizeof(t)) |