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 2022-01-13 17:51:09 +01:00
commit 4ccaf348fb
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lj_opt_fold.c
View File

@ -1958,14 +1958,15 @@ LJFOLDF(abc_fwd)
LJFOLD(ABC any KINT) LJFOLD(ABC any KINT)
LJFOLDF(abc_k) LJFOLDF(abc_k)
{ {
PHIBARRIER(fleft);
if (LJ_LIKELY(J->flags & JIT_F_OPT_ABC)) { if (LJ_LIKELY(J->flags & JIT_F_OPT_ABC)) {
IRRef ref = J->chain[IR_ABC]; IRRef ref = J->chain[IR_ABC];
IRRef asize = fins->op1; IRRef asize = fins->op1;
while (ref > asize) { while (ref > asize) {
IRIns *ir = IR(ref); IRIns *ir = IR(ref);
if (ir->op1 == asize && irref_isk(ir->op2)) { if (ir->op1 == asize && irref_isk(ir->op2)) {
int32_t k = IR(ir->op2)->i; uint32_t k = (uint32_t)IR(ir->op2)->i;
if (fright->i > k) if ((uint32_t)fright->i > k)
ir->op2 = fins->op2; ir->op2 = fins->op2;
return DROPFOLD; return DROPFOLD;
} }

16
src/lj_opt_sink.c
View File

@ -36,12 +36,14 @@ static IRIns *sink_checkalloc(jit_State *J, IRIns *irs)
} }
/* Recursively check whether a value depends on a PHI. */ /* Recursively check whether a value depends on a PHI. */
static int sink_phidep(jit_State *J, IRRef ref) static int sink_phidep(jit_State *J, IRRef ref, int *workp)
{ {
IRIns *ir = IR(ref); IRIns *ir = IR(ref);
if (!*workp) return 1; /* Give up and pretend it does. */
(*workp)--;
if (irt_isphi(ir->t)) return 1; if (irt_isphi(ir->t)) return 1;
if (ir->op1 >= REF_FIRST && sink_phidep(J, ir->op1)) return 1; if (ir->op1 >= REF_FIRST && sink_phidep(J, ir->op1, workp)) return 1;
if (ir->op2 >= REF_FIRST && sink_phidep(J, ir->op2)) return 1; if (ir->op2 >= REF_FIRST && sink_phidep(J, ir->op2, workp)) return 1;
return 0; return 0;
} }
@ -56,7 +58,13 @@ static int sink_checkphi(jit_State *J, IRIns *ira, IRRef ref)
return 1; /* Sinkable PHI. */ return 1; /* Sinkable PHI. */
} }
/* Otherwise the value must be loop-invariant. */ /* Otherwise the value must be loop-invariant. */
return ref < J->loopref && !sink_phidep(J, ref); if (ref < J->loopref) {
/* Check for PHI dependencies, but give up after reasonable effort. */
int work = 64;
return !sink_phidep(J, ref, &work);
} else {
return 0; /* Loop-variant. */
}
} }
return 1; /* Constant (non-PHI). */ return 1; /* Constant (non-PHI). */
} }

13
src/lj_strscan.c
View File

@ -63,6 +63,7 @@
#define STRSCAN_MAXDIG 800 /* 772 + extra are sufficient. */ #define STRSCAN_MAXDIG 800 /* 772 + extra are sufficient. */
#define STRSCAN_DDIG (STRSCAN_DIG/2) #define STRSCAN_DDIG (STRSCAN_DIG/2)
#define STRSCAN_DMASK (STRSCAN_DDIG-1) #define STRSCAN_DMASK (STRSCAN_DDIG-1)
#define STRSCAN_MAXEXP (1 << 20)
/* Helpers for circular buffer. */ /* Helpers for circular buffer. */
#define DNEXT(a) (((a)+1) & STRSCAN_DMASK) #define DNEXT(a) (((a)+1) & STRSCAN_DMASK)
@ -121,7 +122,8 @@ static StrScanFmt strscan_hex(const uint8_t *p, TValue *o,
/* Format-specific handling. */ /* Format-specific handling. */
switch (fmt) { switch (fmt) {
case STRSCAN_INT: case STRSCAN_INT:
if (!(opt & STRSCAN_OPT_TONUM) && x < 0x80000000u+neg) { if (!(opt & STRSCAN_OPT_TONUM) && x < 0x80000000u+neg &&
!(x == 0 && neg)) {
o->i = neg ? -(int32_t)x : (int32_t)x; o->i = neg ? -(int32_t)x : (int32_t)x;
return STRSCAN_INT; /* Fast path for 32 bit integers. */ return STRSCAN_INT; /* Fast path for 32 bit integers. */
} }
@ -448,6 +450,7 @@ StrScanFmt lj_strscan_scan(const uint8_t *p, MSize len, TValue *o,
if (dig) { if (dig) {
ex = (int32_t)(dp-(p-1)); dp = p-1; ex = (int32_t)(dp-(p-1)); dp = p-1;
while (ex < 0 && *dp-- == '0') ex++, dig--; /* Skip trailing zeros. */ while (ex < 0 && *dp-- == '0') ex++, dig--; /* Skip trailing zeros. */
if (ex <= -STRSCAN_MAXEXP) return STRSCAN_ERROR;
if (base == 16) ex *= 4; if (base == 16) ex *= 4;
} }
} }
@ -461,7 +464,8 @@ StrScanFmt lj_strscan_scan(const uint8_t *p, MSize len, TValue *o,
if (!lj_char_isdigit(*p)) return STRSCAN_ERROR; if (!lj_char_isdigit(*p)) return STRSCAN_ERROR;
xx = (*p++ & 15); xx = (*p++ & 15);
while (lj_char_isdigit(*p)) { while (lj_char_isdigit(*p)) {
if (xx < 65536) xx = xx * 10 + (*p & 15); xx = xx * 10 + (*p & 15);
if (xx >= STRSCAN_MAXEXP) return STRSCAN_ERROR;
p++; p++;
} }
ex += negx ? -(int32_t)xx : (int32_t)xx; ex += negx ? -(int32_t)xx : (int32_t)xx;
@ -499,6 +503,9 @@ StrScanFmt lj_strscan_scan(const uint8_t *p, MSize len, TValue *o,
if ((opt & STRSCAN_OPT_TONUM)) { if ((opt & STRSCAN_OPT_TONUM)) {
o->n = neg ? -(double)x : (double)x; o->n = neg ? -(double)x : (double)x;
return STRSCAN_NUM; return STRSCAN_NUM;
} else if (x == 0 && neg) {
o->n = -0.0;
return STRSCAN_NUM;
} else { } else {
o->i = neg ? -(int32_t)x : (int32_t)x; o->i = neg ? -(int32_t)x : (int32_t)x;
return STRSCAN_INT; return STRSCAN_INT;
@ -516,7 +523,7 @@ StrScanFmt lj_strscan_scan(const uint8_t *p, MSize len, TValue *o,
fmt = strscan_dec(sp, o, fmt, opt, ex, neg, dig); fmt = strscan_dec(sp, o, fmt, opt, ex, neg, dig);
/* Try to convert number to integer, if requested. */ /* Try to convert number to integer, if requested. */
if (fmt == STRSCAN_NUM && (opt & STRSCAN_OPT_TOINT)) { if (fmt == STRSCAN_NUM && (opt & STRSCAN_OPT_TOINT) && !tvismzero(o)) {
double n = o->n; double n = o->n;
int32_t i = lj_num2int(n); int32_t i = lj_num2int(n);
if (n == (lua_Number)i) { o->i = i; return STRSCAN_INT; } if (n == (lua_Number)i) { o->i = i; return STRSCAN_INT; }