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: Treat function ctypes like pointers in comparisons.

Browse Source
This commit is contained in:
Mike Pall 2011-07-23 16:29:47 +02:00
parent b261d0ec04
commit d001d7b7ce
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lj_carith.c
View File

@ -35,11 +35,16 @@ static int carith_checkarg(lua_State *L, CTState *cts, CDArith *ca)
for (i = 0; i < 2; i++, o++) { for (i = 0; i < 2; i++, o++) {
if (tviscdata(o)) { if (tviscdata(o)) {
GCcdata *cd = cdataV(o); GCcdata *cd = cdataV(o);
CType *ct = ctype_raw(cts, (CTypeID)cd->typeid); CTypeID id = (CTypeID)cd->typeid;
CType *ct = ctype_raw(cts, id);
uint8_t *p = (uint8_t *)cdataptr(cd); uint8_t *p = (uint8_t *)cdataptr(cd);
if (ctype_isptr(ct->info)) { if (ctype_isptr(ct->info)) {
p = (uint8_t *)cdata_getptr(p, ct->size); p = (uint8_t *)cdata_getptr(p, ct->size);
if (ctype_isref(ct->info)) ct = ctype_rawchild(cts, ct); if (ctype_isref(ct->info)) ct = ctype_rawchild(cts, ct);
} else if (ctype_isfunc(ct->info)) {
p = (uint8_t *)*(void **)p;
ct = ctype_get(cts,
lj_ctype_intern(cts, CTINFO(CT_PTR, CTALIGN_PTR|id), CTSIZE_PTR));
} }
ca->ct[i] = ct; ca->ct[i] = ct;
ca->p[i] = p; ca->p[i] = p;

4
src/lj_crecord.c
View File

@ -969,6 +969,10 @@ void LJ_FASTCALL recff_cdata_arith(jit_State *J, RecordFFData *rd)
tr = emitir(IRT(IR_FLOAD, t), tr, IRFL_CDATA_INT64); tr = emitir(IRT(IR_FLOAD, t), tr, IRFL_CDATA_INT64);
lj_needsplit(J); lj_needsplit(J);
goto ok; goto ok;
} else if (ctype_isfunc(ct->info)) {
tr = emitir(IRT(IR_FLOAD, IRT_PTR), tr, IRFL_CDATA_PTR);
ct = ctype_get(cts,
lj_ctype_intern(cts, CTINFO(CT_PTR, CTALIGN_PTR|id), CTSIZE_PTR));
} else { } else {
tr = emitir(IRT(IR_ADD, IRT_PTR), tr, lj_ir_kintp(J, sizeof(GCcdata))); tr = emitir(IRT(IR_ADD, IRT_PTR), tr, lj_ir_kintp(J, sizeof(GCcdata)));
} }