gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-08 07:34:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FFI: Simplify copy-by-value. Strip attributes, keep qualifiers.

Browse Source
This commit is contained in:
Mike Pall 2010-12-15 21:47:46 +01:00
parent fbcc925a2d
commit 09ef7ebf56
1 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/lj_cconv.c
View File

@ -373,28 +373,6 @@ copyval: /* Copy value. */
/* -- C type to TValue conversion ----------------------------------------- */ /* -- C type to TValue conversion ----------------------------------------- */
/* Copy value to new cdata. Strip attributes and qualifiers. */
static GCcdata *cconv_copyval(CTState *cts, CTypeID id, void *sp)
{
CType *ct = ctype_raw(cts, id);
CTInfo info = ct->info;
CTSize size = ct->size;
GCcdata *cd;
lua_assert(ctype_isnum(info) || ctype_isenum(info) ||
ctype_isptr(info) || ctype_isvalarray(info));
if (LJ_UNLIKELY((info & CTF_QUAL))) { /* Any qualifiers to strip? */
if (ctype_isarray(info)) {
CType *cct = ctype_child(cts, ct);
id = lj_ctype_intern(cts, (cct->info & ~CTF_QUAL), cct->size);
info = ((info & ~CTMASK_CID) + id);
}
id = lj_ctype_intern(cts, (info & ~CTF_QUAL), size);
}
cd = lj_cdata_new(cts, id, size);
memcpy(cdataptr(cd), sp, size);
return cd;
}
/* Convert C type to TValue. Caveat: expects to get the raw CType! */ /* Convert C type to TValue. Caveat: expects to get the raw CType! */
void lj_cconv_tv_ct(CTState *cts, CType *s, CTypeID sid, void lj_cconv_tv_ct(CTState *cts, CType *s, CTypeID sid,
TValue *o, uint8_t *sp) TValue *o, uint8_t *sp)
@ -423,8 +401,15 @@ void lj_cconv_tv_ct(CTState *cts, CType *s, CTypeID sid,
/* Create reference. */ /* Create reference. */
setcdataV(cts->L, o, lj_cdata_newref(cts, sp, sid)); setcdataV(cts->L, o, lj_cdata_newref(cts, sp, sid));
} else { } else {
GCcdata *cd;
CTSize sz;
copyval: /* Copy value. */ copyval: /* Copy value. */
setcdataV(cts->L, o, cconv_copyval(cts, sid, sp)); sz = s->size;
lua_assert(sz != CTSIZE_INVALID);
/* Attributes are stripped, qualifiers are kept (but mostly ignored). */
cd = lj_cdata_new(cts, ctype_typeid(cts, s), sz);
setcdataV(cts->L, o, cd);
memcpy(cdataptr(cd), sp, sz);
} }
} }