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: Fix address calculation for refs.

Browse Source 
Fixes bug introduced in commit 5032e6d8.
This commit is contained in:
Mike Pall 2012-06-09 00:19:32 +02:00
parent cccf763898
commit e75561b70e
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lj_crecord.c
View File

@ -417,21 +417,23 @@ static TRef crec_ct_tv(jit_State *J, CType *d, TRef dp, TRef sp, cTValue *sval)
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_isref(s->info)) {
svisnz = *(void **)svisnz;
s = ctype_rawchild(cts, s);
sp = emitir(IRT(IR_FLOAD, IRT_PTR), sp, IRFL_CDATA_PTR);
}
if (ctype_isenum(s->info)) s = ctype_child(cts, s); if (ctype_isenum(s->info)) s = ctype_child(cts, s);
t = crec_ct2irt(s); t = crec_ct2irt(s);
if (ctype_isptr(s->info)) { if (ctype_isptr(s->info)) {
sp = emitir(IRT(IR_FLOAD, t), sp, IRFL_CDATA_PTR); sp = emitir(IRT(IR_FLOAD, t), sp, IRFL_CDATA_PTR);
if (ctype_isref(s->info)) {
svisnz = *(void **)svisnz;
s = ctype_rawchild(cts, s);
if (ctype_isenum(s->info)) s = ctype_child(cts, s);
t = crec_ct2irt(s);
} else {
goto doconv; goto doconv;
} else if (ctype_isinteger(s->info) && s->size == 8) { }
} else if (t == IRT_I64 || t == IRT_U64) {
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) { } else if (t == IRT_INT || t == IRT_U32) {
sp = emitir(IRT(IR_FLOAD, t), sp, IRFL_CDATA_INT); sp = emitir(IRT(IR_FLOAD, t), sp, IRFL_CDATA_INT);
goto doconv; goto doconv;
} else { } else {