gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-08 07:34:07 +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 2014-04-03 21:48:34 +02:00
commit d3e3700180
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lj_snap.c
View File

@ -105,8 +105,6 @@ static BCReg snapshot_framelinks(jit_State *J, SnapEntry *map)
if (frame_islua(frame)) { if (frame_islua(frame)) {
map[f++] = SNAP_MKPC(frame_pc(frame)); map[f++] = SNAP_MKPC(frame_pc(frame));
frame = frame_prevl(frame); frame = frame_prevl(frame);
if (frame + funcproto(frame_func(frame))->framesize > ftop)
ftop = frame + funcproto(frame_func(frame))->framesize;
} else if (frame_iscont(frame)) { } else if (frame_iscont(frame)) {
map[f++] = SNAP_MKFTSZ(frame_ftsz(frame)); map[f++] = SNAP_MKFTSZ(frame_ftsz(frame));
map[f++] = SNAP_MKPC(frame_contpc(frame)); map[f++] = SNAP_MKPC(frame_contpc(frame));
@ -115,7 +113,10 @@ static BCReg snapshot_framelinks(jit_State *J, SnapEntry *map)
lua_assert(!frame_isc(frame)); lua_assert(!frame_isc(frame));
map[f++] = SNAP_MKFTSZ(frame_ftsz(frame)); map[f++] = SNAP_MKFTSZ(frame_ftsz(frame));
frame = frame_prevd(frame); frame = frame_prevd(frame);
continue;
} }
if (frame + funcproto(frame_func(frame))->framesize > ftop)
ftop = frame + funcproto(frame_func(frame))->framesize;
} }
lua_assert(f == (MSize)(1 + J->framedepth)); lua_assert(f == (MSize)(1 + J->framedepth));
return (BCReg)(ftop - lim); return (BCReg)(ftop - lim);