diff options
author | Mike Pall <mike> | 2019-01-10 12:24:17 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2019-01-10 12:24:17 +0100 |
commit | 749e99ce2a88bf337bd2f6279940d6761ce5f616 (patch) | |
tree | 8d0725b75811ba2120bd45a2f00d1f5c07dc3a78 /src/lj_snap.c | |
parent | e2cc89b19096a3e32b8be8d34e0df8c6e71beec4 (diff) | |
parent | 380e4409a70725df85034f02c968b6ebd7a5e513 (diff) | |
download | luajit-749e99ce2a88bf337bd2f6279940d6761ce5f616.tar.gz luajit-749e99ce2a88bf337bd2f6279940d6761ce5f616.tar.bz2 luajit-749e99ce2a88bf337bd2f6279940d6761ce5f616.zip |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_snap.c')
-rw-r--r-- | src/lj_snap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lj_snap.c b/src/lj_snap.c index 44fa379f..ceaf2ca5 100644 --- a/src/lj_snap.c +++ b/src/lj_snap.c | |||
@@ -161,11 +161,11 @@ static void snapshot_stack(jit_State *J, SnapShot *snap, MSize nsnapmap) | |||
161 | nent = snapshot_slots(J, p, nslots); | 161 | nent = snapshot_slots(J, p, nslots); |
162 | snap->nent = (uint8_t)nent; | 162 | snap->nent = (uint8_t)nent; |
163 | nent += snapshot_framelinks(J, p + nent, &snap->topslot); | 163 | nent += snapshot_framelinks(J, p + nent, &snap->topslot); |
164 | snap->mapofs = (uint16_t)nsnapmap; | 164 | snap->mapofs = (uint32_t)nsnapmap; |
165 | snap->ref = (IRRef1)J->cur.nins; | 165 | snap->ref = (IRRef1)J->cur.nins; |
166 | snap->nslots = (uint8_t)nslots; | 166 | snap->nslots = (uint8_t)nslots; |
167 | snap->count = 0; | 167 | snap->count = 0; |
168 | J->cur.nsnapmap = (uint16_t)(nsnapmap + nent); | 168 | J->cur.nsnapmap = (uint32_t)(nsnapmap + nent); |
169 | } | 169 | } |
170 | 170 | ||
171 | /* Add or merge a snapshot. */ | 171 | /* Add or merge a snapshot. */ |
@@ -326,7 +326,7 @@ void lj_snap_shrink(jit_State *J) | |||
326 | snap->nent = (uint8_t)m; | 326 | snap->nent = (uint8_t)m; |
327 | nlim = J->cur.nsnapmap - snap->mapofs - 1; | 327 | nlim = J->cur.nsnapmap - snap->mapofs - 1; |
328 | while (n <= nlim) map[m++] = map[n++]; /* Move PC + frame links down. */ | 328 | while (n <= nlim) map[m++] = map[n++]; /* Move PC + frame links down. */ |
329 | J->cur.nsnapmap = (uint16_t)(snap->mapofs + m); /* Free up space in map. */ | 329 | J->cur.nsnapmap = (uint32_t)(snap->mapofs + m); /* Free up space in map. */ |
330 | } | 330 | } |
331 | 331 | ||
332 | /* -- Snapshot access ----------------------------------------------------- */ | 332 | /* -- Snapshot access ----------------------------------------------------- */ |