summaryrefslogtreecommitdiff
path: root/src/lj_trace.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lj_trace.c')
-rw-r--r--src/lj_trace.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lj_trace.c b/src/lj_trace.c
index fbd1b45a..2bb2075d 100644
--- a/src/lj_trace.c
+++ b/src/lj_trace.c
@@ -163,10 +163,10 @@ void LJ_FASTCALL lj_trace_free(global_State *g, GCtrace *T)
163/* Re-enable compiling a prototype by unpatching any modified bytecode. */ 163/* Re-enable compiling a prototype by unpatching any modified bytecode. */
164void lj_trace_reenableproto(GCproto *pt) 164void lj_trace_reenableproto(GCproto *pt)
165{ 165{
166 if ((pt->flags & PROTO_HAS_ILOOP)) { 166 if ((pt->flags & PROTO_ILOOP)) {
167 BCIns *bc = proto_bc(pt); 167 BCIns *bc = proto_bc(pt);
168 BCPos i, sizebc = pt->sizebc;; 168 BCPos i, sizebc = pt->sizebc;;
169 pt->flags &= ~PROTO_HAS_ILOOP; 169 pt->flags &= ~PROTO_ILOOP;
170 if (bc_op(bc[0]) == BC_IFUNCF) 170 if (bc_op(bc[0]) == BC_IFUNCF)
171 setbc_op(&bc[0], BC_FUNCF); 171 setbc_op(&bc[0], BC_FUNCF);
172 for (i = 1; i < sizebc; i++) { 172 for (i = 1; i < sizebc; i++) {
@@ -323,7 +323,7 @@ void lj_trace_freestate(global_State *g)
323static void blacklist_pc(GCproto *pt, BCIns *pc) 323static void blacklist_pc(GCproto *pt, BCIns *pc)
324{ 324{
325 setbc_op(pc, (int)bc_op(*pc)+(int)BC_ILOOP-(int)BC_LOOP); 325 setbc_op(pc, (int)bc_op(*pc)+(int)BC_ILOOP-(int)BC_LOOP);
326 pt->flags |= PROTO_HAS_ILOOP; 326 pt->flags |= PROTO_ILOOP;
327} 327}
328 328
329/* Penalize a bytecode instruction. */ 329/* Penalize a bytecode instruction. */
@@ -359,13 +359,13 @@ static void trace_start(jit_State *J)
359 lua_State *L; 359 lua_State *L;
360 TraceNo traceno; 360 TraceNo traceno;
361 361
362 if ((J->pt->flags & PROTO_NO_JIT)) { /* JIT disabled for this proto? */ 362 if ((J->pt->flags & PROTO_NOJIT)) { /* JIT disabled for this proto? */
363 if (J->parent == 0) { 363 if (J->parent == 0) {
364 /* Lazy bytecode patching to disable hotcount events. */ 364 /* Lazy bytecode patching to disable hotcount events. */
365 lua_assert(bc_op(*J->pc) == BC_FORL || bc_op(*J->pc) == BC_ITERL || 365 lua_assert(bc_op(*J->pc) == BC_FORL || bc_op(*J->pc) == BC_ITERL ||
366 bc_op(*J->pc) == BC_LOOP || bc_op(*J->pc) == BC_FUNCF); 366 bc_op(*J->pc) == BC_LOOP || bc_op(*J->pc) == BC_FUNCF);
367 setbc_op(J->pc, (int)bc_op(*J->pc)+(int)BC_ILOOP-(int)BC_LOOP); 367 setbc_op(J->pc, (int)bc_op(*J->pc)+(int)BC_ILOOP-(int)BC_LOOP);
368 J->pt->flags |= PROTO_HAS_ILOOP; 368 J->pt->flags |= PROTO_ILOOP;
369 } 369 }
370 J->state = LJ_TRACE_IDLE; /* Silently ignored. */ 370 J->state = LJ_TRACE_IDLE; /* Silently ignored. */
371 return; 371 return;