DrSocalkwe3n/luajit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FFI: Don't touch frame in callbacks with tailcalls to fast functions.

Browse Source
This commit is contained in:
Mike Pall
2012-01-15 17:05:34 +01:00
parent 248cf2ffa9
commit 2f396c6db7
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/lj_ccallback.c
View File

@@ -274,6 +274,7 @@ void lj_ccallback_mcode_free(CTState *cts)
#elif LJ_TARGET_ARM #elif LJ_TARGET_ARM
#define CALLBACK_HANDLE_REGARG \ #define CALLBACK_HANDLE_REGARG \
UNUSED(isfp); \
if (n > 1) ngpr = (ngpr + 1u) & ~1u; /* Align to regpair. */ \ if (n > 1) ngpr = (ngpr + 1u) & ~1u; /* Align to regpair. */ \
if (ngpr + n <= maxgpr) { \ if (ngpr + n <= maxgpr) { \
sp = &cts->cb.gpr[ngpr]; \ sp = &cts->cb.gpr[ngpr]; \
@@ -455,12 +456,14 @@ void LJ_FASTCALL lj_ccallback_leave(CTState *cts, TValue *o)
GCfunc *fn; GCfunc *fn;
TValue *obase = L->base; TValue *obase = L->base;
L->base = L->top; /* Keep continuation frame for throwing errors. */ L->base = L->top; /* Keep continuation frame for throwing errors. */
if (o >= L->base) {
/* PC of RET* is lost. Point to last line for result conv. errors. */ /* PC of RET* is lost. Point to last line for result conv. errors. */
fn = curr_func(L); fn = curr_func(L);
if (isluafunc(fn)) { if (isluafunc(fn)) {
GCproto *pt = funcproto(fn); GCproto *pt = funcproto(fn);
setcframe_pc(L->cframe, proto_bc(pt)+pt->sizebc+1); setcframe_pc(L->cframe, proto_bc(pt)+pt->sizebc+1);
} }
}
callback_conv_result(cts, L, o); callback_conv_result(cts, L, o);
/* Finally drop C frame and continuation frame. */ /* Finally drop C frame and continuation frame. */
L->cframe = cframe_prev(L->cframe); L->cframe = cframe_prev(L->cframe);