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

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2015-01-17 14:57:24 +01:00
commit 43cb818ba8
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lj_mcode.c
View File

@ -145,7 +145,7 @@ static void mcode_free(jit_State *J, void *p, size_t sz)
/* -- MCode area protection ----------------------------------------------- */ /* -- MCode area protection ----------------------------------------------- */
/* Define this ONLY if the page protection twiddling becomes a bottleneck. */ /* Define this ONLY if page protection twiddling becomes a bottleneck. */
#ifdef LUAJIT_UNPROTECT_MCODE #ifdef LUAJIT_UNPROTECT_MCODE
/* It's generally considered to be a potential security risk to have /* It's generally considered to be a potential security risk to have
@ -252,7 +252,20 @@ static void *mcode_alloc(jit_State *J, size_t sz)
#else #else
/* All memory addresses are reachable by relative jumps. */ /* All memory addresses are reachable by relative jumps. */
#define mcode_alloc(J, sz) mcode_alloc_at((J), 0, (sz), MCPROT_GEN) static void *mcode_alloc(jit_State *J, size_t sz)
{
#ifdef __OpenBSD__
/* Allow better executable memory allocation for OpenBSD W^X mode. */
void *p = mcode_alloc_at(J, 0, sz, MCPROT_RUN);
if (p && mcode_setprot(p, sz, MCPROT_GEN)) {
mcode_free(J, p, sz);
return NULL;
}
return p;
#else
return mcode_alloc_at(J, 0, sz, MCPROT_GEN);
#endif
}
#endif #endif

2
src/lj_record.c
View File

@ -815,6 +815,8 @@ void lj_record_ret(jit_State *J, BCReg rbase, ptrdiff_t gotresults)
!bc_isret(bc_op(J->cur.startins))) { !bc_isret(bc_op(J->cur.startins))) {
/* Return to lower frame would leave the loop in a root trace. */ /* Return to lower frame would leave the loop in a root trace. */
lj_trace_err(J, LJ_TRERR_LLEAVE); lj_trace_err(J, LJ_TRERR_LLEAVE);
} else if (J->needsnap) { /* Tailcalled to ff with side-effects. */
lj_trace_err(J, LJ_TRERR_NYIRETL); /* No way to insert snapshot here. */
} else { /* Return to lower frame. Guard for the target we return to. */ } else { /* Return to lower frame. Guard for the target we return to. */
TRef trpt = lj_ir_kgc(J, obj2gco(pt), IRT_PROTO); TRef trpt = lj_ir_kgc(J, obj2gco(pt), IRT_PROTO);
TRef trpc = lj_ir_kptr(J, (void *)frame_pc(frame)); TRef trpc = lj_ir_kptr(J, (void *)frame_pc(frame));