diff options
Diffstat (limited to 'src/lj_cdata.h')
-rw-r--r-- | src/lj_cdata.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lj_cdata.h b/src/lj_cdata.h index c1089e64..c3df8ba0 100644 --- a/src/lj_cdata.h +++ b/src/lj_cdata.h | |||
@@ -18,7 +18,7 @@ static LJ_AINLINE void *cdata_getptr(void *p, CTSize sz) | |||
18 | if (LJ_64 && sz == 4) { /* Support 32 bit pointers on 64 bit targets. */ | 18 | if (LJ_64 && sz == 4) { /* Support 32 bit pointers on 64 bit targets. */ |
19 | return ((void *)(uintptr_t)*(uint32_t *)p); | 19 | return ((void *)(uintptr_t)*(uint32_t *)p); |
20 | } else { | 20 | } else { |
21 | lua_assert(sz == CTSIZE_PTR); | 21 | lj_assertX(sz == CTSIZE_PTR, "bad pointer size %d", sz); |
22 | return *(void **)p; | 22 | return *(void **)p; |
23 | } | 23 | } |
24 | } | 24 | } |
@@ -29,7 +29,7 @@ static LJ_AINLINE void cdata_setptr(void *p, CTSize sz, const void *v) | |||
29 | if (LJ_64 && sz == 4) { /* Support 32 bit pointers on 64 bit targets. */ | 29 | if (LJ_64 && sz == 4) { /* Support 32 bit pointers on 64 bit targets. */ |
30 | *(uint32_t *)p = (uint32_t)(uintptr_t)v; | 30 | *(uint32_t *)p = (uint32_t)(uintptr_t)v; |
31 | } else { | 31 | } else { |
32 | lua_assert(sz == CTSIZE_PTR); | 32 | lj_assertX(sz == CTSIZE_PTR, "bad pointer size %d", sz); |
33 | *(void **)p = (void *)v; | 33 | *(void **)p = (void *)v; |
34 | } | 34 | } |
35 | } | 35 | } |
@@ -40,7 +40,8 @@ static LJ_AINLINE GCcdata *lj_cdata_new(CTState *cts, CTypeID id, CTSize sz) | |||
40 | GCcdata *cd; | 40 | GCcdata *cd; |
41 | #ifdef LUA_USE_ASSERT | 41 | #ifdef LUA_USE_ASSERT |
42 | CType *ct = ctype_raw(cts, id); | 42 | CType *ct = ctype_raw(cts, id); |
43 | lua_assert((ctype_hassize(ct->info) ? ct->size : CTSIZE_PTR) == sz); | 43 | lj_assertCTS((ctype_hassize(ct->info) ? ct->size : CTSIZE_PTR) == sz, |
44 | "inconsistent size of fixed-size cdata alloc"); | ||
44 | #endif | 45 | #endif |
45 | cd = (GCcdata *)lj_mem_newgco(cts->L, sizeof(GCcdata) + sz); | 46 | cd = (GCcdata *)lj_mem_newgco(cts->L, sizeof(GCcdata) + sz); |
46 | cd->gct = ~LJ_TCDATA; | 47 | cd->gct = ~LJ_TCDATA; |