aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pall <mike>2024-05-25 16:41:53 +0200
committerMike Pall <mike>2024-05-25 16:41:53 +0200
commitf5587f5eb3a2fcab18afd6b2e073cdb0b56b7d8a (patch)
treed3a0720584e904b0d6ccb7808d95d9163a832e8e
parent80c1c65bced91affaabb34e696eb715cdd583fa1 (diff)
parent4a22050df9e76a28ef904382e4b4c69578973cd5 (diff)
downloadluajit-f5587f5eb3a2fcab18afd6b2e073cdb0b56b7d8a.tar.gz
luajit-f5587f5eb3a2fcab18afd6b2e073cdb0b56b7d8a.tar.bz2
luajit-f5587f5eb3a2fcab18afd6b2e073cdb0b56b7d8a.zip
Merge branch 'master' into v2.1
-rw-r--r--src/lj_snap.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lj_snap.c b/src/lj_snap.c
index f3645e87..6fda08ba 100644
--- a/src/lj_snap.c
+++ b/src/lj_snap.c
@@ -801,7 +801,6 @@ static void snap_restoredata(jit_State *J, GCtrace *T, ExitState *ex,
801 *(lua_Number *)dst = (lua_Number)*(int32_t *)dst; 801 *(lua_Number *)dst = (lua_Number)*(int32_t *)dst;
802 return; 802 return;
803 } 803 }
804 src = (int32_t *)&ex->gpr[r-RID_MIN_GPR];
805#if !LJ_SOFTFP 804#if !LJ_SOFTFP
806 if (r >= RID_MAX_GPR) { 805 if (r >= RID_MAX_GPR) {
807 src = (int32_t *)&ex->fpr[r-RID_MIN_FPR]; 806 src = (int32_t *)&ex->fpr[r-RID_MIN_FPR];
@@ -815,7 +814,10 @@ static void snap_restoredata(jit_State *J, GCtrace *T, ExitState *ex,
815#endif 814#endif
816 } else 815 } else
817#endif 816#endif
818 if (LJ_64 && LJ_BE && sz == 4) src++; 817 {
818 src = (int32_t *)&ex->gpr[r-RID_MIN_GPR];
819 if (LJ_64 && LJ_BE && sz == 4) src++;
820 }
819 } 821 }
820 } 822 }
821 lj_assertJ(sz == 1 || sz == 2 || sz == 4 || sz == 8, 823 lj_assertJ(sz == 1 || sz == 2 || sz == 4 || sz == 8,