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: Use CNEWI/FLOAD to box/access ffi.new("int", x) (for varargs).

Browse Source
This commit is contained in:
Mike Pall 2012-06-04 15:39:16 +02:00
parent 5bd133d6c8
commit 5032e6d87f
3 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/lj_crecord.c
View File

@ -413,34 +413,32 @@ static TRef crec_ct_tv(jit_State *J, CType *d, TRef dp, TRef sp, cTValue *sval)
sid = CTID_A_CCHAR; sid = CTID_A_CCHAR;
} }
} else { /* NYI: tref_istab(sp), tref_islightud(sp). */ } else { /* NYI: tref_istab(sp), tref_islightud(sp). */
IRType t;
sid = argv2cdata(J, sp, sval)->typeid; sid = argv2cdata(J, sp, sval)->typeid;
s = ctype_raw(cts, sid); s = ctype_raw(cts, sid);
svisnz = cdataptr(cdataV(sval)); svisnz = cdataptr(cdataV(sval));
if (ctype_isptr(s->info)) {
IRType t = (LJ_64 && s->size == 8) ? IRT_P64 : IRT_P32;
sp = emitir(IRT(IR_FLOAD, t), sp, IRFL_CDATA_PTR);
if (ctype_isref(s->info)) { if (ctype_isref(s->info)) {
svisnz = *(void **)svisnz; svisnz = *(void **)svisnz;
s = ctype_rawchild(cts, s); s = ctype_rawchild(cts, s);
} else { sp = emitir(IRT(IR_FLOAD, IRT_PTR), sp, IRFL_CDATA_PTR);
goto doconv; /* The pointer value was loaded, don't load number. */
} }
if (ctype_isenum(s->info)) s = ctype_child(cts, s);
t = crec_ct2irt(s);
if (ctype_isptr(s->info)) {
sp = emitir(IRT(IR_FLOAD, t), sp, IRFL_CDATA_PTR);
goto doconv;
} else if (ctype_isinteger(s->info) && s->size == 8) { } else if (ctype_isinteger(s->info) && s->size == 8) {
IRType t = (s->info & CTF_UNSIGNED) ? IRT_U64 : IRT_I64;
sp = emitir(IRT(IR_FLOAD, t), sp, IRFL_CDATA_INT64); sp = emitir(IRT(IR_FLOAD, t), sp, IRFL_CDATA_INT64);
lj_needsplit(J); lj_needsplit(J);
goto doconv; goto doconv;
} else if (ctype_isinteger(s->info) && s->size == 4) {
sp = emitir(IRT(IR_FLOAD, t), sp, IRFL_CDATA_INT);
goto doconv;
} else { } else {
sp = emitir(IRT(IR_ADD, IRT_PTR), sp, lj_ir_kintp(J, sizeof(GCcdata))); sp = emitir(IRT(IR_ADD, IRT_PTR), sp, lj_ir_kintp(J, sizeof(GCcdata)));
} }
if (ctype_isenum(s->info)) s = ctype_child(cts, s); if (ctype_isnum(s->info) && t != IRT_CDATA)
if (ctype_isnum(s->info)) { /* Load number value. */ sp = emitir(IRT(IR_XLOAD, t), sp, 0); /* Load number value. */
IRType t = crec_ct2irt(s);
if (t != IRT_CDATA) {
sp = emitir(IRT(IR_XLOAD, t), sp, 0);
if (t == IRT_I64 || t == IRT_U64) lj_needsplit(J);
}
}
goto doconv; goto doconv;
} }
s = ctype_get(cts, sid); s = ctype_get(cts, sid);
@ -559,6 +557,8 @@ again:
ctype_isinteger(ctk->info) && (t = crec_ct2irt(ctk)) != IRT_CDATA) { ctype_isinteger(ctk->info) && (t = crec_ct2irt(ctk)) != IRT_CDATA) {
if (ctk->size == 8) { if (ctk->size == 8) {
idx = emitir(IRT(IR_FLOAD, t), idx, IRFL_CDATA_INT64); idx = emitir(IRT(IR_FLOAD, t), idx, IRFL_CDATA_INT64);
} else if (ctk->size == 4) {
idx = emitir(IRT(IR_FLOAD, t), idx, IRFL_CDATA_INT);
} else { } else {
idx = emitir(IRT(IR_ADD, IRT_PTR), idx, idx = emitir(IRT(IR_ADD, IRT_PTR), idx,
lj_ir_kintp(J, sizeof(GCcdata))); lj_ir_kintp(J, sizeof(GCcdata)));
@ -654,10 +654,11 @@ static void crec_alloc(jit_State *J, RecordFFData *rd, CTypeID id)
if (sz == 0 || sz > 64 || (info & CTF_VLA) || ctype_align(info) > CT_MEMALIGN) if (sz == 0 || sz > 64 || (info & CTF_VLA) || ctype_align(info) > CT_MEMALIGN)
lj_trace_err(J, LJ_TRERR_NYICONV); /* NYI: large/special allocations. */ lj_trace_err(J, LJ_TRERR_NYICONV); /* NYI: large/special allocations. */
trid = lj_ir_kint(J, id); trid = lj_ir_kint(J, id);
/* Use special instruction to box pointer or 64 bit integer. */ /* Use special instruction to box pointer or 32/64 bit integer. */
if (ctype_isptr(info) || (ctype_isinteger(info) && sz == 8)) { if (ctype_isptr(info) || (ctype_isinteger(info) && (sz == 4 || sz == 8))) {
TRef sp = J->base[1] ? crec_ct_tv(J, d, 0, J->base[1], &rd->argv[1]) : TRef sp = J->base[1] ? crec_ct_tv(J, d, 0, J->base[1], &rd->argv[1]) :
ctype_isptr(info) ? lj_ir_kptr(J, NULL) : ctype_isptr(info) ? lj_ir_kptr(J, NULL) :
sz == 4 ? lj_ir_kint(J, 0) :
(lj_needsplit(J), lj_ir_kint64(J, 0)); (lj_needsplit(J), lj_ir_kint64(J, 0));
J->base[0] = emitir(IRTG(IR_CNEWI, IRT_CDATA), trid, sp); J->base[0] = emitir(IRTG(IR_CNEWI, IRT_CDATA), trid, sp);
} else { } else {

1
src/lj_ir.h
View File

@ -195,6 +195,7 @@ IRFPMDEF(FPMENUM)
_(UDATA_FILE, sizeof(GCudata)) \ _(UDATA_FILE, sizeof(GCudata)) \
_(CDATA_TYPEID, offsetof(GCcdata, typeid)) \ _(CDATA_TYPEID, offsetof(GCcdata, typeid)) \
_(CDATA_PTR, sizeof(GCcdata)) \ _(CDATA_PTR, sizeof(GCcdata)) \
_(CDATA_INT, sizeof(GCcdata)) \
_(CDATA_INT64, sizeof(GCcdata)) \ _(CDATA_INT64, sizeof(GCcdata)) \
_(CDATA_INT64_4, sizeof(GCcdata) + 4) _(CDATA_INT64_4, sizeof(GCcdata) + 4)

4
src/lj_opt_fold.c
View File

@ -1968,8 +1968,9 @@ LJFOLDF(fload_cdata_typeid_cnew)
return NEXTFOLD; return NEXTFOLD;
} }
/* Pointer and int64 cdata objects are immutable. */ /* Pointer, int and int64 cdata objects are immutable. */
LJFOLD(FLOAD CNEWI IRFL_CDATA_PTR) LJFOLD(FLOAD CNEWI IRFL_CDATA_PTR)
LJFOLD(FLOAD CNEWI IRFL_CDATA_INT)
LJFOLD(FLOAD CNEWI IRFL_CDATA_INT64) LJFOLD(FLOAD CNEWI IRFL_CDATA_INT64)
LJFOLDF(fload_cdata_ptr_int64_cnew) LJFOLDF(fload_cdata_ptr_int64_cnew)
{ {
@ -1981,6 +1982,7 @@ LJFOLDF(fload_cdata_ptr_int64_cnew)
LJFOLD(FLOAD any IRFL_STR_LEN) LJFOLD(FLOAD any IRFL_STR_LEN)
LJFOLD(FLOAD any IRFL_CDATA_TYPEID) LJFOLD(FLOAD any IRFL_CDATA_TYPEID)
LJFOLD(FLOAD any IRFL_CDATA_PTR) LJFOLD(FLOAD any IRFL_CDATA_PTR)
LJFOLD(FLOAD any IRFL_CDATA_INT)
LJFOLD(FLOAD any IRFL_CDATA_INT64) LJFOLD(FLOAD any IRFL_CDATA_INT64)
LJFOLD(VLOAD any any) /* Vararg loads have no corresponding stores. */ LJFOLD(VLOAD any any) /* Vararg loads have no corresponding stores. */
LJFOLDX(lj_opt_cse) LJFOLDX(lj_opt_cse)