summaryrefslogtreecommitdiff
path: root/src/lj_trace.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lj_trace.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lj_trace.c b/src/lj_trace.c
index 0bd32b1e..0a973d51 100644
--- a/src/lj_trace.c
+++ b/src/lj_trace.c
@@ -361,7 +361,7 @@ static void trace_start(jit_State *J)
361 setstrV(L, L->top++, lj_str_newlit(L, "start")); 361 setstrV(L, L->top++, lj_str_newlit(L, "start"));
362 setintV(L->top++, J->curtrace); 362 setintV(L->top++, J->curtrace);
363 setfuncV(L, L->top++, J->fn); 363 setfuncV(L, L->top++, J->fn);
364 setintV(L->top++, proto_bcpos(J->pt, J->pc) + 1); 364 setintV(L->top++, proto_bcpos(J->pt, J->pc));
365 if (J->parent) { 365 if (J->parent) {
366 setintV(L->top++, J->parent); 366 setintV(L->top++, J->parent);
367 setintV(L->top++, J->exitno); 367 setintV(L->top++, J->exitno);
@@ -444,7 +444,7 @@ static int trace_abort(jit_State *J)
444 setstrV(L, L->top++, lj_str_newlit(L, "abort")); 444 setstrV(L, L->top++, lj_str_newlit(L, "abort"));
445 setintV(L->top++, J->curtrace); 445 setintV(L->top++, J->curtrace);
446 setfuncV(L, L->top++, J->fn); 446 setfuncV(L, L->top++, J->fn);
447 setintV(L->top++, proto_bcpos(J->pt, J->pc) + 1); 447 setintV(L->top++, proto_bcpos(J->pt, J->pc));
448 copyTV(L, L->top++, restorestack(L, errobj)); 448 copyTV(L, L->top++, restorestack(L, errobj));
449 copyTV(L, L->top++, &J->errinfo); 449 copyTV(L, L->top++, &J->errinfo);
450 ); 450 );
@@ -478,7 +478,7 @@ static TValue *trace_state(lua_State *L, lua_CFunction dummy, void *ud)
478 lj_vmevent_send(L, RECORD, 478 lj_vmevent_send(L, RECORD,
479 setintV(L->top++, J->curtrace); 479 setintV(L->top++, J->curtrace);
480 setfuncV(L, L->top++, J->fn); 480 setfuncV(L, L->top++, J->fn);
481 setintV(L->top++, proto_bcpos(J->pt, J->pc) + 1); 481 setintV(L->top++, proto_bcpos(J->pt, J->pc));
482 setintV(L->top++, J->framedepth); 482 setintV(L->top++, J->framedepth);
483 if (bcmode_mm(bc_op(*J->pc)) == MM_call) { 483 if (bcmode_mm(bc_op(*J->pc)) == MM_call) {
484 cTValue *o = &L->base[bc_a(*J->pc)]; 484 cTValue *o = &L->base[bc_a(*J->pc)];
@@ -555,8 +555,6 @@ void LJ_FASTCALL lj_trace_hot(jit_State *J, const BCIns *pc)
555 /* Only start a new trace if not recording or inside __gc call or vmevent. */ 555 /* Only start a new trace if not recording or inside __gc call or vmevent. */
556 if (J->state == LJ_TRACE_IDLE && 556 if (J->state == LJ_TRACE_IDLE &&
557 !(J2G(J)->hookmask & (HOOK_GC|HOOK_VMEVENT))) { 557 !(J2G(J)->hookmask & (HOOK_GC|HOOK_VMEVENT))) {
558 lua_State *L = J->L;
559 L->top = curr_topL(L); /* Only called from Lua and NRESULTS is not used. */
560 J->parent = 0; /* Root trace. */ 558 J->parent = 0; /* Root trace. */
561 J->exitno = 0; 559 J->exitno = 0;
562 J->pc = pc-1; /* The interpreter bytecode PC is offset by 1. */ 560 J->pc = pc-1; /* The interpreter bytecode PC is offset by 1. */