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: Compile C function calls with 64 bit args/results in 32 bit mode.

Browse Source
This commit is contained in:
Mike Pall 2011-04-29 19:40:50 +02:00
parent eb7b452d53
commit c77ca54564
4 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/ext_ffi_semantics.html
View File

@ -980,8 +980,6 @@ two.</li>
<li>Calls to non-cdecl or vararg C&nbsp;functions.</li> <li>Calls to non-cdecl or vararg C&nbsp;functions.</li>
<li>Calls to C&nbsp;functions with aggregates passed or returned by <li>Calls to C&nbsp;functions with aggregates passed or returned by
value.</li> value.</li>
<li>Calls to C&nbsp;functions with 64 bit arguments or return values
on 32 bit CPUs.</li>
<li>Calls to ctype metamethods which are not plain functions.</li> <li>Calls to ctype metamethods which are not plain functions.</li>
<li>ctype <tt>__newindex</tt> tables and non-string lookups in ctype <li>ctype <tt>__newindex</tt> tables and non-string lookups in ctype
<tt>__index</tt> tables.</li> <tt>__index</tt> tables.</li>

1
src/lj_asm.c
View File

@ -3346,6 +3346,7 @@ static void asm_hiop(ASMState *as, IRIns *ir)
break; break;
} }
case IR_CALLN: case IR_CALLN:
case IR_CALLXS:
ra_destreg(as, ir, RID_RETHI); ra_destreg(as, ir, RID_RETHI);
if (!uselo) if (!uselo)
ra_allocref(as, ir->op1, RID2RSET(RID_RET)); /* Mark call as used. */ ra_allocref(as, ir->op1, RID2RSET(RID_RET)); /* Mark call as used. */

5
src/lj_crecord.c
View File

@ -785,15 +785,16 @@ static int crec_call(jit_State *J, RecordFFData *rd, GCcdata *cd)
#if LJ_TARGET_X86 #if LJ_TARGET_X86
ctype_cconv(ct->info) != CTCC_CDECL || ctype_cconv(ct->info) != CTCC_CDECL ||
#endif #endif
t == IRT_CDATA || (LJ_32 && (t == IRT_I64 || t == IRT_U64))) t == IRT_CDATA)
lj_trace_err(J, LJ_TRERR_NYICALL); lj_trace_err(J, LJ_TRERR_NYICALL);
tr = emitir(IRT(IR_CALLXS, t), crec_call_args(J, rd, cts, ct), func); tr = emitir(IRT(IR_CALLXS, t), crec_call_args(J, rd, cts, ct), func);
if (t == IRT_FLOAT || t == IRT_U32) { if (t == IRT_FLOAT || t == IRT_U32) {
tr = emitconv(tr, IRT_NUM, t, 0); tr = emitconv(tr, IRT_NUM, t, 0);
} else if (t == IRT_PTR || (LJ_64 && t == IRT_P32) || } else if (t == IRT_PTR || (LJ_64 && t == IRT_P32) ||
(LJ_64 && (t == IRT_I64 || t == IRT_U64))) { (t == IRT_I64 || t == IRT_U64)) {
TRef trid = lj_ir_kint(J, ctype_cid(ct->info)); TRef trid = lj_ir_kint(J, ctype_cid(ct->info));
tr = emitir(IRTG(IR_CNEWI, IRT_CDATA), trid, tr); tr = emitir(IRTG(IR_CNEWI, IRT_CDATA), trid, tr);
if (t == IRT_I64 || t == IRT_U64) lj_needsplit(J);
} }
J->base[0] = tr; J->base[0] = tr;
J->needsnap = 1; J->needsnap = 1;

38
src/lj_opt_split.c
View File

@ -256,6 +256,8 @@ static void split_ir(jit_State *J)
} }
break; break;
} }
case IR_CALLXS:
goto split_call;
case IR_PHI: { case IR_PHI: {
IRRef hiref2; IRRef hiref2;
if ((irref_isk(nir->op1) && irref_isk(nir->op2)) || if ((irref_isk(nir->op1) && irref_isk(nir->op2)) ||
@ -285,6 +287,42 @@ static void split_ir(jit_State *J)
nir->op1 = nir->op2 = 0; nir->op1 = nir->op2 = 0;
} }
} }
} else if (ir->o == IR_CALLXS) {
IRRef hiref;
split_call:
hiref = hisubst[ir->op1];
if (hiref) {
IROpT ot = nir->ot;
IRRef op2 = nir->op2;
nir->ot = IRT(IR_CARG, IRT_NIL);
#if LJ_LE
nir->op2 = hiref;
#else
nir->op2 = nir->op1; nir->op1 = hiref;
#endif
ir->prev = nref = split_emit(J, ot, nref, op2);
}
if (irt_isint64(ir->t))
hi = split_emit(J, IRTI(IR_HIOP), nref, nref);
} else if (ir->o == IR_CARG) {
IRRef hiref = hisubst[ir->op1];
if (hiref) {
IRRef op2 = nir->op2;
#if LJ_LE
nir->op2 = hiref;
#else
nir->op2 = nir->op1; nir->op1 = hiref;
#endif
ir->prev = nref = split_emit(J, IRT(IR_CARG, IRT_NIL), nref, op2);
nir = IR(nref);
}
hiref = hisubst[ir->op2];
if (hiref) {
#if LJ_BE
IRRef tmp = nir->op2; nir->op2 = hiref; hiref = tmp;
#endif
ir->prev = split_emit(J, IRT(IR_CARG, IRT_NIL), nref, hiref);
}
} else if (ir->o == IR_CNEWI) { } else if (ir->o == IR_CNEWI) {
if (hisubst[ir->op2]) if (hisubst[ir->op2])
split_emit(J, IRT(IR_HIOP, IRT_NIL), nref, hisubst[ir->op2]); split_emit(J, IRT(IR_HIOP, IRT_NIL), nref, hisubst[ir->op2]);