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

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2020-08-09 23:12:48 +02:00
commit 94d4abcca9
12 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lj_debug.c
View File

@ -94,6 +94,7 @@ static BCPos debug_framepc(lua_State *L, GCfunc *fn, cTValue *nextframe)
}
}
ins = cframe_pc(cf);
if (!ins) return NO_BCPOS;
}
}
pt = funcproto(fn);

2
src/lj_dispatch.h
View File

@ -46,7 +46,7 @@ extern double __divdf3(double a, double b);
_(asin) _(acos) _(atan) _(sinh) _(cosh) _(tanh) _(frexp) _(modf) _(atan2) \
_(pow) _(fmod) _(ldexp) _(lj_vm_modi) \
_(lj_dispatch_call) _(lj_dispatch_ins) _(lj_dispatch_stitch) \
_(lj_dispatch_profile) _(lj_err_throw) \
_(lj_dispatch_profile) _(lj_err_throw) _(lj_err_run) \
_(lj_ffh_coroutine_wrap_err) _(lj_func_closeuv) _(lj_func_newL_gc) \
_(lj_gc_barrieruv) _(lj_gc_step) _(lj_gc_step_fixtop) _(lj_meta_arith) \
_(lj_meta_call) _(lj_meta_cat) _(lj_meta_comp) _(lj_meta_equal) \

2
src/lj_err.c
View File

@ -598,7 +598,7 @@ static ptrdiff_t finderrfunc(lua_State *L)
}
/* Runtime error. */
LJ_NOINLINE void lj_err_run(lua_State *L)
LJ_NOINLINE void LJ_FASTCALL lj_err_run(lua_State *L)
{
ptrdiff_t ef = finderrfunc(L);
if (ef) {

2
src/lj_err.h
View File

@ -23,7 +23,7 @@ LJ_DATA const char *lj_err_allmsg;
LJ_FUNC GCstr *lj_err_str(lua_State *L, ErrMsg em);
LJ_FUNCA_NORET void LJ_FASTCALL lj_err_throw(lua_State *L, int errcode);
LJ_FUNC_NORET void lj_err_mem(lua_State *L);
LJ_FUNC_NORET void lj_err_run(lua_State *L);
LJ_FUNCA_NORET void LJ_FASTCALL lj_err_run(lua_State *L);
LJ_FUNC_NORET void lj_err_msg(lua_State *L, ErrMsg em);
LJ_FUNC_NORET void lj_err_lex(lua_State *L, GCstr *src, const char *tok,
BCLine line, ErrMsg em, va_list argp);

4
src/lj_trace.c
View File

@ -789,8 +789,8 @@ typedef struct ExitDataCP {
static TValue *trace_exit_cp(lua_State *L, lua_CFunction dummy, void *ud)
{
ExitDataCP *exd = (ExitDataCP *)ud;
cframe_errfunc(L->cframe) = -1; /* Inherit error function. */
/* Always catch error here. */
/* Always catch error here and don't call error function. */
cframe_errfunc(L->cframe) = 0;
cframe_nres(L->cframe) = -2*LUAI_MAXSTACK*(int)sizeof(TValue);
exd->pc = lj_snap_restore(exd->J, exd->exptr);
UNUSED(dummy);

3
src/vm_arm.dasc
View File

@ -2245,9 +2245,8 @@ static void build_subroutines(BuildCtx *ctx)
| b <2
|
|9: // Rethrow error from the right C frame.
| rsb CARG2, CARG1, #0
| mov CARG1, L
| bl extern lj_err_throw // (lua_State *L, int errcode)
| bl extern lj_err_run // (lua_State *L)
|.endif
|
|//-----------------------------------------------------------------------

3
src/vm_arm64.dasc
View File

@ -2035,9 +2035,8 @@ static void build_subroutines(BuildCtx *ctx)
| b <2
|
|9: // Rethrow error from the right C frame.
| neg CARG2, CARG1
| mov CARG1, L
| bl extern lj_err_throw // (lua_State *L, int errcode)
| bl extern lj_err_run // (lua_State *L)
|.endif
|
|//-----------------------------------------------------------------------

5
src/vm_mips.dasc
View File

@ -2520,9 +2520,8 @@ static void build_subroutines(BuildCtx *ctx)
|. addu RA, RA, BASE
|
|9: // Rethrow error from the right C frame.
| load_got lj_err_throw
| negu CARG2, CRET1
| call_intern lj_err_throw // (lua_State *L, int errcode)
| load_got lj_err_run
| call_intern lj_err_run // (lua_State *L)
|. move CARG1, L
|.endif
|

5
src/vm_mips64.dasc
View File

@ -2622,9 +2622,8 @@ static void build_subroutines(BuildCtx *ctx)
|. daddu RA, RA, BASE
|
|9: // Rethrow error from the right C frame.
| load_got lj_err_throw
| negu CARG2, CRET1
| call_intern lj_err_throw // (lua_State *L, int errcode)
| load_got lj_err_run
| call_intern lj_err_run // (lua_State *L)
|. move CARG1, L
|.endif
|

3
src/vm_ppc.dasc
View File

@ -3090,9 +3090,8 @@ static void build_subroutines(BuildCtx *ctx)
| bctr
|
|9: // Rethrow error from the right C frame.
| neg CARG2, CARG1
| mr CARG1, L
| bl extern lj_err_throw // (lua_State *L, int errcode)
| bl extern lj_err_run // (lua_State *L)
|.endif
|
|//-----------------------------------------------------------------------

4
src/vm_x64.dasc
View File

@ -2509,10 +2509,8 @@ static void build_subroutines(BuildCtx *ctx)
| jmp <2
|
|9: // Rethrow error from the right C frame.
| neg RD
| mov CARG1, L:RB
| mov CARG2, RD
| call extern lj_err_throw // (lua_State *L, int errcode)
| call extern lj_err_run // (lua_State *L)
|.endif
|
|//-----------------------------------------------------------------------

4
src/vm_x86.dasc
View File

@ -2960,10 +2960,8 @@ static void build_subroutines(BuildCtx *ctx)
| jmp <2
|
|9: // Rethrow error from the right C frame.
| neg RD
| mov FCARG1, L:RB
| mov FCARG2, RD
| call extern lj_err_throw@8 // (lua_State *L, int errcode)
| call extern lj_err_run@4 // (lua_State *L)
|.endif
|
|//-----------------------------------------------------------------------