From 430d9f8f7ebb779948dbd43944b876b1a3f58551 Mon Sep 17 00:00:00 2001 From: Mike Pall Date: Sun, 14 Jan 2018 14:11:59 +0100 Subject: [PATCH 1/5] Fix string.format("%c", 0). --- src/lib_string.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/lib_string.c b/src/lib_string.c index d1a60b61..c1e595c9 100644 --- a/src/lib_string.c +++ b/src/lib_string.c @@ -850,20 +850,21 @@ LJLIB_CF(string_format) } else { /* format item */ char form[MAX_FMTSPEC]; /* to store the format (`%...') */ char buff[MAX_FMTITEM]; /* to store the formatted item */ + int n = 0; if (++arg > top) luaL_argerror(L, arg, lj_obj_typename[0]); strfrmt = scanformat(L, strfrmt, form); switch (*strfrmt++) { case 'c': - sprintf(buff, form, lj_lib_checkint(L, arg)); + n = sprintf(buff, form, lj_lib_checkint(L, arg)); break; case 'd': case 'i': addintlen(form); - sprintf(buff, form, num2intfrm(L, arg)); + n = sprintf(buff, form, num2intfrm(L, arg)); break; case 'o': case 'u': case 'x': case 'X': addintlen(form); - sprintf(buff, form, num2uintfrm(L, arg)); + n = sprintf(buff, form, num2uintfrm(L, arg)); break; case 'e': case 'E': case 'f': case 'g': case 'G': case 'a': case 'A': { TValue tv; @@ -880,10 +881,10 @@ LJLIB_CF(string_format) nbuf[len] = '\0'; for (p = form; *p < 'A' && *p != '.'; p++) ; *p++ = 's'; *p = '\0'; - sprintf(buff, form, nbuf); + n = sprintf(buff, form, nbuf); break; } - sprintf(buff, form, (double)tv.n); + n = sprintf(buff, form, (double)tv.n); break; } case 'q': @@ -902,14 +903,14 @@ LJLIB_CF(string_format) luaL_addvalue(&b); continue; } - sprintf(buff, form, strdata(str)); + n = sprintf(buff, form, strdata(str)); break; } default: lj_err_callerv(L, LJ_ERR_STRFMTO, *(strfrmt -1)); break; } - luaL_addlstring(&b, buff, strlen(buff)); + luaL_addlstring(&b, buff, n); } } luaL_pushresult(&b); From c88602f080dcafea6ba222a2f7cc1ea0e41ef3cc Mon Sep 17 00:00:00 2001 From: Mike Pall Date: Thu, 18 Jan 2018 12:29:39 +0100 Subject: [PATCH 2/5] Fix LuaJIT API docs for LUAJIT_MODE_*. Thanks to sunfishgao. --- doc/ext_c_api.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ext_c_api.html b/doc/ext_c_api.html index 041a7220..4bb82514 100644 --- a/doc/ext_c_api.html +++ b/doc/ext_c_api.html @@ -89,8 +89,8 @@ other Lua/C API functions).

The third argument specifies the mode, which is 'or'ed with a flag. -The flag can be LUAJIT_MODE_OFF to turn a feature on, -LUAJIT_MODE_ON to turn a feature off, or +The flag can be LUAJIT_MODE_OFF to turn a feature off, +LUAJIT_MODE_ON to turn a feature on, or LUAJIT_MODE_FLUSH to flush cached code.

From b03a56f28ec360bbcf43091afd0607890a4a33c7 Mon Sep 17 00:00:00 2001 From: Mike Pall Date: Mon, 29 Jan 2018 12:47:08 +0100 Subject: [PATCH 3/5] FFI: Don't assert on #1LL (5.2 compatibility mode only). Reported by Denis Golovan. --- src/lib_ffi.c | 2 +- src/lj_carith.c | 9 +++++++++ src/lj_carith.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/lib_ffi.c b/src/lib_ffi.c index f2f2ede4..83483d95 100644 --- a/src/lib_ffi.c +++ b/src/lib_ffi.c @@ -193,7 +193,7 @@ LJLIB_CF(ffi_meta___eq) LJLIB_REC(cdata_arith MM_eq) LJLIB_CF(ffi_meta___len) LJLIB_REC(cdata_arith MM_len) { - return ffi_arith(L); + return lj_carith_len(L); } LJLIB_CF(ffi_meta___lt) LJLIB_REC(cdata_arith MM_lt) diff --git a/src/lj_carith.c b/src/lj_carith.c index 6224dee6..c34596ca 100644 --- a/src/lj_carith.c +++ b/src/lj_carith.c @@ -272,6 +272,15 @@ int lj_carith_op(lua_State *L, MMS mm) return lj_carith_meta(L, cts, &ca, mm); } +/* No built-in functionality for length of cdata. */ +int lj_carith_len(lua_State *L) +{ + CTState *cts = ctype_cts(L); + CDArith ca; + carith_checkarg(L, cts, &ca); + return lj_carith_meta(L, cts, &ca, MM_len); +} + /* -- 64 bit integer arithmetic helpers ----------------------------------- */ #if LJ_32 && LJ_HASJIT diff --git a/src/lj_carith.h b/src/lj_carith.h index 3c155910..82fc8245 100644 --- a/src/lj_carith.h +++ b/src/lj_carith.h @@ -11,6 +11,7 @@ #if LJ_HASFFI LJ_FUNC int lj_carith_op(lua_State *L, MMS mm); +LJ_FUNC int lj_carith_len(lua_State *L); #if LJ_32 && LJ_HASJIT LJ_FUNC int64_t lj_carith_mul64(int64_t x, int64_t k); From d4ee80342770d1281e2ce877f8ae8ab1d99e6528 Mon Sep 17 00:00:00 2001 From: Mike Pall Date: Mon, 29 Jan 2018 13:06:13 +0100 Subject: [PATCH 4/5] Fix GCC 7 -Wimplicit-fallthrough warnings. --- dynasm/dasm_arm.h | 2 ++ dynasm/dasm_mips.h | 1 + dynasm/dasm_ppc.h | 1 + dynasm/dasm_x86.h | 14 ++++++++++++-- src/lj_asm.c | 3 ++- src/lj_cparse.c | 10 ++++++++++ src/lj_err.c | 1 + src/lj_opt_sink.c | 2 +- src/lj_parse.c | 3 ++- src/luajit.c | 1 + 10 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dynasm/dasm_arm.h b/dynasm/dasm_arm.h index a43f7c66..1d404ccd 100644 --- a/dynasm/dasm_arm.h +++ b/dynasm/dasm_arm.h @@ -254,6 +254,7 @@ void dasm_put(Dst_DECL, int start, ...) case DASM_IMMV8: CK((n & 3) == 0, RANGE_I); n >>= 2; + /* fallthrough */ case DASM_IMML8: case DASM_IMML12: CK(n >= 0 ? ((n>>((ins>>5)&31)) == 0) : @@ -371,6 +372,7 @@ int dasm_encode(Dst_DECL, void *buffer) break; case DASM_REL_LG: CK(n >= 0, UNDEF_LG); + /* fallthrough */ case DASM_REL_PC: CK(n >= 0, UNDEF_PC); n = *DASM_POS2PTR(D, n) - (int)((char *)cp - base) - 4; diff --git a/dynasm/dasm_mips.h b/dynasm/dasm_mips.h index 7eac6694..46af0349 100644 --- a/dynasm/dasm_mips.h +++ b/dynasm/dasm_mips.h @@ -350,6 +350,7 @@ int dasm_encode(Dst_DECL, void *buffer) break; case DASM_REL_LG: CK(n >= 0, UNDEF_LG); + /* fallthrough */ case DASM_REL_PC: CK(n >= 0, UNDEF_PC); n = *DASM_POS2PTR(D, n); diff --git a/dynasm/dasm_ppc.h b/dynasm/dasm_ppc.h index 61103612..81b9a76b 100644 --- a/dynasm/dasm_ppc.h +++ b/dynasm/dasm_ppc.h @@ -350,6 +350,7 @@ int dasm_encode(Dst_DECL, void *buffer) break; case DASM_REL_LG: CK(n >= 0, UNDEF_LG); + /* fallthrough */ case DASM_REL_PC: CK(n >= 0, UNDEF_PC); n = *DASM_POS2PTR(D, n) - (int)((char *)cp - base); diff --git a/dynasm/dasm_x86.h b/dynasm/dasm_x86.h index f9260b0c..8ae911df 100644 --- a/dynasm/dasm_x86.h +++ b/dynasm/dasm_x86.h @@ -194,12 +194,13 @@ void dasm_put(Dst_DECL, int start, ...) switch (action) { case DASM_DISP: if (n == 0) { if ((mrm&7) == 4) mrm = p[-2]; if ((mrm&7) != 5) break; } - case DASM_IMM_DB: if (((n+128)&-256) == 0) goto ob; + /* fallthrough */ + case DASM_IMM_DB: if (((n+128)&-256) == 0) goto ob; /* fallthrough */ case DASM_REL_A: /* Assumes ptrdiff_t is int. !x64 */ case DASM_IMM_D: ofs += 4; break; case DASM_IMM_S: CK(((n+128)&-256) == 0, RANGE_I); goto ob; case DASM_IMM_B: CK((n&-256) == 0, RANGE_I); ob: ofs++; break; - case DASM_IMM_WB: if (((n+128)&-256) == 0) goto ob; + case DASM_IMM_WB: if (((n+128)&-256) == 0) goto ob; /* fallthrough */ case DASM_IMM_W: CK((n&-65536) == 0, RANGE_I); ofs += 2; break; case DASM_SPACE: p++; ofs += n; break; case DASM_SETLABEL: b[pos-2] = -0x40000000; break; /* Neg. label ofs. */ @@ -323,11 +324,14 @@ int dasm_link(Dst_DECL, size_t *szp) pos += 2; break; } + /* fallthrough */ case DASM_SPACE: case DASM_IMM_LG: case DASM_VREG: p++; + /* fallthrough */ case DASM_DISP: case DASM_IMM_S: case DASM_IMM_B: case DASM_IMM_W: case DASM_IMM_D: case DASM_IMM_WB: case DASM_IMM_DB: case DASM_SETLABEL: case DASM_REL_A: case DASM_IMM_PC: pos++; break; case DASM_LABEL_LG: p++; + /* fallthrough */ case DASM_LABEL_PC: b[pos++] += ofs; break; /* Fix label offset. */ case DASM_ALIGN: ofs -= (b[pos++]+ofs)&*p++; break; /* Adjust ofs. */ case DASM_EXTERN: p += 2; break; @@ -385,16 +389,20 @@ int dasm_encode(Dst_DECL, void *buffer) if (mrm != 5) { mm[-1] -= 0x80; break; } } if (((n+128) & -256) != 0) goto wd; else mm[-1] -= 0x40; } + /* fallthrough */ case DASM_IMM_S: case DASM_IMM_B: wb: dasmb(n); break; case DASM_IMM_DB: if (((n+128)&-256) == 0) { db: if (!mark) mark = cp; mark[-2] += 2; mark = NULL; goto wb; } else mark = NULL; + /* fallthrough */ case DASM_IMM_D: wd: dasmd(n); break; case DASM_IMM_WB: if (((n+128)&-256) == 0) goto db; else mark = NULL; + /* fallthrough */ case DASM_IMM_W: dasmw(n); break; case DASM_VREG: { int t = *p++; if (t >= 2) n<<=3; cp[-1] |= n; break; } case DASM_REL_LG: p++; if (n >= 0) goto rel_pc; b++; n = (int)(ptrdiff_t)D->globals[-n]; + /* fallthrough */ case DASM_REL_A: rel_a: n -= (unsigned int)(ptrdiff_t)(cp+4); goto wd; /* !x64 */ case DASM_REL_PC: rel_pc: { @@ -407,6 +415,7 @@ int dasm_encode(Dst_DECL, void *buffer) } case DASM_IMM_LG: p++; if (n < 0) { n = (int)(ptrdiff_t)D->globals[-n]; goto wd; } + /* fallthrough */ case DASM_IMM_PC: { int *pb = DASM_POS2PTR(D, n); n = *pb < 0 ? pb[1] : (*pb + (int)(ptrdiff_t)base); @@ -427,6 +436,7 @@ int dasm_encode(Dst_DECL, void *buffer) case DASM_EXTERN: n = DASM_EXTERN(Dst, cp, p[1], *p); p += 2; goto wd; case DASM_MARK: mark = cp; break; case DASM_ESC: action = *p++; + /* fallthrough */ default: *cp++ = action; break; case DASM_SECTION: case DASM_STOP: goto stop; } diff --git a/src/lj_asm.c b/src/lj_asm.c index 02714d4e..dd7186f6 100644 --- a/src/lj_asm.c +++ b/src/lj_asm.c @@ -1725,6 +1725,7 @@ static void asm_setup_regsp(ASMState *as) case IR_SNEW: case IR_XSNEW: case IR_NEWREF: if (REGARG_NUMGPR < 3 && as->evenspill < 3) as->evenspill = 3; /* lj_str_new and lj_tab_newkey need 3 args. */ + /* fallthrough */ case IR_TNEW: case IR_TDUP: case IR_CNEW: case IR_CNEWI: case IR_TOSTR: ir->prev = REGSP_HINT(RID_RET); if (inloop) @@ -1750,7 +1751,7 @@ static void asm_setup_regsp(ASMState *as) #endif continue; } - /* fallthrough for integer POW */ + /* fallthrough */ /* for integer POW */ case IR_DIV: case IR_MOD: if (!irt_isnum(ir->t)) { ir->prev = REGSP_HINT(RID_RET); diff --git a/src/lj_cparse.c b/src/lj_cparse.c index 2ba50a72..f111537d 100644 --- a/src/lj_cparse.c +++ b/src/lj_cparse.c @@ -590,28 +590,34 @@ static void cp_expr_infix(CPState *cp, CPValue *k, int pri) k->id = k2.id > k3.id ? k2.id : k3.id; continue; } + /* fallthrough */ case 1: if (cp_opt(cp, CTOK_OROR)) { cp_expr_sub(cp, &k2, 2); k->i32 = k->u32 || k2.u32; k->id = CTID_INT32; continue; } + /* fallthrough */ case 2: if (cp_opt(cp, CTOK_ANDAND)) { cp_expr_sub(cp, &k2, 3); k->i32 = k->u32 && k2.u32; k->id = CTID_INT32; continue; } + /* fallthrough */ case 3: if (cp_opt(cp, '|')) { cp_expr_sub(cp, &k2, 4); k->u32 = k->u32 | k2.u32; goto arith_result; } + /* fallthrough */ case 4: if (cp_opt(cp, '^')) { cp_expr_sub(cp, &k2, 5); k->u32 = k->u32 ^ k2.u32; goto arith_result; } + /* fallthrough */ case 5: if (cp_opt(cp, '&')) { cp_expr_sub(cp, &k2, 6); k->u32 = k->u32 & k2.u32; goto arith_result; } + /* fallthrough */ case 6: if (cp_opt(cp, CTOK_EQ)) { cp_expr_sub(cp, &k2, 7); k->i32 = k->u32 == k2.u32; k->id = CTID_INT32; @@ -620,6 +626,7 @@ static void cp_expr_infix(CPState *cp, CPValue *k, int pri) cp_expr_sub(cp, &k2, 7); k->i32 = k->u32 != k2.u32; k->id = CTID_INT32; continue; } + /* fallthrough */ case 7: if (cp_opt(cp, '<')) { cp_expr_sub(cp, &k2, 8); @@ -654,6 +661,7 @@ static void cp_expr_infix(CPState *cp, CPValue *k, int pri) k->id = CTID_INT32; continue; } + /* fallthrough */ case 8: if (cp_opt(cp, CTOK_SHL)) { cp_expr_sub(cp, &k2, 9); k->u32 = k->u32 << k2.u32; @@ -666,6 +674,7 @@ static void cp_expr_infix(CPState *cp, CPValue *k, int pri) k->u32 = k->u32 >> k2.u32; continue; } + /* fallthrough */ case 9: if (cp_opt(cp, '+')) { cp_expr_sub(cp, &k2, 10); k->u32 = k->u32 + k2.u32; @@ -675,6 +684,7 @@ static void cp_expr_infix(CPState *cp, CPValue *k, int pri) } else if (cp_opt(cp, '-')) { cp_expr_sub(cp, &k2, 10); k->u32 = k->u32 - k2.u32; goto arith_result; } + /* fallthrough */ case 10: if (cp_opt(cp, '*')) { cp_expr_unary(cp, &k2); k->u32 = k->u32 * k2.u32; goto arith_result; diff --git a/src/lj_err.c b/src/lj_err.c index 54f42c37..13a1ded7 100644 --- a/src/lj_err.c +++ b/src/lj_err.c @@ -153,6 +153,7 @@ static void *err_unwind(lua_State *L, void *stopcf, int errcode) if ((frame-1)->u32.lo == LJ_CONT_FFI_CALLBACK) goto unwind_c; #endif + /* fallthrough */ case FRAME_VARG: /* Vararg frame. */ frame = frame_prevd(frame); break; diff --git a/src/lj_opt_sink.c b/src/lj_opt_sink.c index 6a00d04c..4efe395e 100644 --- a/src/lj_opt_sink.c +++ b/src/lj_opt_sink.c @@ -100,8 +100,8 @@ static void sink_mark_ins(jit_State *J) (LJ_32 && ir+1 < irlast && (ir+1)->o == IR_HIOP && !sink_checkphi(J, ir, (ir+1)->op2)))) irt_setmark(ir->t); /* Mark ineligible allocation. */ - /* fallthrough */ #endif + /* fallthrough */ case IR_USTORE: irt_setmark(IR(ir->op2)->t); /* Mark stored value. */ break; diff --git a/src/lj_parse.c b/src/lj_parse.c index 9e5976f7..67854951 100644 --- a/src/lj_parse.c +++ b/src/lj_parse.c @@ -2696,7 +2696,8 @@ static int parse_stmt(LexState *ls) lj_lex_next(ls); parse_goto(ls); break; - } /* else: fallthrough */ + } + /* fallthrough */ default: parse_call_assign(ls); break; diff --git a/src/luajit.c b/src/luajit.c index 9e15b26d..0e18dc5f 100644 --- a/src/luajit.c +++ b/src/luajit.c @@ -419,6 +419,7 @@ static int collectargs(char **argv, int *flags) break; case 'e': *flags |= FLAGS_EXEC; + /* fallthrough */ case 'j': /* LuaJIT extension */ case 'l': *flags |= FLAGS_OPTION; From 03cd5aa749c1bc3bb4b7d4289236b6096cb3dc85 Mon Sep 17 00:00:00 2001 From: Mike Pall Date: Mon, 29 Jan 2018 13:25:51 +0100 Subject: [PATCH 5/5] Clear stack after print_jit_status() in CLI. Suggested by Hydroque. --- src/luajit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/luajit.c b/src/luajit.c index 0e18dc5f..9ede59c1 100644 --- a/src/luajit.c +++ b/src/luajit.c @@ -151,6 +151,7 @@ static void print_jit_status(lua_State *L) fputs(s, stdout); } putc('\n', stdout); + lua_settop(L, 0); /* clear stack */ } static int getargs(lua_State *L, char **argv, int n)