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 2015-08-20 01:11:59 +02:00
commit ca7888944e
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lj_trace.c
View File

@ -117,15 +117,22 @@ static void perftools_addtrace(GCtrace *T)
} }
#endif #endif
/* Save current trace by copying and compacting it. */ /* Allocate space for copy of trace. */
static void trace_save(jit_State *J) static GCtrace *trace_save_alloc(jit_State *J)
{ {
size_t sztr = ((sizeof(GCtrace)+7)&~7); size_t sztr = ((sizeof(GCtrace)+7)&~7);
size_t szins = (J->cur.nins-J->cur.nk)*sizeof(IRIns); size_t szins = (J->cur.nins-J->cur.nk)*sizeof(IRIns);
size_t sz = sztr + szins + size_t sz = sztr + szins +
J->cur.nsnap*sizeof(SnapShot) + J->cur.nsnap*sizeof(SnapShot) +
J->cur.nsnapmap*sizeof(SnapEntry); J->cur.nsnapmap*sizeof(SnapEntry);
GCtrace *T = lj_mem_newt(J->L, (MSize)sz, GCtrace); return lj_mem_newt(J->L, (MSize)sz, GCtrace);
}
/* Save current trace by copying and compacting it. */
static void trace_save(jit_State *J, GCtrace *T)
{
size_t sztr = ((sizeof(GCtrace)+7)&~7);
size_t szins = (J->cur.nins-J->cur.nk)*sizeof(IRIns);
char *p = (char *)T + sztr; char *p = (char *)T + sztr;
memcpy(T, &J->cur, sizeof(GCtrace)); memcpy(T, &J->cur, sizeof(GCtrace));
setgcrefr(T->nextgc, J2G(J)->gc.root); setgcrefr(T->nextgc, J2G(J)->gc.root);
@ -418,6 +425,7 @@ static void trace_stop(jit_State *J)
BCOp op = bc_op(J->cur.startins); BCOp op = bc_op(J->cur.startins);
GCproto *pt = &gcref(J->cur.startpt)->pt; GCproto *pt = &gcref(J->cur.startpt)->pt;
TraceNo traceno = J->cur.traceno; TraceNo traceno = J->cur.traceno;
GCtrace *T = trace_save_alloc(J); /* Do this first. May throw OOM. */
lua_State *L; lua_State *L;
switch (op) { switch (op) {
@ -468,7 +476,7 @@ static void trace_stop(jit_State *J)
/* Commit new mcode only after all patching is done. */ /* Commit new mcode only after all patching is done. */
lj_mcode_commit(J, J->cur.mcode); lj_mcode_commit(J, J->cur.mcode);
J->postproc = LJ_POST_NONE; J->postproc = LJ_POST_NONE;
trace_save(J); trace_save(J, T);
L = J->L; L = J->L;
lj_vmevent_send(L, TRACE, lj_vmevent_send(L, TRACE,