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 2013-11-22 05:14:37 +01:00
commit b00a0260dd
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lj_gc.c
View File

@ -673,7 +673,8 @@ int LJ_FASTCALL lj_gc_step(lua_State *L)
lim = (GCSTEPSIZE/100) * g->gc.stepmul; lim = (GCSTEPSIZE/100) * g->gc.stepmul;
if (lim == 0) if (lim == 0)
lim = LJ_MAX_MEM; lim = LJ_MAX_MEM;
g->gc.debt += g->gc.total - g->gc.threshold; if (g->gc.total > g->gc.threshold)
g->gc.debt += g->gc.total - g->gc.threshold;
do { do {
lim -= (MSize)gc_onestep(L); lim -= (MSize)gc_onestep(L);
if (g->gc.state == GCSpause) { if (g->gc.state == GCSpause) {

2
src/lj_trace.c
View File

@ -781,7 +781,7 @@ int LJ_FASTCALL lj_trace_exit(jit_State *J, void *exptr)
/* Just exit to interpreter. */ /* Just exit to interpreter. */
} else if (G(L)->gc.state == GCSatomic || G(L)->gc.state == GCSfinalize) { } else if (G(L)->gc.state == GCSatomic || G(L)->gc.state == GCSfinalize) {
if (!(G(L)->hookmask & HOOK_GC)) if (!(G(L)->hookmask & HOOK_GC))
lj_gc_check(L); /* Exited because of GC: drive GC forward. */ lj_gc_step(L); /* Exited because of GC: drive GC forward. */
} else { } else {
trace_hotside(J, pc); trace_hotside(J, pc);
} }