diff options
author | Mike Pall <mike> | 2010-03-22 15:59:50 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2010-03-22 15:59:50 +0100 |
commit | 097db7317b0fad3a63093370593c772eb1cca189 (patch) | |
tree | 7e4a3d5c981aeb023f12211405bb821ce38e4806 /src/lj_gc.h | |
parent | 361266518c1500f25f7d83464ad4b2e2bd81db51 (diff) | |
download | luajit-097db7317b0fad3a63093370593c772eb1cca189.tar.gz luajit-097db7317b0fad3a63093370593c772eb1cca189.tar.bz2 luajit-097db7317b0fad3a63093370593c772eb1cca189.zip |
Move colocated array part after GCtab (now properly aligned).
Diffstat (limited to 'src/lj_gc.h')
-rw-r--r-- | src/lj_gc.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lj_gc.h b/src/lj_gc.h index 3c4f2d24..228835ac 100644 --- a/src/lj_gc.h +++ b/src/lj_gc.h | |||
@@ -91,8 +91,12 @@ LJ_FUNC void *lj_mem_grow(lua_State *L, void *p, | |||
91 | MSize *szp, MSize lim, MSize esz); | 91 | MSize *szp, MSize lim, MSize esz); |
92 | 92 | ||
93 | #define lj_mem_new(L, s) lj_mem_realloc(L, NULL, 0, (s)) | 93 | #define lj_mem_new(L, s) lj_mem_realloc(L, NULL, 0, (s)) |
94 | #define lj_mem_free(g, p, osize) \ | 94 | |
95 | (g->gc.total -= (MSize)(osize), g->allocf(g->allocd, (p), (osize), 0)) | 95 | static LJ_AINLINE void lj_mem_free(global_State *g, void *p, size_t osize) |
96 | { | ||
97 | g->gc.total -= (MSize)osize; | ||
98 | g->allocf(g->allocd, p, osize, 0); | ||
99 | } | ||
96 | 100 | ||
97 | #define lj_mem_newvec(L, n, t) ((t *)lj_mem_new(L, (MSize)((n)*sizeof(t)))) | 101 | #define lj_mem_newvec(L, n, t) ((t *)lj_mem_new(L, (MSize)((n)*sizeof(t)))) |
98 | #define lj_mem_reallocvec(L, p, on, n, t) \ | 102 | #define lj_mem_reallocvec(L, p, on, n, t) \ |