DrSocalkwe3n/luajit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall
2025-11-14 20:22:24 +01:00
parent eba91fceb6 af9763a50d
commit 5c8cee3dff
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lj_ffrecord.c
View File

@@ -796,7 +796,7 @@ static TRef recff_string_start(jit_State *J, GCstr *s, int32_t *st, TRef tr,
emitir(IRTGI(IR_EQ), tr, tr0); emitir(IRTGI(IR_EQ), tr, tr0);
tr = tr0; tr = tr0;
} else { } else {
tr = emitir(IRTI(IR_ADD), tr, lj_ir_kint(J, -1)); tr = emitir(IRTGI(IR_ADDOV), tr, lj_ir_kint(J, -1));
emitir(IRTGI(IR_GE), tr, tr0); emitir(IRTGI(IR_GE), tr, tr0);
start--; start--;
} }
@@ -848,7 +848,7 @@ static void LJ_FASTCALL recff_string_range(jit_State *J, RecordFFData *rd)
} else if ((MSize)end <= str->len) { } else if ((MSize)end <= str->len) {
emitir(IRTGI(IR_ULE), trend, trlen); emitir(IRTGI(IR_ULE), trend, trlen);
} else { } else {
emitir(IRTGI(IR_UGT), trend, trlen); emitir(IRTGI(IR_GT), trend, trlen);
end = (int32_t)str->len; end = (int32_t)str->len;
trend = trlen; trend = trlen;
} }
@@ -856,7 +856,7 @@ static void LJ_FASTCALL recff_string_range(jit_State *J, RecordFFData *rd)
if (rd->data) { /* Return string.sub result. */ if (rd->data) { /* Return string.sub result. */
if (end - start >= 0) { if (end - start >= 0) {
/* Also handle empty range here, to avoid extra traces. */ /* Also handle empty range here, to avoid extra traces. */
TRef trptr, trslen = emitir(IRTI(IR_SUB), trend, trstart); TRef trptr, trslen = emitir(IRTGI(IR_SUBOV), trend, trstart);
emitir(IRTGI(IR_GE), trslen, tr0); emitir(IRTGI(IR_GE), trslen, tr0);
trptr = emitir(IRT(IR_STRREF, IRT_PGC), trstr, trstart); trptr = emitir(IRT(IR_STRREF, IRT_PGC), trstr, trstart);
J->base[0] = emitir(IRT(IR_SNEW, IRT_STR), trptr, trslen); J->base[0] = emitir(IRT(IR_SNEW, IRT_STR), trptr, trslen);
@@ -867,7 +867,7 @@ static void LJ_FASTCALL recff_string_range(jit_State *J, RecordFFData *rd)
} else { /* Return string.byte result(s). */ } else { /* Return string.byte result(s). */
ptrdiff_t i, len = end - start; ptrdiff_t i, len = end - start;
if (len > 0) { if (len > 0) {
TRef trslen = emitir(IRTI(IR_SUB), trend, trstart); TRef trslen = emitir(IRTGI(IR_SUBOV), trend, trstart);
emitir(IRTGI(IR_EQ), trslen, lj_ir_kint(J, (int32_t)len)); emitir(IRTGI(IR_EQ), trslen, lj_ir_kint(J, (int32_t)len));
if (J->baseslot + len > LJ_MAX_JSLOTS) if (J->baseslot + len > LJ_MAX_JSLOTS)
lj_trace_err_info(J, LJ_TRERR_STACKOV); lj_trace_err_info(J, LJ_TRERR_STACKOV);