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

FFI: Resolve __call metamethod for pointers, too.

Browse Source
This commit is contained in:
Mike Pall 2011-11-14 12:01:48 +01:00
parent 4d59752217
commit ae79ff4e53
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib_ffi.c
View File

@ -207,7 +207,10 @@ LJLIB_CF(ffi_meta___concat) LJLIB_REC(cdata_arith MM_concat)
static int ffi_call_meta(lua_State *L, CTypeID id) static int ffi_call_meta(lua_State *L, CTypeID id)
{ {
CTState *cts = ctype_cts(L); CTState *cts = ctype_cts(L);
cTValue *tv = lj_ctype_meta(cts, id, MM_call); CType *ct = ctype_raw(cts, id);
cTValue *tv;
if (ctype_isptr(ct->info)) id = ctype_cid(ct->info);
tv = lj_ctype_meta(cts, id, MM_call);
if (!tv) if (!tv)
lj_err_callerv(L, LJ_ERR_FFI_BADCALL, strdata(lj_ctype_repr(L, id, NULL))); lj_err_callerv(L, LJ_ERR_FFI_BADCALL, strdata(lj_ctype_repr(L, id, NULL)));
return lj_meta_tailcall(L, tv); return lj_meta_tailcall(L, tv);

19
src/lj_crecord.c
View File

@ -890,13 +890,30 @@ static int crec_call(jit_State *J, RecordFFData *rd, GCcdata *cd)
return 0; return 0;
} }
/* Record ctype call metamethod. */
static void crec_call_meta(jit_State *J, RecordFFData *rd, CTypeID id)
{
CTState *cts = ctype_ctsG(J2G(J));
CType *ct = ctype_raw(cts, id);
cTValue *tv;
if (ctype_isptr(ct->info)) id = ctype_cid(ct->info);
tv = lj_ctype_meta(cts, id, MM_call);
if (tv && tvisfunc(tv)) {
J->base[-1] = lj_ir_kfunc(J, funcV(tv)) | TREF_FRAME;
rd->nres = -1; /* Pending tailcall. */
} else {
/* NYI: non-function metamethods. */
lj_trace_err(J, LJ_TRERR_BADTYPE);
}
}
void LJ_FASTCALL recff_cdata_call(jit_State *J, RecordFFData *rd) void LJ_FASTCALL recff_cdata_call(jit_State *J, RecordFFData *rd)
{ {
GCcdata *cd = argv2cdata(J, J->base[0], &rd->argv[0]); GCcdata *cd = argv2cdata(J, J->base[0], &rd->argv[0]);
if (cd->typeid == CTID_CTYPEID) if (cd->typeid == CTID_CTYPEID)
crec_alloc(J, rd, crec_constructor(J, cd, J->base[0])); crec_alloc(J, rd, crec_constructor(J, cd, J->base[0]));
else if (!crec_call(J, rd, cd)) else if (!crec_call(J, rd, cd))
lj_trace_err(J, LJ_TRERR_BADTYPE); crec_call_meta(J, rd, cd->typeid);
} }
static TRef crec_arith_int64(jit_State *J, TRef *sp, CType **s, MMS mm) static TRef crec_arith_int64(jit_State *J, TRef *sp, CType **s, MMS mm)