From 4a85d5008d808844e6f280a0552f323c029695e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Diot?= Date: Fri, 17 Jan 2025 10:05:18 +0100 Subject: [PATCH] Squashed 'src/deps/src/luajit/' changes from 098183d9d..93162f34e 93162f34e Merge branch 'v2.1' into v2.1-agentzh a4f56a459 Merge branch 'master' into v2.1 62e362afb Fix recording of BC_VARG. 9d777346b Reject negative getfenv()/setfenv() levels to prevent compiler warning. 8358eb0cc Merge branch 'master' into v2.1 e8236561d Bump copyright date. f73e649a9 Merge branch 'master' into v2.1 e2e0b1dd2 Force fallback source name for stripped bytecode. cd8d0a437 Remove dependency on . ea25ac160 Merge branch 'v2.1' into v2.1-agentzh 19878ec05 Restore state when recording __concat metamethod throws OOM. 35a4dd6f7 MIPS64: Fix pcall() error case. 4788e6f92 Merge branch 'master' into v2.1 811e448da Fix detection of inconsistent renames due to sunk values. fe71d0fb5 Windows: Allow amalgamated static builds with msvcbuild.bat. fca66335d Always close profiler output file. 9ce8f1ff8 Fix override of INSTALL_LJLIBD in the presence of DESTDIR. git-subtree-dir: src/deps/src/luajit git-subtree-split: 93162f34e7424cd0ea3c4046a9ffacce621626bc --- COPYRIGHT | 2 +- Makefile | 11 ++++---- README | 2 +- doc/bluequad-print.css | 2 +- doc/bluequad.css | 2 +- doc/contact.html | 6 ++--- doc/ext_buffer.html | 4 +-- doc/ext_c_api.html | 4 +-- doc/ext_ffi.html | 4 +-- doc/ext_ffi_api.html | 4 +-- doc/ext_ffi_semantics.html | 4 +-- doc/ext_ffi_tutorial.html | 4 +-- doc/ext_jit.html | 4 +-- doc/ext_profiler.html | 4 +-- doc/extensions.html | 4 +-- doc/install.html | 4 +-- doc/luajit.html | 6 ++--- doc/running.html | 4 +-- dynasm/dasm_arm.h | 2 +- dynasm/dasm_arm.lua | 2 +- dynasm/dasm_arm64.h | 2 +- dynasm/dasm_arm64.lua | 2 +- dynasm/dasm_mips.h | 2 +- dynasm/dasm_mips.lua | 2 +- dynasm/dasm_mips64.lua | 2 +- dynasm/dasm_ppc.h | 2 +- dynasm/dasm_ppc.lua | 2 +- dynasm/dasm_proto.h | 2 +- dynasm/dasm_x64.lua | 2 +- dynasm/dasm_x86.h | 2 +- dynasm/dasm_x86.lua | 2 +- dynasm/dynasm.lua | 4 +-- etc/luajit.1 | 2 +- src/Makefile | 2 +- src/host/buildvm.c | 2 +- src/host/buildvm.h | 2 +- src/host/buildvm_asm.c | 2 +- src/host/buildvm_fold.c | 2 +- src/host/buildvm_lib.c | 2 +- src/host/buildvm_peobj.c | 2 +- src/host/genlibbc.lua | 2 +- src/host/genminilua.lua | 2 +- src/host/genversion.lua | 2 +- src/jit/bc.lua | 2 +- src/jit/bcsave.lua | 2 +- src/jit/dis_arm.lua | 2 +- src/jit/dis_arm64.lua | 2 +- src/jit/dis_arm64be.lua | 2 +- src/jit/dis_mips.lua | 2 +- src/jit/dis_mips64.lua | 2 +- src/jit/dis_mips64el.lua | 2 +- src/jit/dis_mips64r6.lua | 2 +- src/jit/dis_mips64r6el.lua | 2 +- src/jit/dis_mipsel.lua | 2 +- src/jit/dis_ppc.lua | 2 +- src/jit/dis_x64.lua | 2 +- src/jit/dis_x86.lua | 2 +- src/jit/dump.lua | 2 +- src/jit/p.lua | 6 ++--- src/jit/v.lua | 2 +- src/jit/zone.lua | 2 +- src/lib_aux.c | 2 +- src/lib_base.c | 6 ++++- src/lib_bit.c | 2 +- src/lib_buffer.c | 2 +- src/lib_debug.c | 2 +- src/lib_ffi.c | 2 +- src/lib_init.c | 2 +- src/lib_io.c | 2 +- src/lib_jit.c | 2 +- src/lib_math.c | 2 +- src/lib_os.c | 2 +- src/lib_package.c | 2 +- src/lib_string.c | 2 +- src/lib_table.c | 2 +- src/lj_api.c | 2 +- src/lj_arch.h | 2 +- src/lj_asm.c | 6 ++--- src/lj_asm.h | 2 +- src/lj_asm_arm.h | 2 +- src/lj_asm_arm64.h | 2 +- src/lj_asm_mips.h | 2 +- src/lj_asm_ppc.h | 2 +- src/lj_asm_x86.h | 2 +- src/lj_assert.c | 2 +- src/lj_bc.c | 2 +- src/lj_bc.h | 2 +- src/lj_bcdump.h | 2 +- src/lj_bcread.c | 4 +-- src/lj_bcwrite.c | 2 +- src/lj_buf.c | 2 +- src/lj_buf.h | 2 +- src/lj_carith.c | 2 +- src/lj_carith.h | 2 +- src/lj_ccall.c | 2 +- src/lj_ccall.h | 2 +- src/lj_ccallback.c | 2 +- src/lj_ccallback.h | 2 +- src/lj_cconv.c | 2 +- src/lj_cconv.h | 2 +- src/lj_cdata.c | 2 +- src/lj_cdata.h | 2 +- src/lj_clib.c | 2 +- src/lj_clib.h | 2 +- src/lj_cparse.c | 2 +- src/lj_cparse.h | 2 +- src/lj_crecord.c | 2 +- src/lj_crecord.h | 2 +- src/lj_ctype.c | 2 +- src/lj_ctype.h | 2 +- src/lj_debug.c | 2 +- src/lj_debug.h | 2 +- src/lj_def.h | 2 +- src/lj_dispatch.c | 2 +- src/lj_dispatch.h | 2 +- src/lj_emit_arm.h | 2 +- src/lj_emit_arm64.h | 2 +- src/lj_emit_mips.h | 2 +- src/lj_emit_ppc.h | 2 +- src/lj_emit_x86.h | 2 +- src/lj_err.c | 2 +- src/lj_err.h | 2 +- src/lj_errmsg.h | 2 +- src/lj_ff.h | 2 +- src/lj_ffrecord.c | 2 +- src/lj_ffrecord.h | 2 +- src/lj_frame.h | 2 +- src/lj_func.c | 2 +- src/lj_func.h | 2 +- src/lj_gc.c | 2 +- src/lj_gc.h | 2 +- src/lj_gdbjit.c | 2 +- src/lj_gdbjit.h | 2 +- src/lj_ir.c | 2 +- src/lj_ir.h | 2 +- src/lj_ircall.h | 2 +- src/lj_iropt.h | 2 +- src/lj_jit.h | 2 +- src/lj_lex.c | 2 +- src/lj_lex.h | 2 +- src/lj_lib.c | 2 +- src/lj_lib.h | 2 +- src/lj_load.c | 2 +- src/lj_mcode.c | 2 +- src/lj_mcode.h | 2 +- src/lj_meta.c | 2 +- src/lj_meta.h | 2 +- src/lj_obj.c | 2 +- src/lj_obj.h | 2 +- src/lj_opt_dce.c | 2 +- src/lj_opt_fold.c | 2 +- src/lj_opt_loop.c | 2 +- src/lj_opt_mem.c | 2 +- src/lj_opt_narrow.c | 2 +- src/lj_opt_sink.c | 2 +- src/lj_opt_split.c | 2 +- src/lj_parse.c | 2 +- src/lj_parse.h | 2 +- src/lj_prng.c | 2 +- src/lj_prng.h | 2 +- src/lj_profile.c | 2 +- src/lj_profile.h | 2 +- src/lj_record.c | 55 ++++++++++++++++++++++++-------------- src/lj_record.h | 2 +- src/lj_serialize.c | 2 +- src/lj_serialize.h | 2 +- src/lj_snap.c | 2 +- src/lj_snap.h | 2 +- src/lj_state.c | 2 +- src/lj_state.h | 2 +- src/lj_str.c | 2 +- src/lj_str.h | 2 +- src/lj_strfmt.c | 2 +- src/lj_strfmt.h | 2 +- src/lj_strfmt_num.c | 2 +- src/lj_strscan.c | 2 +- src/lj_strscan.h | 2 +- src/lj_tab.c | 4 +-- src/lj_tab.h | 2 +- src/lj_target.h | 2 +- src/lj_target_arm.h | 2 +- src/lj_target_arm64.h | 2 +- src/lj_target_mips.h | 2 +- src/lj_target_ppc.h | 2 +- src/lj_target_x86.h | 2 +- src/lj_trace.c | 2 +- src/lj_trace.h | 2 +- src/lj_traceerr.h | 2 +- src/lj_udata.c | 2 +- src/lj_udata.h | 2 +- src/lj_vm.h | 2 +- src/lj_vmevent.c | 2 +- src/lj_vmevent.h | 2 +- src/lj_vmmath.c | 2 +- src/ljamalg.c | 2 +- src/luaconf.h | 3 +-- src/luajit.c | 2 +- src/luajit_rolling.h | 4 +-- src/lualib.h | 2 +- src/msvcbuild.bat | 15 ++++++++--- src/vm_arm.dasc | 2 +- src/vm_arm64.dasc | 2 +- src/vm_mips.dasc | 2 +- src/vm_mips64.dasc | 7 ++--- src/vm_ppc.dasc | 2 +- src/vm_x64.dasc | 2 +- src/vm_x86.dasc | 2 +- 207 files changed, 285 insertions(+), 260 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index f57d0d4cf..2a930a3d8 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,7 +1,7 @@ =============================================================================== LuaJIT -- a Just-In-Time Compiler for Lua. https://luajit.org/ -Copyright (C) 2005-2023 Mike Pall. All rights reserved. +Copyright (C) 2005-2025 Mike Pall. All rights reserved. Copyright (C) 2017-2018 Yichun Zhang. All rights reserved. diff --git a/Makefile b/Makefile index cac43c280..d789e9f37 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ # For MSVC, please follow the instructions given in src/msvcbuild.bat. # For MinGW and Cygwin, cd to src and run make with the Makefile there. # -# Copyright (C) 2005-2023 Mike Pall. See Copyright Notice in luajit.h +# Copyright (C) 2005-2025 Mike Pall. See Copyright Notice in luajit.h ############################################################################## MAJVER= 2 @@ -37,12 +37,13 @@ export MULTILIB= lib DPREFIX= $(DESTDIR)$(PREFIX) INSTALL_BIN= $(DPREFIX)/bin INSTALL_LIB= $(DPREFIX)/$(MULTILIB) -INSTALL_SHARE= $(DPREFIX)/share +INSTALL_SHARE_= $(PREFIX)/share +INSTALL_SHARE= $(DESTDIR)$(INSTALL_SHARE_) INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION) INSTALL_INC= $(INSTALL_DEFINC) -export INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(MMVERSION) -INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit +export INSTALL_LJLIBD= $(INSTALL_SHARE_)/luajit-$(MMVERSION) +INSTALL_JITLIB= $(DESTDIR)$(INSTALL_LJLIBD)/jit INSTALL_LMODD= $(INSTALL_SHARE)/lua INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER) INSTALL_CMODD= $(INSTALL_LIB)/lua @@ -71,7 +72,7 @@ INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \ $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD) -UNINSTALL_DIRS= $(INSTALL_JITLIB) $(INSTALL_LJLIBD) $(INSTALL_INC) \ +UNINSTALL_DIRS= $(INSTALL_JITLIB) $(DESTDIR)$(INSTALL_LJLIBD) $(INSTALL_INC) \ $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD) RM= rm -f diff --git a/README b/README index e4a692654..201f1b727 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language. Project Homepage: https://luajit.org/ -LuaJIT is Copyright (C) 2005-2023 Mike Pall. +LuaJIT is Copyright (C) 2005-2025 Mike Pall. LuaJIT is free software, released under the MIT license. See full Copyright Notice in the COPYRIGHT file or in luajit.h. diff --git a/doc/bluequad-print.css b/doc/bluequad-print.css index 4a1392789..5bfda5d32 100644 --- a/doc/bluequad-print.css +++ b/doc/bluequad-print.css @@ -1,4 +1,4 @@ -/* Copyright (C) 2004-2023 Mike Pall. +/* Copyright (C) 2004-2025 Mike Pall. * * You are welcome to use the general ideas of this design for your own sites. * But please do not steal the stylesheet, the layout or the color scheme. diff --git a/doc/bluequad.css b/doc/bluequad.css index 7399f6251..5334a7596 100644 --- a/doc/bluequad.css +++ b/doc/bluequad.css @@ -1,4 +1,4 @@ -/* Copyright (C) 2004-2023 Mike Pall. +/* Copyright (C) 2004-2025 Mike Pall. * * You are welcome to use the general ideas of this design for your own sites. * But please do not steal the stylesheet, the layout or the color scheme. diff --git a/doc/contact.html b/doc/contact.html index cc4d8c723..d8d34a690 100644 --- a/doc/contact.html +++ b/doc/contact.html @@ -3,7 +3,7 @@ Contact - + @@ -94,7 +94,7 @@ don't like that, please complain to Google or Microsoft, not me.

Copyright

All documentation is -Copyright © 2005-2023 Mike Pall. +Copyright © 2005-2025 Mike Pall.

@@ -102,7 +102,7 @@ Copyright © 2005-2023 Mike Pall.