From 8b50ff7c6583e0ebfb2b249fc4528ca578d0e115 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Fri, 11 Sep 2020 22:16:28 +0800
Subject: disable bytecode for windows

---
 .github/workflows/windows.yml                      |   4 +-
 core/src/luajit/autogen/msys/jit/i386/lj_bcdef.h   |  36 +-
 core/src/luajit/autogen/msys/jit/i386/lj_def.h     | 362 ---------
 core/src/luajit/autogen/msys/jit/i386/lj_ffdef.h   |   1 +
 core/src/luajit/autogen/msys/jit/i386/lj_folddef.h | 807 +++++++++++----------
 core/src/luajit/autogen/msys/jit/i386/lj_libdef.h  |  23 +-
 core/src/luajit/autogen/msys/jit/i386/lj_recdef.h  | 143 ++--
 core/src/luajit/autogen/msys/jit/i386/lj_vm.o      | Bin 25209 -> 25221 bytes
 core/src/luajit/autogen/msys/jit/x86_64/lj_bcdef.h | 302 ++++----
 core/src/luajit/autogen/msys/jit/x86_64/lj_ffdef.h |   1 +
 .../luajit/autogen/msys/jit/x86_64/lj_folddef.h    | 807 +++++++++++----------
 .../src/luajit/autogen/msys/jit/x86_64/lj_libdef.h |  58 +-
 .../src/luajit/autogen/msys/jit/x86_64/lj_recdef.h | 143 ++--
 core/src/luajit/autogen/msys/jit/x86_64/lj_vm.o    | Bin 25031 -> 27342 bytes
 14 files changed, 1219 insertions(+), 1468 deletions(-)
 delete mode 100644 core/src/luajit/autogen/msys/jit/i386/lj_def.h

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 469a0485a..0a54dfa37 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -22,7 +22,7 @@ jobs:
         with:
           # this is not supported, use dev branch instead
           # xmake-version: local#
-          xmake-version: branch@luajit-v2.1
+          xmake-version: branch@dev
       - uses: mihails-strasuns/setup-dlang@v0.5.0
         with:
           compiler: dmd-latest
@@ -57,7 +57,7 @@ jobs:
           $Env:XMAKE_PROGRAM_DIR = $(Resolve-Path ./xmake)
           Set-Item -Path Env:Path -Value ($Env:XMAKE_PROGRAM_DIR + ";" + $Env:Path)
           xmake show
-          xmake l -v private.utils.bcsave --rootname='@programdir' -x 'scripts/**|templates/**' xmake
+          #xmake l -v private.utils.bcsave --rootname='@programdir' -x 'scripts/**|templates/**' xmake
           xmake lua -v -D tests/run.lua
 
         # build artifacts
diff --git a/core/src/luajit/autogen/msys/jit/i386/lj_bcdef.h b/core/src/luajit/autogen/msys/jit/i386/lj_bcdef.h
index 72f779c49..8f4aad739 100644
--- a/core/src/luajit/autogen/msys/jit/i386/lj_bcdef.h
+++ b/core/src/luajit/autogen/msys/jit/i386/lj_bcdef.h
@@ -137,24 +137,24 @@ LJ_DATADEF const uint16_t lj_bc_ofs[] = {
 10556,
 10619,
 10902,
-10955,
-11576,
-11945,
-11896,
-12010,
-12082,
-12157,
-12232,
-12307,
-11626,
-11716,
-11806,
-11008,
-11055,
-11169,
-11330,
-11412,
-11494
+10964,
+11594,
+11963,
+11914,
+12028,
+12100,
+12175,
+12250,
+12325,
+11644,
+11734,
+11824,
+11026,
+11073,
+11187,
+11348,
+11430,
+11512
 };
 
 LJ_DATADEF const uint16_t lj_bc_mode[] = {
diff --git a/core/src/luajit/autogen/msys/jit/i386/lj_def.h b/core/src/luajit/autogen/msys/jit/i386/lj_def.h
deleted file mode 100644
index 2d8fff66f..000000000
--- a/core/src/luajit/autogen/msys/jit/i386/lj_def.h
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
-** LuaJIT common internal definitions.
-** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
-*/
-
-#ifndef _LJ_DEF_H
-#define _LJ_DEF_H
-
-#include "lua.h"
-
-#if defined(_MSC_VER)
-/* MSVC is stuck in the last century and doesn't have C99's stdint.h. */
-typedef __int8 int8_t;
-typedef __int16 int16_t;
-typedef __int32 int32_t;
-typedef __int64 int64_t;
-typedef unsigned __int8 uint8_t;
-typedef unsigned __int16 uint16_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int64 uint64_t;
-#ifdef _WIN64
-typedef __int64 intptr_t;
-typedef unsigned __int64 uintptr_t;
-#else
-typedef __int32 intptr_t;
-typedef unsigned __int32 uintptr_t;
-#endif
-#elif defined(__symbian__)
-/* Cough. */
-typedef signed char int8_t;
-typedef short int int16_t;
-typedef int int32_t;
-typedef long long int64_t;
-typedef unsigned char uint8_t;
-typedef unsigned short int uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long long uint64_t;
-typedef int intptr_t;
-typedef unsigned int uintptr_t;
-#else
-#include <stdint.h>
-#endif
-
-/* Needed everywhere. */
-#include <string.h>
-#include <stdlib.h>
-
-/* Various VM limits. */
-#define LJ_MAX_MEM32	0x7fffff00	/* Max. 32 bit memory allocation. */
-#define LJ_MAX_MEM64	((uint64_t)1<<47)  /* Max. 64 bit memory allocation. */
-/* Max. total memory allocation. */
-#define LJ_MAX_MEM	(LJ_GC64 ? LJ_MAX_MEM64 : LJ_MAX_MEM32)
-#define LJ_MAX_ALLOC	LJ_MAX_MEM	/* Max. individual allocation length. */
-#define LJ_MAX_STR	LJ_MAX_MEM32	/* Max. string length. */
-#define LJ_MAX_BUF	LJ_MAX_MEM32	/* Max. buffer length. */
-#define LJ_MAX_UDATA	LJ_MAX_MEM32	/* Max. userdata length. */
-
-#define LJ_MAX_STRTAB	(1<<26)		/* Max. string table size. */
-#define LJ_MAX_HBITS	26		/* Max. hash bits. */
-#define LJ_MAX_ABITS	28		/* Max. bits of array key. */
-#define LJ_MAX_ASIZE	((1<<(LJ_MAX_ABITS-1))+1)  /* Max. array part size. */
-#define LJ_MAX_COLOSIZE	16		/* Max. elems for colocated array. */
-
-#define LJ_MAX_LINE	LJ_MAX_MEM32	/* Max. source code line number. */
-#define LJ_MAX_XLEVEL	200		/* Max. syntactic nesting level. */
-#define LJ_MAX_BCINS	(1<<26)		/* Max. # of bytecode instructions. */
-#define LJ_MAX_SLOTS	250		/* Max. # of slots in a Lua func. */
-#define LJ_MAX_LOCVAR	200		/* Max. # of local variables. */
-#define LJ_MAX_UPVAL	60		/* Max. # of upvalues. */
-
-#define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
-#define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
-
-#define LJ_NUM_CBPAGE	1		/* Number of FFI callback pages. */
-
-/* Minimum table/buffer sizes. */
-#define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
-#define LJ_MIN_REGISTRY	2		/* Min. registry size (hbits). */
-#define LJ_MIN_STRTAB	256		/* Min. string table size (pow2). */
-#define LJ_MIN_SBUF	32		/* Min. string buffer length. */
-#define LJ_MIN_VECSZ	8		/* Min. size for growable vectors. */
-#define LJ_MIN_IRSZ	32		/* Min. size for growable IR. */
-#define LJ_MIN_K64SZ	16		/* Min. size for chained K64Array. */
-
-/* JIT compiler limits. */
-#define LJ_MAX_JSLOTS	250		/* Max. # of stack slots for a trace. */
-#define LJ_MAX_PHI	64		/* Max. # of PHIs for a loop. */
-#define LJ_MAX_EXITSTUBGR	16	/* Max. # of exit stub groups. */
-
-/* Various macros. */
-#ifndef UNUSED
-#define UNUSED(x)	((void)(x))	/* to avoid warnings */
-#endif
-
-#define U64x(hi, lo)	(((uint64_t)0x##hi << 32) + (uint64_t)0x##lo)
-#define i32ptr(p)	((int32_t)(intptr_t)(void *)(p))
-#define u32ptr(p)	((uint32_t)(intptr_t)(void *)(p))
-#define i64ptr(p)	((int64_t)(intptr_t)(void *)(p))
-#define u64ptr(p)	((uint64_t)(intptr_t)(void *)(p))
-#define igcptr(p)	(LJ_GC64 ? i64ptr(p) : i32ptr(p))
-
-#define checki8(x)	((x) == (int32_t)(int8_t)(x))
-#define checku8(x)	((x) == (int32_t)(uint8_t)(x))
-#define checki16(x)	((x) == (int32_t)(int16_t)(x))
-#define checku16(x)	((x) == (int32_t)(uint16_t)(x))
-#define checki32(x)	((x) == (int32_t)(x))
-#define checku32(x)	((x) == (uint32_t)(x))
-#define checkptr32(x)	((uintptr_t)(x) == (uint32_t)(uintptr_t)(x))
-#define checkptr47(x)	(((uint64_t)(uintptr_t)(x) >> 47) == 0)
-#define checkptrGC(x)	(LJ_GC64 ? checkptr47((x)) : LJ_64 ? checkptr32((x)) :1)
-
-/* Every half-decent C compiler transforms this into a rotate instruction. */
-#define lj_rol(x, n)	(((x)<<(n)) | ((x)>>(-(int)(n)&(8*sizeof(x)-1))))
-#define lj_ror(x, n)	(((x)<<(-(int)(n)&(8*sizeof(x)-1))) | ((x)>>(n)))
-
-/* A really naive Bloom filter. But sufficient for our needs. */
-typedef uintptr_t BloomFilter;
-#define BLOOM_MASK	(8*sizeof(BloomFilter) - 1)
-#define bloombit(x)	((uintptr_t)1 << ((x) & BLOOM_MASK))
-#define bloomset(b, x)	((b) |= bloombit((x)))
-#define bloomtest(b, x)	((b) & bloombit((x)))
-
-#if defined(__GNUC__) || defined(__psp2__)
-
-#define LJ_NORET	__attribute__((noreturn))
-#define LJ_ALIGN(n)	__attribute__((aligned(n)))
-#define LJ_INLINE	inline
-#define LJ_AINLINE	inline __attribute__((always_inline))
-#define LJ_NOINLINE	__attribute__((noinline))
-
-#if defined(__ELF__) || defined(__MACH__) || defined(__psp2__)
-#if !((defined(__sun__) && defined(__svr4__)) || defined(__CELLOS_LV2__))
-#define LJ_NOAPI	extern __attribute__((visibility("hidden")))
-#endif
-#endif
-
-/* Note: it's only beneficial to use fastcall on x86 and then only for up to
-** two non-FP args. The amalgamated compile covers all LJ_FUNC cases. Only
-** indirect calls and related tail-called C functions are marked as fastcall.
-*/
-#if defined(__i386__)
-#define LJ_FASTCALL	__attribute__((fastcall))
-#endif
-
-#define LJ_LIKELY(x)	__builtin_expect(!!(x), 1)
-#define LJ_UNLIKELY(x)	__builtin_expect(!!(x), 0)
-
-#define lj_ffs(x)	((uint32_t)__builtin_ctz(x))
-/* Don't ask ... */
-#if defined(__INTEL_COMPILER) && (defined(__i386__) || defined(__x86_64__))
-static LJ_AINLINE uint32_t lj_fls(uint32_t x)
-{
-  uint32_t r; __asm__("bsrl %1, %0" : "=r" (r) : "rm" (x) : "cc"); return r;
-}
-#else
-#define lj_fls(x)	((uint32_t)(__builtin_clz(x)^31))
-#endif
-
-#if defined(__arm__)
-static LJ_AINLINE uint32_t lj_bswap(uint32_t x)
-{
-#if defined(__psp2__)
-  return __builtin_rev(x);
-#else
-  uint32_t r;
-#if __ARM_ARCH_6__ || __ARM_ARCH_6J__ || __ARM_ARCH_6T2__ || __ARM_ARCH_6Z__ ||\
-    __ARM_ARCH_6ZK__ || __ARM_ARCH_7__ || __ARM_ARCH_7A__ || __ARM_ARCH_7R__
-  __asm__("rev %0, %1" : "=r" (r) : "r" (x));
-  return r;
-#else
-#ifdef __thumb__
-  r = x ^ lj_ror(x, 16);
-#else
-  __asm__("eor %0, %1, %1, ror #16" : "=r" (r) : "r" (x));
-#endif
-  return ((r & 0xff00ffffu) >> 8) ^ lj_ror(x, 8);
-#endif
-#endif
-}
-
-static LJ_AINLINE uint64_t lj_bswap64(uint64_t x)
-{
-  return ((uint64_t)lj_bswap((uint32_t)x)<<32) | lj_bswap((uint32_t)(x>>32));
-}
-#elif (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
-static LJ_AINLINE uint32_t lj_bswap(uint32_t x)
-{
-  return (uint32_t)__builtin_bswap32((int32_t)x);
-}
-
-static LJ_AINLINE uint64_t lj_bswap64(uint64_t x)
-{
-  return (uint64_t)__builtin_bswap64((int64_t)x);
-}
-#elif defined(__i386__) || defined(__x86_64__)
-static LJ_AINLINE uint32_t lj_bswap(uint32_t x)
-{
-  uint32_t r; __asm__("bswap %0" : "=r" (r) : "0" (x)); return r;
-}
-
-#if defined(__i386__)
-static LJ_AINLINE uint64_t lj_bswap64(uint64_t x)
-{
-  return ((uint64_t)lj_bswap((uint32_t)x)<<32) | lj_bswap((uint32_t)(x>>32));
-}
-#else
-static LJ_AINLINE uint64_t lj_bswap64(uint64_t x)
-{
-  uint64_t r; __asm__("bswap %0" : "=r" (r) : "0" (x)); return r;
-}
-#endif
-#else
-static LJ_AINLINE uint32_t lj_bswap(uint32_t x)
-{
-  return (x << 24) | ((x & 0xff00) << 8) | ((x >> 8) & 0xff00) | (x >> 24);
-}
-
-static LJ_AINLINE uint64_t lj_bswap64(uint64_t x)
-{
-  return (uint64_t)lj_bswap((uint32_t)(x >> 32)) |
-	 ((uint64_t)lj_bswap((uint32_t)x) << 32);
-}
-#endif
-
-typedef union __attribute__((packed)) Unaligned16 {
-  uint16_t u;
-  uint8_t b[2];
-} Unaligned16;
-
-typedef union __attribute__((packed)) Unaligned32 {
-  uint32_t u;
-  uint8_t b[4];
-} Unaligned32;
-
-/* Unaligned load of uint16_t. */
-static LJ_AINLINE uint16_t lj_getu16(const void *p)
-{
-  return ((const Unaligned16 *)p)->u;
-}
-
-/* Unaligned load of uint32_t. */
-static LJ_AINLINE uint32_t lj_getu32(const void *p)
-{
-  return ((const Unaligned32 *)p)->u;
-}
-
-#elif defined(_MSC_VER)
-
-#define LJ_NORET	__declspec(noreturn)
-#define LJ_ALIGN(n)	__declspec(align(n))
-#define LJ_INLINE	__inline
-#define LJ_AINLINE	__forceinline
-#define LJ_NOINLINE	__declspec(noinline)
-#if defined(_M_IX86)
-#define LJ_FASTCALL	__fastcall
-#endif
-
-#ifdef _M_PPC
-unsigned int _CountLeadingZeros(long);
-#pragma intrinsic(_CountLeadingZeros)
-static LJ_AINLINE uint32_t lj_fls(uint32_t x)
-{
-  return _CountLeadingZeros(x) ^ 31;
-}
-#else
-unsigned char _BitScanForward(uint32_t *, unsigned long);
-unsigned char _BitScanReverse(uint32_t *, unsigned long);
-#pragma intrinsic(_BitScanForward)
-#pragma intrinsic(_BitScanReverse)
-
-static LJ_AINLINE uint32_t lj_ffs(uint32_t x)
-{
-  uint32_t r; _BitScanForward(&r, x); return r;
-}
-
-static LJ_AINLINE uint32_t lj_fls(uint32_t x)
-{
-  uint32_t r; _BitScanReverse(&r, x); return r;
-}
-#endif
-
-unsigned long _byteswap_ulong(unsigned long);
-uint64_t _byteswap_uint64(uint64_t);
-#define lj_bswap(x)	(_byteswap_ulong((x)))
-#define lj_bswap64(x)	(_byteswap_uint64((x)))
-
-#if defined(_M_PPC) && defined(LUAJIT_NO_UNALIGNED)
-/*
-** Replacement for unaligned loads on Xbox 360. Disabled by default since it's
-** usually more costly than the occasional stall when crossing a cache-line.
-*/
-static LJ_AINLINE uint16_t lj_getu16(const void *v)
-{
-  const uint8_t *p = (const uint8_t *)v;
-  return (uint16_t)((p[0]<<8) | p[1]);
-}
-static LJ_AINLINE uint32_t lj_getu32(const void *v)
-{
-  const uint8_t *p = (const uint8_t *)v;
-  return (uint32_t)((p[0]<<24) | (p[1]<<16) | (p[2]<<8) | p[3]);
-}
-#else
-/* Unaligned loads are generally ok on x86/x64. */
-#define lj_getu16(p)	(*(uint16_t *)(p))
-#define lj_getu32(p)	(*(uint32_t *)(p))
-#endif
-
-#else
-#error "missing defines for your compiler"
-#endif
-
-/* Optional defines. */
-#ifndef LJ_FASTCALL
-#define LJ_FASTCALL
-#endif
-#ifndef LJ_NORET
-#define LJ_NORET
-#endif
-#ifndef LJ_NOAPI
-#define LJ_NOAPI	extern
-#endif
-#ifndef LJ_LIKELY
-#define LJ_LIKELY(x)	(x)
-#define LJ_UNLIKELY(x)	(x)
-#endif
-
-/* Attributes for internal functions. */
-#define LJ_DATA		LJ_NOAPI
-#define LJ_DATADEF
-#define LJ_ASMF		LJ_NOAPI
-#define LJ_FUNCA	LJ_NOAPI
-#if defined(ljamalg_c)
-#define LJ_FUNC		static
-#else
-#define LJ_FUNC		LJ_NOAPI
-#endif
-#define LJ_FUNC_NORET	LJ_FUNC LJ_NORET
-#define LJ_FUNCA_NORET	LJ_FUNCA LJ_NORET
-#define LJ_ASMF_NORET	LJ_ASMF LJ_NORET
-
-/* Runtime assertions. */
-#ifdef lua_assert
-#define check_exp(c, e)		(lua_assert(c), (e))
-#define api_check(l, e)		lua_assert(e)
-#else
-#define lua_assert(c)		((void)0)
-#define check_exp(c, e)		(e)
-#define api_check		luai_apicheck
-#endif
-
-/* Static assertions. */
-#define LJ_ASSERT_NAME2(name, line)	name ## line
-#define LJ_ASSERT_NAME(line)		LJ_ASSERT_NAME2(lj_assert_, line)
-#ifdef __COUNTER__
-#define LJ_STATIC_ASSERT(cond) \
-  extern void LJ_ASSERT_NAME(__COUNTER__)(int STATIC_ASSERTION_FAILED[(cond)?1:-1])
-#else
-#define LJ_STATIC_ASSERT(cond) \
-  extern void LJ_ASSERT_NAME(__LINE__)(int STATIC_ASSERTION_FAILED[(cond)?1:-1])
-#endif
-
-#endif
diff --git a/core/src/luajit/autogen/msys/jit/i386/lj_ffdef.h b/core/src/luajit/autogen/msys/jit/i386/lj_ffdef.h
index c088875e6..b0bfe9de3 100644
--- a/core/src/luajit/autogen/msys/jit/i386/lj_ffdef.h
+++ b/core/src/luajit/autogen/msys/jit/i386/lj_ffdef.h
@@ -145,6 +145,7 @@ FFDEF(jit_on)
 FFDEF(jit_off)
 FFDEF(jit_flush)
 FFDEF(jit_status)
+FFDEF(jit_security)
 FFDEF(jit_attach)
 FFDEF(jit_util_funcinfo)
 FFDEF(jit_util_funcbc)
diff --git a/core/src/luajit/autogen/msys/jit/i386/lj_folddef.h b/core/src/luajit/autogen/msys/jit/i386/lj_folddef.h
index 6d12f3283..1d81eb807 100644
--- a/core/src/luajit/autogen/msys/jit/i386/lj_folddef.h
+++ b/core/src/luajit/autogen/msys/jit/i386/lj_folddef.h
@@ -5,6 +5,8 @@ static const FoldFunc fold_func[] = {
   fold_kfold_numabsneg,
   fold_kfold_ldexp,
   fold_kfold_fpmath,
+  fold_kfold_fpcall1,
+  fold_kfold_fpcall2,
   fold_kfold_numpow,
   fold_kfold_numcomp,
   fold_kfold_intarith,
@@ -63,7 +65,8 @@ static const FoldFunc fold_func[] = {
   fold_simplify_nummuldiv_k,
   fold_simplify_nummuldiv_negk,
   fold_simplify_nummuldiv_negneg,
-  fold_simplify_numpow_xk,
+  fold_simplify_numpow_xkint,
+  fold_simplify_numpow_xknum,
   fold_simplify_numpow_kx,
   fold_shortcut_conv_num_int,
   fold_simplify_conv_int_num,
@@ -106,11 +109,10 @@ static const FoldFunc fold_func[] = {
   fold_reassoc_intarith_k,
   fold_reassoc_intarith_k64,
   fold_reassoc_dup,
+  fold_reassoc_dup_minmax,
   fold_reassoc_bxor,
   fold_reassoc_shift,
   fold_reassoc_minmax_k,
-  fold_reassoc_minmax_left,
-  fold_reassoc_minmax_right,
   fold_abc_fwd,
   fold_abc_k,
   fold_abc_invar,
@@ -118,13 +120,14 @@ static const FoldFunc fold_func[] = {
   fold_comm_equal,
   fold_comm_comp,
   fold_comm_dup,
+  fold_comm_dup_minmax,
   fold_comm_bxor,
   fold_merge_eqne_snew_kgc,
   lj_opt_fwd_aload,
   fold_kfold_hload_kkptr,
   lj_opt_fwd_hload,
   lj_opt_fwd_uload,
-  lj_opt_fwd_tab_len,
+  lj_opt_fwd_alen,
   fold_cse_uref,
   lj_opt_fwd_hrefk,
   fold_fwd_href_tnew,
@@ -156,216 +159,320 @@ static const FoldFunc fold_func[] = {
   lj_ir_emit
 };
 
-static const uint32_t fold_hash[950] = {
-0x5654a7ff,
-0x0d58741d,
-0x25b45ed4,
-0x5c45fc17,
-0x0e487417,
+static const uint32_t fold_hash[1002] = {
+0x0f5a741d,
 0xffffffff,
 0xffffffff,
+0x6e4a9417,
 0xffffffff,
-0x4b6ffc17,
+0x634877ff,
+0x8775ffff,
 0xffffffff,
 0xffffffff,
+0x8789fc09,
+0x83894008,
 0xffffffff,
+0x644e5fff,
 0xffffffff,
-0x848bfc06,
+0x0c0c5c17,
+0x26b45e71,
 0xffffffff,
+0x0e52741d,
 0xffffffff,
 0xffffffff,
-0x7307ffff,
+0x66429417,
 0xffffffff,
 0xffffffff,
+0x586dffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x3111fc1b,
-0x5f4bfc21,
-0x1bc18c13,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x8c8bfc00,
+0x4db4a6ae,
+0x46b56a95,
+0x0c045c17,
+0x169dfc17,
+0x2cb4728e,
 0xffffffff,
-0x4ab4aa6e,
-0x139c6817,
 0xffffffff,
+0x30b85fff,
 0xffffffff,
 0xffffffff,
+0x7765ffff,
 0xffffffff,
-0x4ab4a66e,
 0xffffffff,
 0xffffffff,
-0x06485c17,
-0x7bc1fc1e,
 0xffffffff,
-0x1dc18c0f,
 0xffffffff,
+0x37408000,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x0e42741d,
+0x2253fc18,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x096e5c17,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x3468d000,
 0xffffffff,
-0x6744881d,
 0xffffffff,
+0x66429017,
+0x5d54a429,
 0xffffffff,
+0x8f89fc04,
 0xffffffff,
-0x1dc18c0b,
 0xffffffff,
-0x6544841d,
-0x0510701c,
-0x40b569d3,
 0xffffffff,
+0x6a44881d,
+0x08665c17,
+0x5855ffff,
+0x82754416,
+0x624bfc21,
+0x86894409,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0x0712701c,
+0xffffffff,
+0x6b4287ff,
+0xffffffff,
+0x085e5c17,
+0x27b45ed4,
+0xffffffff,
+0x0d0bfc17,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0x9bbfffff,
+0x10507417,
+0xffffffff,
+0xffffffff,
+0x070a701c,
+0x5557fc1d,
+0xffffffff,
+0xffffffff,
+0x08565c17,
+0x7645ffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0x6844841d,
+0x10487417,
+0x817543ff,
+0x0702701c,
+0xffffffff,
+0x84894009,
+0xffffffff,
+0x084e5c17,
+0xffffffff,
+0x26b45e72,
+0xffffffff,
+0x7f7863ff,
+0x7c85fc00,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0x4e6dfc17,
+0xffffffff,
+0x6047fc1d,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0x08465c17,
+0x46b56a96,
+0x4bb4ae95,
+0xffffffff,
+0x79113818,
+0x01607044,
+0xffffffff,
+0xffffffff,
+0x1dc18c09,
+0xffffffff,
+0xffffffff,
+0x2152681d,
+0x3312741d,
+0xffffffff,
+0x67428817,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x4e5477ff,
 0xffffffff,
 0xffffffff,
 0x0064701c,
-0x917bffff,
-0x48b4ae95,
 0xffffffff,
-0x0a145c17,
+0x2253fc19,
+0xffffffff,
 0xffffffff,
-0x98a5ffff,
-0x47b5feb3,
-0x48b4aa95,
+0x9b9fffff,
 0xffffffff,
+0x405dfc17,
+0x130a741d,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x0c44741d,
-0x06685c17,
-0x48b4a695,
+0x3468d001,
 0xffffffff,
+0x3213101b,
 0xffffffff,
 0xffffffff,
+0x12407400,
+0x065c701c,
 0xffffffff,
 0xffffffff,
-0x535bfc17,
+0x654a8417,
+0x9897ffff,
+0x47b569ae,
+0x5055fc17,
+0x1302741d,
+0x4bb4aa95,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x3d56bc2f,
+0x2ab47675,
 0xffffffff,
 0xffffffff,
+0x2eb472ce,
+0x0054701c,
+0x8a897000,
+0x2152641d,
+0x8b88600e,
+0x69428417,
+0x5c55fc29,
+0x8f8fffff,
+0x0a3e5c00,
+0x614dfc17,
+0x6e4c9817,
 0xffffffff,
 0xffffffff,
+0x6956ac17,
 0xffffffff,
+0x7215ffff,
 0xffffffff,
 0xffffffff,
-0x31106018,
-0x4e545fff,
-0x0506701c,
 0xffffffff,
-0x3b57fc1c,
+0x33106fff,
 0xffffffff,
 0xffffffff,
-0x7547ffff,
-0x29b4726e,
-0x604a77ff,
-0x6b66cc1c,
 0xffffffff,
-0x7171ffff,
 0xffffffff,
 0xffffffff,
-0x0a0a5c17,
+0x5f45fc17,
 0xffffffff,
-0x979bffff,
-0x24b45e72,
-0x3110741d,
 0xffffffff,
 0xffffffff,
-0x8c8bfc10,
-0x98c5ffff,
 0xffffffff,
-0x065e5c17,
 0xffffffff,
 0xffffffff,
+0x750dffff,
 0xffffffff,
-0x6a4a9417,
 0xffffffff,
 0xffffffff,
-0x5e51fc17,
 0xffffffff,
 0xffffffff,
+0x4bb4a695,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x3d59fc1c,
+0x23b6701c,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x2052601d,
 0xffffffff,
+0x7505ffff,
 0xffffffff,
+0x0f5c741d,
+0x3560c044,
+0x44b56a8e,
 0xffffffff,
-0x604a5fff,
+0x928a6bff,
+0x634a77ff,
+0x9b77ffff,
+0x05bd8c3b,
+0x88886000,
+0x4bb4ae96,
 0xffffffff,
-0x7213ffff,
-0x25b45eb4,
 0xffffffff,
+0x64505fff,
 0xffffffff,
+0x0c0e5c17,
+0x1fc18c0a,
 0xffffffff,
+0x0e54741d,
 0xffffffff,
 0xffffffff,
-0x624a8417,
-0x28b47695,
 0xffffffff,
-0x7467ffff,
 0xffffffff,
+0x1dc18c13,
+0x736fffff,
+0x19bd8c00,
 0xffffffff,
-0x0a005c17,
-0x848bfc08,
-0x8c91ffff,
 0xffffffff,
-0x1106741d,
-0x036a73ff,
+0x6a468c1d,
 0xffffffff,
+0x63485fff,
+0x2253fc1a,
+0x0c065c17,
+0x3311fc1b,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x06545c17,
 0xffffffff,
 0xffffffff,
-0x5257fc1d,
-0x0d5a741d,
 0xffffffff,
 0xffffffff,
-0x5d47fc17,
-0x0e4a7417,
+0x7767ffff,
+0x3468d002,
 0xffffffff,
-0x8c8bfc04,
+0x6b448bff,
+0x94affc00,
+0x28b475d5,
+0x3660bc44,
 0xffffffff,
-0x4c71fc17,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x0e44741d,
+0x82754418,
 0xffffffff,
+0x4bb4aa96,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x4ab5fed3,
+0x04bc73ff,
 0xffffffff,
-0x7309ffff,
-0x8c8bfc11,
 0xffffffff,
 0xffffffff,
-0x466b6800,
 0xffffffff,
-0x3113fc1b,
-0x5f4dfc21,
-0x466b6802,
-0x3753fc2f,
 0xffffffff,
+0x8c88600f,
+0x5b55fc2a,
 0xffffffff,
 0xffffffff,
 0xffffffff,
@@ -373,12 +480,14 @@ static const uint32_t fold_hash[950] = {
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x7357ffff,
 0xffffffff,
+0x7115fc17,
+0x624dfc21,
+0x43b569d3,
 0xffffffff,
-0x91b1ffff,
 0xffffffff,
 0xffffffff,
-0x064a5c17,
 0xffffffff,
 0xffffffff,
 0xffffffff,
@@ -386,728 +495,674 @@ static const uint32_t fold_hash[950] = {
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x48b4ae75,
 0xffffffff,
+0x7015fc29,
+0x24b45dd3,
 0xffffffff,
 0xffffffff,
-0x67468c1d,
 0xffffffff,
-0x48b4aa75,
-0x848bfc09,
 0xffffffff,
-0x6656ac17,
-0x8a8b4c0e,
-0x878b7000,
-0x48b4a675,
+0x3b54bc1c,
 0xffffffff,
 0xffffffff,
+0x4bb4a696,
+0x9bc1ffff,
 0xffffffff,
-0x8a8b480e,
-0x0512701c,
-0x2fba6000,
-0x1cc18c16,
 0xffffffff,
+0x070c701c,
 0xffffffff,
 0xffffffff,
-0x7153ffff,
 0xffffffff,
 0xffffffff,
+0x7847ffff,
+0x49696800,
 0xffffffff,
-0x0066701c,
+0x02627017,
+0x95af4400,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x104a7417,
 0xffffffff,
 0xffffffff,
+0x0704701c,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x08505c17,
 0xffffffff,
 0xffffffff,
-0x5b43fc1d,
-0x0c46741d,
+0x1fc18c0b,
+0x7f7a63ff,
+0x7d87fc00,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x78866800,
-0x8c8bfc01,
+0x94b1ffff,
+0x1dc18c14,
+0x4f6ffc17,
 0xffffffff,
 0xffffffff,
-0x3e5dfc17,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x3d58bc2f,
-0x6d69fc33,
+0x08485c17,
 0xffffffff,
 0xffffffff,
-0x1dc18c0e,
 0xffffffff,
+0x79133818,
 0xffffffff,
 0xffffffff,
-0x31126018,
-0x0508701c,
 0xffffffff,
 0xffffffff,
-0x3b59fc1c,
-0x6b68d01c,
+0x9ba9ffff,
+0x31ba6000,
 0xffffffff,
+0x27b45eb3,
 0xffffffff,
-0x614c77ff,
+0x69448817,
+0x29b475d6,
 0xffffffff,
 0xffffffff,
-0x24b45e70,
-0x7f774416,
+0x6e4e9c17,
+0x95af4000,
 0xffffffff,
-0x98a3fc00,
-0x0a0c5c17,
-0x1dc18c0a,
+0x0066701c,
+0x45b56ace,
 0xffffffff,
 0xffffffff,
-0x3112741d,
 0xffffffff,
+0x9ba1ffff,
 0xffffffff,
 0xffffffff,
-0x6a4c9817,
-0x28b47675,
+0x130c741d,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x684287ff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x4b53fc17,
+0x8c886010,
 0xffffffff,
-0x868b3800,
+0x3852bfff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x9999ffff,
 0xffffffff,
+0x5457fc17,
+0x1304741d,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x614c5fff,
-0x6752a41d,
-0x7015ffff,
+0x187f3bff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x0056701c,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x67448417,
+0x7e91ffff,
+0x25b45dd4,
+0x0b405c00,
+0x614ffc17,
+0x46b56a75,
+0x48b7681c,
 0xffffffff,
+0x2bb4726e,
 0xffffffff,
-0x0052701c,
-0x7469ffff,
+0x9b17ffff,
 0xffffffff,
 0xffffffff,
-0x0a025c17,
 0xffffffff,
-0x9493ffff,
-0x898a600f,
-0x1108741d,
+0x33126fff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x9089ffff,
 0xffffffff,
-0x15806017,
-0x06565c17,
-0x015e7045,
+0x6047fc17,
+0x49696801,
 0xffffffff,
 0xffffffff,
-0x63429417,
-0x0d5c741d,
 0xffffffff,
-0x5e49fc17,
-0x0e4c7417,
 0xffffffff,
-0x63429017,
-0x24b45e71,
-0x353e7c00,
-0x3011141b,
 0xffffffff,
+0x750fffff,
 0xffffffff,
 0xffffffff,
-0x149dfc17,
 0xffffffff,
 0xffffffff,
+0x6a52a41d,
 0xffffffff,
-0x730bffff,
-0x64428817,
+0x515477ff,
+0x21526817,
 0xffffffff,
-0x0f3e7400,
 0xffffffff,
 0xffffffff,
+0x1fc18c0c,
 0xffffffff,
-0x66428417,
-0x5f4ffc21,
-0x3a55fc2f,
+0x575a5fff,
 0xffffffff,
 0xffffffff,
+0x7507ffff,
+0x6d468fff,
+0x1dc18c15,
+0x9bb20000,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x8b8b4c10,
+0x644c77ff,
+0x9479ffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x6c64cbff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x33105c17,
 0xffffffff,
-0x064c5c17,
+0x425c73ff,
+0x0e56741d,
 0xffffffff,
-0x6f15fc17,
+0x27b45eb4,
 0xffffffff,
-0x0c52741d,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x3954bc1c,
 0xffffffff,
-0x8f8c6bff,
-0x42b56ace,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x083e5c00,
+0x634a5fff,
 0xffffffff,
-0x3360c045,
-0x1bc18c14,
+0x0c085c17,
+0x3313fc1b,
 0xffffffff,
-0x7301ffff,
-0x1f52681d,
-0x326ad400,
-0x3460bc45,
-0x326ad402,
-0x932bffff,
+0x21526417,
 0xffffffff,
-0x1f52641d,
 0xffffffff,
 0xffffffff,
-0x5555ffff,
 0xffffffff,
-0x7785fc00,
-0x1e52601d,
-0x0068701c,
-0x7f77441c,
 0xffffffff,
-0x91affc00,
 0xffffffff,
 0xffffffff,
-0x98a9ffff,
-0x828b4408,
 0xffffffff,
-0x06425c17,
-0x466b6801,
-0x0b0bfc17,
-0x5c45fc1d,
-0x808b4008,
-0x076c5c17,
+0x8c886011,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x7f774418,
+0x0c005c17,
 0xffffffff,
-0x5a54a429,
-0x1dc18c0c,
 0xffffffff,
+0x0e46741d,
 0xffffffff,
-0x8b8b4c11,
 0xffffffff,
 0xffffffff,
+0x8d894c0e,
 0xffffffff,
 0xffffffff,
-0x22b45dd3,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x050a701c,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x614e77ff,
-0x44b569ae,
 0xffffffff,
-0x45b7681c,
-0x7d75ffff,
 0xffffffff,
 0xffffffff,
-0x0a0e5c17,
+0x46b56a76,
+0x4bb4ae75,
 0xffffffff,
-0x6a4e9c17,
-0x989fffff,
-0x1bc18c15,
+0x096a5c17,
 0xffffffff,
 0xffffffff,
-0x68448bff,
+0x624ffc21,
+0x8f89fc0e,
 0xffffffff,
+0x20526017,
 0xffffffff,
+0x33106018,
+0x159c6817,
 0xffffffff,
 0xffffffff,
-0x6d67fc34,
 0xffffffff,
+0x49696802,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x4d55fc17,
-0x43b56a96,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x3e56bc1c,
 0xffffffff,
 0xffffffff,
-0x838b4409,
+0x9bc3ffff,
+0x8d89480e,
 0xffffffff,
-0x614e5fff,
-0x0500701c,
-0x9817ffff,
 0xffffffff,
-0x818b4009,
+0x070e701c,
 0xffffffff,
+0x1fc18c0d,
 0xffffffff,
+0x085a5c17,
 0xffffffff,
 0xffffffff,
-0x624e8417,
+0x69468c17,
 0xffffffff,
-0x0054701c,
+0x1ec18c16,
 0xffffffff,
-0x1dc18c0d,
+0x6e50a017,
 0xffffffff,
-0x0a045c17,
+0x4bb4aa75,
+0x104c7417,
+0x4db6a81c,
 0xffffffff,
-0x9495ffff,
+0x0706701c,
+0x5253fc1d,
+0x6f64c817,
+0x2db472ae,
+0x08525c17,
 0xffffffff,
-0x110a741d,
 0xffffffff,
 0xffffffff,
-0x98bfffff,
+0x065c7017,
+0x8f89fc00,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x01607045,
-0x41b56a8e,
 0xffffffff,
+0x3953fc2f,
 0xffffffff,
-0x2053fc1a,
-0x35408000,
-0x5e4bfc17,
-0x1bc18c09,
-0x0e4e7417,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x3013141b,
 0xffffffff,
-0x25b45ed3,
 0xffffffff,
+0x084a5c17,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x730dffff,
-0x66448817,
 0xffffffff,
-0x10407400,
 0xffffffff,
-0x42b56aae,
 0xffffffff,
-0x64448417,
-0x5f51fc21,
 0xffffffff,
+0x1babffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x31106fff,
+0x5e43fc1d,
 0xffffffff,
-0x8d8bffff,
 0xffffffff,
-0x1100741d,
 0xffffffff,
+0x08425c17,
 0xffffffff,
-0x49b5ffff,
 0xffffffff,
+0x4bb4a675,
+0x4db6a41c,
 0xffffffff,
-0x064e5c17,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x0c54741d,
-0x2db873ff,
+0x8e894c0f,
 0xffffffff,
 0xffffffff,
+0x130e741d,
 0xffffffff,
-0x3c56bc1c,
-0x888a600e,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x44b56a6e,
 0xffffffff,
 0xffffffff,
-0x09405c00,
 0xffffffff,
 0xffffffff,
+0x7b846800,
 0xffffffff,
+0x8789fc06,
+0x654e8417,
+0x4bb4ae76,
+0x9a9bffff,
 0xffffffff,
-0x7303ffff,
+0x1306741d,
 0xffffffff,
+0x8f89fc0f,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x0058701c,
 0xffffffff,
 0xffffffff,
-0x7157ffff,
-0x6c66d3ff,
-0x98b20000,
-0x7987fc00,
-0x2eb85fff,
 0xffffffff,
-0x6866cfff,
 0xffffffff,
+0x9793ffff,
 0xffffffff,
+0x6151fc17,
 0xffffffff,
-0x19abffff,
 0xffffffff,
 0xffffffff,
-0x06445c17,
 0xffffffff,
 0xffffffff,
-0x5d47fc1d,
 0xffffffff,
-0x076e5c17,
 0xffffffff,
+0x6c66cfff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x1fc18c0e,
+0x938bffff,
 0xffffffff,
+0x6149fc17,
 0xffffffff,
+0x3f56bc2f,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x7411ffff,
+0x4bb4aa76,
 0xffffffff,
-0x02647017,
-0x858a6000,
 0xffffffff,
-0x5855fc2a,
 0xffffffff,
-0x545a5fff,
-0x050c701c,
+0x4ab5feb3,
 0xffffffff,
-0x27b475d6,
-0x43b56a76,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x615077ff,
+0x415dfc1c,
 0xffffffff,
 0xffffffff,
-0x6a50a017,
-0x8477ffff,
 0xffffffff,
+0x8f89fc01,
 0xffffffff,
-0x31105c17,
-0x69468fff,
-0x98a1ffff,
-0x326ad401,
 0xffffffff,
+0x7509ffff,
+0x1aab5056,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x644e77ff,
 0xffffffff,
 0xffffffff,
+0x3a55fc1c,
+0x8275441c,
 0xffffffff,
 0xffffffff,
+0x51545fff,
 0xffffffff,
+0x33125c17,
+0x7501ffff,
 0xffffffff,
-0x8c8bfc0f,
-0x5157fc17,
-0x6756ac1d,
+0x0f58741d,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x6b66cc17,
 0xffffffff,
+0x8073ffff,
 0xffffffff,
-0x41b56a6e,
 0xffffffff,
-0x7c7a63ff,
-0x61505fff,
-0x0502701c,
 0xffffffff,
+0x140bfc1d,
+0x4bb4a676,
+0x644c5fff,
 0xffffffff,
+0x0c0a5c17,
 0xffffffff,
+0x8e894c10,
 0xffffffff,
+0x2ab47695,
 0xffffffff,
-0x7443ffff,
 0xffffffff,
-0x62508417,
 0xffffffff,
-0x0056701c,
-0x25b45eb3,
-0x716dffff,
 0xffffffff,
-0x0a065c17,
+0x736bffff,
 0xffffffff,
-0x9597ffff,
 0xffffffff,
-0x110c741d,
 0xffffffff,
-0x92af4400,
-0x98c1ffff,
-0x2053fc18,
 0xffffffff,
-0x065a5c17,
-0x848bfc07,
-0x92af4000,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x0c025c17,
+0x8789fc07,
 0xffffffff,
-0x5e4dfc17,
-0x0e507417,
 0xffffffff,
 0xffffffff,
+0x26b45e6f,
 0xffffffff,
-0x3652bfff,
-0x76113818,
+0x8f89fc10,
 0xffffffff,
 0xffffffff,
-0x66468c17,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x730fffff,
 0xffffffff,
 0xffffffff,
-0x43b56a95,
 0xffffffff,
+0x6e489017,
 0xffffffff,
 0xffffffff,
-0x898a6010,
 0xffffffff,
+0x6952a417,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x096c5c17,
 0xffffffff,
-0x31126fff,
+0x2fb873ff,
+0x6251fc21,
+0x6f66cc17,
+0x9ba3fc00,
 0xffffffff,
-0x908dffff,
 0xffffffff,
-0x1102741d,
+0x33126018,
 0xffffffff,
+0x1fc18c0f,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x4db4aa6e,
+0x89893800,
+0x6842881d,
+0x08645c17,
+0x45b56aae,
+0x7353ffff,
+0x6249fc21,
 0xffffffff,
-0x06505c17,
 0xffffffff,
+0x3e58bc1c,
 0xffffffff,
-0x4f53fc1d,
-0x0c56741d,
-0x4ab6a81c,
 0xffffffff,
-0x5b43fc17,
+0x9bc5ffff,
 0xffffffff,
-0x3c58bc1c,
 0xffffffff,
-0x4ab6a41c,
-0x4b6dfc17,
 0xffffffff,
+0x0710701c,
 0xffffffff,
 0xffffffff,
+0x373e7c00,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x48b4ae96,
-0x7305ffff,
-0x2cb472ce,
-0x2053fc19,
 0xffffffff,
 0xffffffff,
-0x48b4aa96,
 0xffffffff,
-0x5f49fc21,
-0x6e15fc29,
 0xffffffff,
-0x6868d3ff,
-0x48b4a696,
-0x7a89fc00,
 0xffffffff,
 0xffffffff,
+0x104e7417,
 0xffffffff,
-0x6c68cfff,
-0x3f5c73ff,
 0xffffffff,
+0x0708701c,
+0x5355fc1d,
 0xffffffff,
-0x1aadffff,
 0xffffffff,
+0x08545c17,
+0x7643ffff,
 0xffffffff,
-0x06465c17,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x07705c17,
 0xffffffff,
+0x4db4a66e,
+0x4cb5ffff,
+0x6a42841d,
+0x3c55fc2f,
 0xffffffff,
-0x898a6011,
+0x0700701c,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x084c5c17,
+0x6a56ac1d,
 0xffffffff,
 0xffffffff,
+0x8e894c11,
+0x7a83fc00,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x1cadffff,
 0xffffffff,
-0x6542881d,
+0x4e6bfc17,
 0xffffffff,
+0x5f45fc1d,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x08445c17,
+0x5a54abff,
+0x8789fc08,
 0xffffffff,
-0x6742841d,
-0x050e701c,
+0x375ebfff,
+0x015e7044,
 0xffffffff,
+0x26b45e70,
 0xffffffff,
+0x8f89fc11,
+0x9ba5ffff,
 0xffffffff,
-0x6652a417,
+0x3310741d,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x962bffff,
+0xffffffff,
+0xffffffff,
 0x0062701c,
-0x9879ffff,
 0xffffffff,
 0xffffffff,
-0x31125c17,
 0xffffffff,
+0x65508417,
 0xffffffff,
 0xffffffff,
+0x565bfc17,
+0x1308741d,
 0xffffffff,
-0x24b45e6f,
-0x4ab4aaae,
-0x21b6701c,
 0xffffffff,
-0x0c42741d,
-0x06665c17,
 0xffffffff,
-0x4ab4a6ae,
 0xffffffff,
 0xffffffff,
+0x3211101b,
 0xffffffff,
 0xffffffff,
-0x6b68d017,
-0x23b45dd4,
+0x113e7400,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x355ebfff,
+0x65488417,
+0x9795ffff,
 0xffffffff,
-0x045c7017,
+0x4e53fc17,
+0x5954a7ff,
+0x1300741d,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x7c7c63ff,
 0xffffffff,
-0x0504701c,
 0xffffffff,
-0x47b5fed3,
-0x3855fc1c,
 0xffffffff,
 0xffffffff,
-0x7445ffff,
-0x604877ff,
+0x0052701c,
 0xffffffff,
 0xffffffff,
-0x0058701c,
-0x556fffff,
-0x18ab5056,
 0xffffffff,
-0x0a085c17,
-0x5955fc29,
-0x9699ffff,
-0x120bfc1d,
-0x110e741d,
-0x26b475d5,
-0x43b56a75,
-0x98c3ffff,
+0xffffffff,
+0x918dffff,
+0xffffffff,
+0x614bfc17,
+0xffffffff,
+0x3f58bc2f,
+0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x7413ffff,
+0x85894408,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x5e4ffc17,
 0xffffffff,
 0xffffffff,
-0x6a489017,
-0x2ab4728e,
-0x16813bff,
-0x76133818,
+0x5e43fc17,
 0xffffffff,
 0xffffffff,
+0x177e6017,
 0xffffffff,
+0x27b45ed3,
 0xffffffff,
+0x750bffff,
+0x036873ff,
 0xffffffff,
-0x60485fff,
 0xffffffff,
-0x7211ffff,
+0x4db4aaae,
 0xffffffff,
-0x8c8bfc0e,
 0xffffffff,
-0x17bd8c00,
-0x1f526817,
+0x645077ff,
 0xffffffff,
-0x62488417,
 0xffffffff,
+0x3d57fc1c,
 0xffffffff,
 0xffffffff,
-0x1f526417,
 0xffffffff,
 0xffffffff,
-0x48b4ae76,
-0x8e8fffff,
-0x2bb472ae,
-0x1104741d,
-0x1e526017,
 0xffffffff,
-0x48b4aa76,
-0x5754abff,
+0x0c145c17,
+0x7503ffff,
 0xffffffff,
-0x06525c17,
-0x7e7743ff,
-0x8b8b4c0f,
-0x5055fc1d,
-0x48b4a676
+0xffffffff
 };
 
-#define fold_hashkey(k)	(lj_rol(lj_rol((k),30)-(k),25)%949)
+#define fold_hashkey(k)	(lj_rol(lj_rol((k),21)-(k),1)%1001)
 
diff --git a/core/src/luajit/autogen/msys/jit/i386/lj_libdef.h b/core/src/luajit/autogen/msys/jit/i386/lj_libdef.h
index 2c9ec0605..3fbd44cbf 100644
--- a/core/src/luajit/autogen/msys/jit/i386/lj_libdef.h
+++ b/core/src/luajit/autogen/msys/jit/i386/lj_libdef.h
@@ -271,13 +271,14 @@ static const lua_CFunction lj_lib_cf_jit[] = {
   lj_cf_jit_off,
   lj_cf_jit_flush,
   lj_cf_jit_status,
+  lj_cf_jit_security,
   lj_cf_jit_attach
 };
 static const uint8_t lj_lib_init_jit[] = {
-143,57,9,2,111,110,3,111,102,102,5,102,108,117,115,104,6,115,116,97,116,117,
-115,6,97,116,116,97,99,104,252,5,194,111,115,250,252,4,196,97,114,99,104,250,
-252,3,203,118,101,114,115,105,111,110,95,110,117,109,250,252,2,199,118,101,
-114,115,105,111,110,250,255
+143,57,10,2,111,110,3,111,102,102,5,102,108,117,115,104,6,115,116,97,116,117,
+115,8,115,101,99,117,114,105,116,121,6,97,116,116,97,99,104,252,5,194,111,115,
+250,252,4,196,97,114,99,104,250,252,3,203,118,101,114,115,105,111,110,95,110,
+117,109,250,252,2,199,118,101,114,115,105,111,110,250,255
 };
 #endif
 
@@ -297,7 +298,7 @@ static const lua_CFunction lj_lib_cf_jit_util[] = {
   lj_cf_jit_util_ircalladdr
 };
 static const uint8_t lj_lib_init_jit_util[] = {
-148,57,11,8,102,117,110,99,105,110,102,111,6,102,117,110,99,98,99,5,102,117,
+149,57,11,8,102,117,110,99,105,110,102,111,6,102,117,110,99,98,99,5,102,117,
 110,99,107,10,102,117,110,99,117,118,110,97,109,101,9,116,114,97,99,101,105,
 110,102,111,7,116,114,97,99,101,105,114,6,116,114,97,99,101,107,9,116,114,97,
 99,101,115,110,97,112,7,116,114,97,99,101,109,99,13,116,114,97,99,101,101,120,
@@ -311,7 +312,7 @@ static const lua_CFunction lj_lib_cf_jit_opt[] = {
   lj_cf_jit_opt_start
 };
 static const uint8_t lj_lib_init_jit_opt[] = {
-159,57,1,5,115,116,97,114,116,255
+160,57,1,5,115,116,97,114,116,255
 };
 #endif
 
@@ -323,7 +324,7 @@ static const lua_CFunction lj_lib_cf_jit_profile[] = {
   lj_cf_jit_profile_dumpstack
 };
 static const uint8_t lj_lib_init_jit_profile[] = {
-160,57,3,5,115,116,97,114,116,4,115,116,111,112,9,100,117,109,112,115,116,97,
+161,57,3,5,115,116,97,114,116,4,115,116,111,112,9,100,117,109,112,115,116,97,
 99,107,255
 };
 #endif
@@ -351,7 +352,7 @@ static const lua_CFunction lj_lib_cf_ffi_meta[] = {
   lj_cf_ffi_meta___ipairs
 };
 static const uint8_t lj_lib_init_ffi_meta[] = {
-163,57,19,7,95,95,105,110,100,101,120,10,95,95,110,101,119,105,110,100,101,
+164,57,19,7,95,95,105,110,100,101,120,10,95,95,110,101,119,105,110,100,101,
 120,4,95,95,101,113,5,95,95,108,101,110,4,95,95,108,116,4,95,95,108,101,8,95,
 95,99,111,110,99,97,116,6,95,95,99,97,108,108,5,95,95,97,100,100,5,95,95,115,
 117,98,5,95,95,109,117,108,5,95,95,100,105,118,5,95,95,109,111,100,5,95,95,
@@ -369,7 +370,7 @@ static const lua_CFunction lj_lib_cf_ffi_clib[] = {
   lj_cf_ffi_clib___gc
 };
 static const uint8_t lj_lib_init_ffi_clib[] = {
-181,57,3,7,95,95,105,110,100,101,120,10,95,95,110,101,119,105,110,100,101,120,
+182,57,3,7,95,95,105,110,100,101,120,10,95,95,110,101,119,105,110,100,101,120,
 4,95,95,103,99,255
 };
 #endif
@@ -381,7 +382,7 @@ static const lua_CFunction lj_lib_cf_ffi_callback[] = {
   lj_cf_ffi_callback_set
 };
 static const uint8_t lj_lib_init_ffi_callback[] = {
-184,57,3,4,102,114,101,101,3,115,101,116,252,1,199,95,95,105,110,100,101,120,
+185,57,3,4,102,114,101,101,3,115,101,116,252,1,199,95,95,105,110,100,101,120,
 250,255
 };
 #endif
@@ -408,7 +409,7 @@ static const lua_CFunction lj_lib_cf_ffi[] = {
   lj_cf_ffi_load
 };
 static const uint8_t lj_lib_init_ffi[] = {
-186,57,23,4,99,100,101,102,3,110,101,119,4,99,97,115,116,6,116,121,112,101,
+187,57,23,4,99,100,101,102,3,110,101,119,4,99,97,115,116,6,116,121,112,101,
 111,102,8,116,121,112,101,105,110,102,111,6,105,115,116,121,112,101,6,115,105,
 122,101,111,102,7,97,108,105,103,110,111,102,8,111,102,102,115,101,116,111,
 102,5,101,114,114,110,111,6,115,116,114,105,110,103,4,99,111,112,121,4,102,
diff --git a/core/src/luajit/autogen/msys/jit/i386/lj_recdef.h b/core/src/luajit/autogen/msys/jit/i386/lj_recdef.h
index 8c76176bb..9e4eb1422 100644
--- a/core/src/luajit/autogen/msys/jit/i386/lj_recdef.h
+++ b/core/src/luajit/autogen/msys/jit/i386/lj_recdef.h
@@ -43,64 +43,65 @@ static const uint16_t recff_idmap[] = {
 0x1200+(IRFPM_FLOOR),
 0x1200+(IRFPM_CEIL),
 0x1300+(IRFPM_SQRT),
-0x1300+(IRFPM_LOG10),
-0x1300+(IRFPM_EXP),
-0x1300+(IRFPM_SIN),
-0x1300+(IRFPM_COS),
-0x1300+(IRFPM_TAN),
-0x1400+(FF_math_asin),
-0x1400+(FF_math_acos),
-0x1400+(FF_math_atan),
-0x1500+(IRCALL_sinh),
-0x1500+(IRCALL_cosh),
-0x1500+(IRCALL_tanh),
-0,
+0x1400+(IRCALL_log10),
+0x1400+(IRCALL_exp),
+0x1400+(IRCALL_sin),
+0x1400+(IRCALL_cos),
+0x1400+(IRCALL_tan),
+0x1400+(IRCALL_asin),
+0x1400+(IRCALL_acos),
+0x1400+(IRCALL_atan),
+0x1400+(IRCALL_sinh),
+0x1400+(IRCALL_cosh),
+0x1400+(IRCALL_tanh),
+0,
+0,
+0x1500,
 0x1600,
 0x1700,
-0x1800,
-0x1900,
 0,
+0x1800,
+0x1900+(IR_MIN),
+0x1900+(IR_MAX),
 0x1a00,
-0x1b00+(IR_MIN),
-0x1b00+(IR_MAX),
-0x1c00,
-0,
-0x1d00,
-0x1e00+(IR_BNOT),
-0x1e00+(IR_BSWAP),
-0x1f00+(IR_BSHL),
-0x1f00+(IR_BSHR),
-0x1f00+(IR_BSAR),
-0x1f00+(IR_BROL),
-0x1f00+(IR_BROR),
-0x2000+(IR_BAND),
-0x2000+(IR_BOR),
-0x2000+(IR_BXOR),
+0,
+0x1b00,
+0x1c00+(IR_BNOT),
+0x1c00+(IR_BSWAP),
+0x1d00+(IR_BSHL),
+0x1d00+(IR_BSHR),
+0x1d00+(IR_BSAR),
+0x1d00+(IR_BROL),
+0x1d00+(IR_BROR),
+0x1e00+(IR_BAND),
+0x1e00+(IR_BOR),
+0x1e00+(IR_BXOR),
+0x1f00,
+0x2000+(0),
 0x2100,
-0x2200+(0),
-0x2300,
-0x2200+(1),
+0x2000+(1),
+0x2200,
+0x2300+(IRCALL_lj_buf_putstr_reverse),
+0x2300+(IRCALL_lj_buf_putstr_lower),
+0x2300+(IRCALL_lj_buf_putstr_upper),
+0,
 0x2400,
-0x2500+(IRCALL_lj_buf_putstr_reverse),
-0x2500+(IRCALL_lj_buf_putstr_lower),
-0x2500+(IRCALL_lj_buf_putstr_upper),
 0,
-0x2600,
 0,
 0,
 0,
+0x2500,
 0,
+0x2600,
 0x2700,
 0,
 0x2800,
 0x2900,
 0,
-0x2a00,
-0x2b00,
 0,
+0x2a00+(0),
+0x2b00+(0),
 0,
-0x2c00+(0),
-0x2d00+(0),
 0,
 0,
 0,
@@ -110,9 +111,9 @@ static const uint16_t recff_idmap[] = {
 0,
 0,
 0,
+0x2a00+(GCROOT_IO_OUTPUT),
+0x2b00+(GCROOT_IO_OUTPUT),
 0,
-0x2c00+(GCROOT_IO_OUTPUT),
-0x2d00+(GCROOT_IO_OUTPUT),
 0,
 0,
 0,
@@ -128,8 +129,8 @@ static const uint16_t recff_idmap[] = {
 0,
 0,
 0,
+0x2c00,
 0,
-0x2e00,
 0,
 0,
 0,
@@ -164,45 +165,45 @@ static const uint16_t recff_idmap[] = {
 0,
 0,
 0,
-0x2f00+(0),
-0x2f00+(1),
-0x3000+(MM_eq),
-0x3000+(MM_len),
-0x3000+(MM_lt),
-0x3000+(MM_le),
-0x3000+(MM_concat),
-0x3100,
-0x3000+(MM_add),
-0x3000+(MM_sub),
-0x3000+(MM_mul),
-0x3000+(MM_div),
-0x3000+(MM_mod),
-0x3000+(MM_pow),
-0x3000+(MM_unm),
+0x2d00+(0),
+0x2d00+(1),
+0x2e00+(MM_eq),
+0x2e00+(MM_len),
+0x2e00+(MM_lt),
+0x2e00+(MM_le),
+0x2e00+(MM_concat),
+0x2f00,
+0x2e00+(MM_add),
+0x2e00+(MM_sub),
+0x2e00+(MM_mul),
+0x2e00+(MM_div),
+0x2e00+(MM_mod),
+0x2e00+(MM_pow),
+0x2e00+(MM_unm),
 0,
 0,
 0,
-0x3200+(1),
-0x3200+(0),
+0x3000+(1),
+0x3000+(0),
 0,
 0,
 0,
 0,
-0x3300,
-0x3300,
-0x3400,
+0x3100,
+0x3100,
+0x3200,
 0,
+0x3300,
+0x3400+(FF_ffi_sizeof),
+0x3400+(FF_ffi_alignof),
+0x3400+(FF_ffi_offsetof),
 0x3500,
-0x3600+(FF_ffi_sizeof),
-0x3600+(FF_ffi_alignof),
-0x3600+(FF_ffi_offsetof),
+0x3600,
 0x3700,
 0x3800,
 0x3900,
-0x3a00,
-0x3b00,
 0,
-0x3c00
+0x3a00
 };
 
 static const RecordFunc recff_func[] = {
@@ -226,9 +227,7 @@ recff_xpcall,
 recff_math_abs,
 recff_math_round,
 recff_math_unary,
-recff_math_atrig,
-recff_math_htrig,
-recff_math_modf,
+recff_math_call,
 recff_math_log,
 recff_math_atan2,
 recff_math_pow,
diff --git a/core/src/luajit/autogen/msys/jit/i386/lj_vm.o b/core/src/luajit/autogen/msys/jit/i386/lj_vm.o
index bf42d8ec5..e3ab17127 100644
Binary files a/core/src/luajit/autogen/msys/jit/i386/lj_vm.o and b/core/src/luajit/autogen/msys/jit/i386/lj_vm.o differ
diff --git a/core/src/luajit/autogen/msys/jit/x86_64/lj_bcdef.h b/core/src/luajit/autogen/msys/jit/x86_64/lj_bcdef.h
index e367d5b59..b839f2426 100644
--- a/core/src/luajit/autogen/msys/jit/x86_64/lj_bcdef.h
+++ b/core/src/luajit/autogen/msys/jit/x86_64/lj_bcdef.h
@@ -2,159 +2,159 @@
 
 LJ_DATADEF const uint16_t lj_bc_ofs[] = {
 0,
-71,
-142,
-213,
-284,
-422,
-563,
-624,
-685,
-752,
-819,
-871,
-922,
-972,
-1022,
-1062,
-1102,
-1129,
-1160,
-1185,
-1216,
-1275,
-1348,
-1400,
-1452,
-1504,
-1556,
-1613,
-1665,
-1717,
-1769,
-1821,
-1856,
-1922,
-1988,
-2054,
-2120,
-2169,
-2248,
-2325,
-2359,
-2393,
-2422,
-2449,
-2473,
-2515,
-2550,
-2633,
-2712,
-2748,
-2781,
-2831,
-2894,
-3002,
-3091,
-3108,
-3125,
-3272,
-3394,
-3492,
-3545,
-3715,
-3944,
-4065,
-4199,
-4283,
-4328,
-4369,
-4373,
-4514,
-4581,
-4733,
-4913,
-5000,
-5004,
-5129,
-5217,
-5318,
-5414,
-5518,
-5537,
-5606,
-5672,
-5691,
-5734,
-5772,
-5791,
-5808,
-5929,
-5953,
-5972,
+91,
+182,
+273,
+364,
+513,
+665,
+744,
+823,
+899,
+975,
+1034,
+1092,
+1147,
+1202,
+1250,
+1298,
+1332,
+1368,
+1394,
+1443,
+1499,
+1589,
+1646,
+1703,
+1760,
+1817,
+1879,
+1936,
+1993,
+2050,
+2107,
+2146,
+2221,
+2296,
+2371,
+2446,
+2503,
+2593,
+2678,
+2720,
+2762,
+2792,
+2820,
+2849,
+2899,
+2946,
+3054,
+3157,
+3205,
+3254,
+3312,
+3396,
+3519,
+3624,
+3652,
+3680,
+3844,
+3989,
+4093,
+4157,
+4351,
+4604,
+4738,
+4901,
+4995,
+5059,
+5119,
+5123,
+5314,
+5398,
+5554,
+5765,
+5878,
+5882,
 6033,
-6086,
-6086,
-6203,
-6204,
-6286,
-8042,
-8109,
-8612,
-8716,
-8773,
-8904,
-8175,
-8335,
-8425,
-8478,
-8509,
-8962,
-9002,
-9622,
-9057,
-9366,
-9674,
-9800,
-9824,
-9851,
-9922,
-9962,
-10002,
-10042,
-10082,
-10122,
-10162,
-10202,
-10242,
-10282,
-10322,
-10585,
-10733,
-9882,
-10420,
-10362,
-10478,
-10536,
-10832,
-10891,
-11531,
-11929,
-11876,
-11998,
+6140,
+6261,
+6375,
+6497,
+6516,
+6590,
+6660,
+6679,
+6722,
+6759,
+6778,
+6796,
+6925,
+6951,
+6970,
+7037,
+7095,
+7095,
+7229,
+7230,
+7337,
+9460,
+9537,
+10159,
+10292,
+10390,
+10553,
+9608,
+9792,
+9917,
+9993,
+10035,
+10651,
+10714,
+11485,
+10768,
+11160,
+11533,
+11696,
+11724,
+11578,
+11801,
+11847,
+11893,
+11939,
+11985,
+12031,
 12077,
-12159,
-12241,
-12323,
-11585,
-11682,
-11779,
-10950,
-10997,
-11118,
-11285,
-11367,
-11449
+12123,
+12169,
+12215,
+12261,
+12579,
+12657,
+11755,
+12376,
+12307,
+12445,
+12514,
+12721,
+12798,
+13587,
+14023,
+13966,
+14095,
+14183,
+14274,
+14365,
+14456,
+13645,
+13752,
+13859,
+12875,
+12939,
+13075,
+13254,
+13365,
+13476
 };
 
 LJ_DATADEF const uint16_t lj_bc_mode[] = {
diff --git a/core/src/luajit/autogen/msys/jit/x86_64/lj_ffdef.h b/core/src/luajit/autogen/msys/jit/x86_64/lj_ffdef.h
index c088875e6..b0bfe9de3 100644
--- a/core/src/luajit/autogen/msys/jit/x86_64/lj_ffdef.h
+++ b/core/src/luajit/autogen/msys/jit/x86_64/lj_ffdef.h
@@ -145,6 +145,7 @@ FFDEF(jit_on)
 FFDEF(jit_off)
 FFDEF(jit_flush)
 FFDEF(jit_status)
+FFDEF(jit_security)
 FFDEF(jit_attach)
 FFDEF(jit_util_funcinfo)
 FFDEF(jit_util_funcbc)
diff --git a/core/src/luajit/autogen/msys/jit/x86_64/lj_folddef.h b/core/src/luajit/autogen/msys/jit/x86_64/lj_folddef.h
index 6d12f3283..1d81eb807 100644
--- a/core/src/luajit/autogen/msys/jit/x86_64/lj_folddef.h
+++ b/core/src/luajit/autogen/msys/jit/x86_64/lj_folddef.h
@@ -5,6 +5,8 @@ static const FoldFunc fold_func[] = {
   fold_kfold_numabsneg,
   fold_kfold_ldexp,
   fold_kfold_fpmath,
+  fold_kfold_fpcall1,
+  fold_kfold_fpcall2,
   fold_kfold_numpow,
   fold_kfold_numcomp,
   fold_kfold_intarith,
@@ -63,7 +65,8 @@ static const FoldFunc fold_func[] = {
   fold_simplify_nummuldiv_k,
   fold_simplify_nummuldiv_negk,
   fold_simplify_nummuldiv_negneg,
-  fold_simplify_numpow_xk,
+  fold_simplify_numpow_xkint,
+  fold_simplify_numpow_xknum,
   fold_simplify_numpow_kx,
   fold_shortcut_conv_num_int,
   fold_simplify_conv_int_num,
@@ -106,11 +109,10 @@ static const FoldFunc fold_func[] = {
   fold_reassoc_intarith_k,
   fold_reassoc_intarith_k64,
   fold_reassoc_dup,
+  fold_reassoc_dup_minmax,
   fold_reassoc_bxor,
   fold_reassoc_shift,
   fold_reassoc_minmax_k,
-  fold_reassoc_minmax_left,
-  fold_reassoc_minmax_right,
   fold_abc_fwd,
   fold_abc_k,
   fold_abc_invar,
@@ -118,13 +120,14 @@ static const FoldFunc fold_func[] = {
   fold_comm_equal,
   fold_comm_comp,
   fold_comm_dup,
+  fold_comm_dup_minmax,
   fold_comm_bxor,
   fold_merge_eqne_snew_kgc,
   lj_opt_fwd_aload,
   fold_kfold_hload_kkptr,
   lj_opt_fwd_hload,
   lj_opt_fwd_uload,
-  lj_opt_fwd_tab_len,
+  lj_opt_fwd_alen,
   fold_cse_uref,
   lj_opt_fwd_hrefk,
   fold_fwd_href_tnew,
@@ -156,216 +159,320 @@ static const FoldFunc fold_func[] = {
   lj_ir_emit
 };
 
-static const uint32_t fold_hash[950] = {
-0x5654a7ff,
-0x0d58741d,
-0x25b45ed4,
-0x5c45fc17,
-0x0e487417,
+static const uint32_t fold_hash[1002] = {
+0x0f5a741d,
 0xffffffff,
 0xffffffff,
+0x6e4a9417,
 0xffffffff,
-0x4b6ffc17,
+0x634877ff,
+0x8775ffff,
 0xffffffff,
 0xffffffff,
+0x8789fc09,
+0x83894008,
 0xffffffff,
+0x644e5fff,
 0xffffffff,
-0x848bfc06,
+0x0c0c5c17,
+0x26b45e71,
 0xffffffff,
+0x0e52741d,
 0xffffffff,
 0xffffffff,
-0x7307ffff,
+0x66429417,
 0xffffffff,
 0xffffffff,
+0x586dffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x3111fc1b,
-0x5f4bfc21,
-0x1bc18c13,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x8c8bfc00,
+0x4db4a6ae,
+0x46b56a95,
+0x0c045c17,
+0x169dfc17,
+0x2cb4728e,
 0xffffffff,
-0x4ab4aa6e,
-0x139c6817,
 0xffffffff,
+0x30b85fff,
 0xffffffff,
 0xffffffff,
+0x7765ffff,
 0xffffffff,
-0x4ab4a66e,
 0xffffffff,
 0xffffffff,
-0x06485c17,
-0x7bc1fc1e,
 0xffffffff,
-0x1dc18c0f,
 0xffffffff,
+0x37408000,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x0e42741d,
+0x2253fc18,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x096e5c17,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x3468d000,
 0xffffffff,
-0x6744881d,
 0xffffffff,
+0x66429017,
+0x5d54a429,
 0xffffffff,
+0x8f89fc04,
 0xffffffff,
-0x1dc18c0b,
 0xffffffff,
-0x6544841d,
-0x0510701c,
-0x40b569d3,
 0xffffffff,
+0x6a44881d,
+0x08665c17,
+0x5855ffff,
+0x82754416,
+0x624bfc21,
+0x86894409,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0x0712701c,
+0xffffffff,
+0x6b4287ff,
+0xffffffff,
+0x085e5c17,
+0x27b45ed4,
+0xffffffff,
+0x0d0bfc17,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0x9bbfffff,
+0x10507417,
+0xffffffff,
+0xffffffff,
+0x070a701c,
+0x5557fc1d,
+0xffffffff,
+0xffffffff,
+0x08565c17,
+0x7645ffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0x6844841d,
+0x10487417,
+0x817543ff,
+0x0702701c,
+0xffffffff,
+0x84894009,
+0xffffffff,
+0x084e5c17,
+0xffffffff,
+0x26b45e72,
+0xffffffff,
+0x7f7863ff,
+0x7c85fc00,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0x4e6dfc17,
+0xffffffff,
+0x6047fc1d,
+0xffffffff,
+0xffffffff,
+0xffffffff,
+0x08465c17,
+0x46b56a96,
+0x4bb4ae95,
+0xffffffff,
+0x79113818,
+0x01607044,
+0xffffffff,
+0xffffffff,
+0x1dc18c09,
+0xffffffff,
+0xffffffff,
+0x2152681d,
+0x3312741d,
+0xffffffff,
+0x67428817,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x4e5477ff,
 0xffffffff,
 0xffffffff,
 0x0064701c,
-0x917bffff,
-0x48b4ae95,
 0xffffffff,
-0x0a145c17,
+0x2253fc19,
+0xffffffff,
 0xffffffff,
-0x98a5ffff,
-0x47b5feb3,
-0x48b4aa95,
+0x9b9fffff,
 0xffffffff,
+0x405dfc17,
+0x130a741d,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x0c44741d,
-0x06685c17,
-0x48b4a695,
+0x3468d001,
 0xffffffff,
+0x3213101b,
 0xffffffff,
 0xffffffff,
+0x12407400,
+0x065c701c,
 0xffffffff,
 0xffffffff,
-0x535bfc17,
+0x654a8417,
+0x9897ffff,
+0x47b569ae,
+0x5055fc17,
+0x1302741d,
+0x4bb4aa95,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x3d56bc2f,
+0x2ab47675,
 0xffffffff,
 0xffffffff,
+0x2eb472ce,
+0x0054701c,
+0x8a897000,
+0x2152641d,
+0x8b88600e,
+0x69428417,
+0x5c55fc29,
+0x8f8fffff,
+0x0a3e5c00,
+0x614dfc17,
+0x6e4c9817,
 0xffffffff,
 0xffffffff,
+0x6956ac17,
 0xffffffff,
+0x7215ffff,
 0xffffffff,
 0xffffffff,
-0x31106018,
-0x4e545fff,
-0x0506701c,
 0xffffffff,
-0x3b57fc1c,
+0x33106fff,
 0xffffffff,
 0xffffffff,
-0x7547ffff,
-0x29b4726e,
-0x604a77ff,
-0x6b66cc1c,
 0xffffffff,
-0x7171ffff,
 0xffffffff,
 0xffffffff,
-0x0a0a5c17,
+0x5f45fc17,
 0xffffffff,
-0x979bffff,
-0x24b45e72,
-0x3110741d,
 0xffffffff,
 0xffffffff,
-0x8c8bfc10,
-0x98c5ffff,
 0xffffffff,
-0x065e5c17,
 0xffffffff,
 0xffffffff,
+0x750dffff,
 0xffffffff,
-0x6a4a9417,
 0xffffffff,
 0xffffffff,
-0x5e51fc17,
 0xffffffff,
 0xffffffff,
+0x4bb4a695,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x3d59fc1c,
+0x23b6701c,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x2052601d,
 0xffffffff,
+0x7505ffff,
 0xffffffff,
+0x0f5c741d,
+0x3560c044,
+0x44b56a8e,
 0xffffffff,
-0x604a5fff,
+0x928a6bff,
+0x634a77ff,
+0x9b77ffff,
+0x05bd8c3b,
+0x88886000,
+0x4bb4ae96,
 0xffffffff,
-0x7213ffff,
-0x25b45eb4,
 0xffffffff,
+0x64505fff,
 0xffffffff,
+0x0c0e5c17,
+0x1fc18c0a,
 0xffffffff,
+0x0e54741d,
 0xffffffff,
 0xffffffff,
-0x624a8417,
-0x28b47695,
 0xffffffff,
-0x7467ffff,
 0xffffffff,
+0x1dc18c13,
+0x736fffff,
+0x19bd8c00,
 0xffffffff,
-0x0a005c17,
-0x848bfc08,
-0x8c91ffff,
 0xffffffff,
-0x1106741d,
-0x036a73ff,
+0x6a468c1d,
 0xffffffff,
+0x63485fff,
+0x2253fc1a,
+0x0c065c17,
+0x3311fc1b,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x06545c17,
 0xffffffff,
 0xffffffff,
-0x5257fc1d,
-0x0d5a741d,
 0xffffffff,
 0xffffffff,
-0x5d47fc17,
-0x0e4a7417,
+0x7767ffff,
+0x3468d002,
 0xffffffff,
-0x8c8bfc04,
+0x6b448bff,
+0x94affc00,
+0x28b475d5,
+0x3660bc44,
 0xffffffff,
-0x4c71fc17,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x0e44741d,
+0x82754418,
 0xffffffff,
+0x4bb4aa96,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x4ab5fed3,
+0x04bc73ff,
 0xffffffff,
-0x7309ffff,
-0x8c8bfc11,
 0xffffffff,
 0xffffffff,
-0x466b6800,
 0xffffffff,
-0x3113fc1b,
-0x5f4dfc21,
-0x466b6802,
-0x3753fc2f,
 0xffffffff,
+0x8c88600f,
+0x5b55fc2a,
 0xffffffff,
 0xffffffff,
 0xffffffff,
@@ -373,12 +480,14 @@ static const uint32_t fold_hash[950] = {
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x7357ffff,
 0xffffffff,
+0x7115fc17,
+0x624dfc21,
+0x43b569d3,
 0xffffffff,
-0x91b1ffff,
 0xffffffff,
 0xffffffff,
-0x064a5c17,
 0xffffffff,
 0xffffffff,
 0xffffffff,
@@ -386,728 +495,674 @@ static const uint32_t fold_hash[950] = {
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x48b4ae75,
 0xffffffff,
+0x7015fc29,
+0x24b45dd3,
 0xffffffff,
 0xffffffff,
-0x67468c1d,
 0xffffffff,
-0x48b4aa75,
-0x848bfc09,
 0xffffffff,
-0x6656ac17,
-0x8a8b4c0e,
-0x878b7000,
-0x48b4a675,
+0x3b54bc1c,
 0xffffffff,
 0xffffffff,
+0x4bb4a696,
+0x9bc1ffff,
 0xffffffff,
-0x8a8b480e,
-0x0512701c,
-0x2fba6000,
-0x1cc18c16,
 0xffffffff,
+0x070c701c,
 0xffffffff,
 0xffffffff,
-0x7153ffff,
 0xffffffff,
 0xffffffff,
+0x7847ffff,
+0x49696800,
 0xffffffff,
-0x0066701c,
+0x02627017,
+0x95af4400,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x104a7417,
 0xffffffff,
 0xffffffff,
+0x0704701c,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x08505c17,
 0xffffffff,
 0xffffffff,
-0x5b43fc1d,
-0x0c46741d,
+0x1fc18c0b,
+0x7f7a63ff,
+0x7d87fc00,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x78866800,
-0x8c8bfc01,
+0x94b1ffff,
+0x1dc18c14,
+0x4f6ffc17,
 0xffffffff,
 0xffffffff,
-0x3e5dfc17,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x3d58bc2f,
-0x6d69fc33,
+0x08485c17,
 0xffffffff,
 0xffffffff,
-0x1dc18c0e,
 0xffffffff,
+0x79133818,
 0xffffffff,
 0xffffffff,
-0x31126018,
-0x0508701c,
 0xffffffff,
 0xffffffff,
-0x3b59fc1c,
-0x6b68d01c,
+0x9ba9ffff,
+0x31ba6000,
 0xffffffff,
+0x27b45eb3,
 0xffffffff,
-0x614c77ff,
+0x69448817,
+0x29b475d6,
 0xffffffff,
 0xffffffff,
-0x24b45e70,
-0x7f774416,
+0x6e4e9c17,
+0x95af4000,
 0xffffffff,
-0x98a3fc00,
-0x0a0c5c17,
-0x1dc18c0a,
+0x0066701c,
+0x45b56ace,
 0xffffffff,
 0xffffffff,
-0x3112741d,
 0xffffffff,
+0x9ba1ffff,
 0xffffffff,
 0xffffffff,
-0x6a4c9817,
-0x28b47675,
+0x130c741d,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x684287ff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x4b53fc17,
+0x8c886010,
 0xffffffff,
-0x868b3800,
+0x3852bfff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x9999ffff,
 0xffffffff,
+0x5457fc17,
+0x1304741d,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x614c5fff,
-0x6752a41d,
-0x7015ffff,
+0x187f3bff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x0056701c,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x67448417,
+0x7e91ffff,
+0x25b45dd4,
+0x0b405c00,
+0x614ffc17,
+0x46b56a75,
+0x48b7681c,
 0xffffffff,
+0x2bb4726e,
 0xffffffff,
-0x0052701c,
-0x7469ffff,
+0x9b17ffff,
 0xffffffff,
 0xffffffff,
-0x0a025c17,
 0xffffffff,
-0x9493ffff,
-0x898a600f,
-0x1108741d,
+0x33126fff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x9089ffff,
 0xffffffff,
-0x15806017,
-0x06565c17,
-0x015e7045,
+0x6047fc17,
+0x49696801,
 0xffffffff,
 0xffffffff,
-0x63429417,
-0x0d5c741d,
 0xffffffff,
-0x5e49fc17,
-0x0e4c7417,
 0xffffffff,
-0x63429017,
-0x24b45e71,
-0x353e7c00,
-0x3011141b,
 0xffffffff,
+0x750fffff,
 0xffffffff,
 0xffffffff,
-0x149dfc17,
 0xffffffff,
 0xffffffff,
+0x6a52a41d,
 0xffffffff,
-0x730bffff,
-0x64428817,
+0x515477ff,
+0x21526817,
 0xffffffff,
-0x0f3e7400,
 0xffffffff,
 0xffffffff,
+0x1fc18c0c,
 0xffffffff,
-0x66428417,
-0x5f4ffc21,
-0x3a55fc2f,
+0x575a5fff,
 0xffffffff,
 0xffffffff,
+0x7507ffff,
+0x6d468fff,
+0x1dc18c15,
+0x9bb20000,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x8b8b4c10,
+0x644c77ff,
+0x9479ffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x6c64cbff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x33105c17,
 0xffffffff,
-0x064c5c17,
+0x425c73ff,
+0x0e56741d,
 0xffffffff,
-0x6f15fc17,
+0x27b45eb4,
 0xffffffff,
-0x0c52741d,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x3954bc1c,
 0xffffffff,
-0x8f8c6bff,
-0x42b56ace,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x083e5c00,
+0x634a5fff,
 0xffffffff,
-0x3360c045,
-0x1bc18c14,
+0x0c085c17,
+0x3313fc1b,
 0xffffffff,
-0x7301ffff,
-0x1f52681d,
-0x326ad400,
-0x3460bc45,
-0x326ad402,
-0x932bffff,
+0x21526417,
 0xffffffff,
-0x1f52641d,
 0xffffffff,
 0xffffffff,
-0x5555ffff,
 0xffffffff,
-0x7785fc00,
-0x1e52601d,
-0x0068701c,
-0x7f77441c,
 0xffffffff,
-0x91affc00,
 0xffffffff,
 0xffffffff,
-0x98a9ffff,
-0x828b4408,
 0xffffffff,
-0x06425c17,
-0x466b6801,
-0x0b0bfc17,
-0x5c45fc1d,
-0x808b4008,
-0x076c5c17,
+0x8c886011,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x7f774418,
+0x0c005c17,
 0xffffffff,
-0x5a54a429,
-0x1dc18c0c,
 0xffffffff,
+0x0e46741d,
 0xffffffff,
-0x8b8b4c11,
 0xffffffff,
 0xffffffff,
+0x8d894c0e,
 0xffffffff,
 0xffffffff,
-0x22b45dd3,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x050a701c,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x614e77ff,
-0x44b569ae,
 0xffffffff,
-0x45b7681c,
-0x7d75ffff,
 0xffffffff,
 0xffffffff,
-0x0a0e5c17,
+0x46b56a76,
+0x4bb4ae75,
 0xffffffff,
-0x6a4e9c17,
-0x989fffff,
-0x1bc18c15,
+0x096a5c17,
 0xffffffff,
 0xffffffff,
-0x68448bff,
+0x624ffc21,
+0x8f89fc0e,
 0xffffffff,
+0x20526017,
 0xffffffff,
+0x33106018,
+0x159c6817,
 0xffffffff,
 0xffffffff,
-0x6d67fc34,
 0xffffffff,
+0x49696802,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x4d55fc17,
-0x43b56a96,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x3e56bc1c,
 0xffffffff,
 0xffffffff,
-0x838b4409,
+0x9bc3ffff,
+0x8d89480e,
 0xffffffff,
-0x614e5fff,
-0x0500701c,
-0x9817ffff,
 0xffffffff,
-0x818b4009,
+0x070e701c,
 0xffffffff,
+0x1fc18c0d,
 0xffffffff,
+0x085a5c17,
 0xffffffff,
 0xffffffff,
-0x624e8417,
+0x69468c17,
 0xffffffff,
-0x0054701c,
+0x1ec18c16,
 0xffffffff,
-0x1dc18c0d,
+0x6e50a017,
 0xffffffff,
-0x0a045c17,
+0x4bb4aa75,
+0x104c7417,
+0x4db6a81c,
 0xffffffff,
-0x9495ffff,
+0x0706701c,
+0x5253fc1d,
+0x6f64c817,
+0x2db472ae,
+0x08525c17,
 0xffffffff,
-0x110a741d,
 0xffffffff,
 0xffffffff,
-0x98bfffff,
+0x065c7017,
+0x8f89fc00,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x01607045,
-0x41b56a8e,
 0xffffffff,
+0x3953fc2f,
 0xffffffff,
-0x2053fc1a,
-0x35408000,
-0x5e4bfc17,
-0x1bc18c09,
-0x0e4e7417,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x3013141b,
 0xffffffff,
-0x25b45ed3,
 0xffffffff,
+0x084a5c17,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x730dffff,
-0x66448817,
 0xffffffff,
-0x10407400,
 0xffffffff,
-0x42b56aae,
 0xffffffff,
-0x64448417,
-0x5f51fc21,
 0xffffffff,
+0x1babffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x31106fff,
+0x5e43fc1d,
 0xffffffff,
-0x8d8bffff,
 0xffffffff,
-0x1100741d,
 0xffffffff,
+0x08425c17,
 0xffffffff,
-0x49b5ffff,
 0xffffffff,
+0x4bb4a675,
+0x4db6a41c,
 0xffffffff,
-0x064e5c17,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x0c54741d,
-0x2db873ff,
+0x8e894c0f,
 0xffffffff,
 0xffffffff,
+0x130e741d,
 0xffffffff,
-0x3c56bc1c,
-0x888a600e,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x44b56a6e,
 0xffffffff,
 0xffffffff,
-0x09405c00,
 0xffffffff,
 0xffffffff,
+0x7b846800,
 0xffffffff,
+0x8789fc06,
+0x654e8417,
+0x4bb4ae76,
+0x9a9bffff,
 0xffffffff,
-0x7303ffff,
+0x1306741d,
 0xffffffff,
+0x8f89fc0f,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x0058701c,
 0xffffffff,
 0xffffffff,
-0x7157ffff,
-0x6c66d3ff,
-0x98b20000,
-0x7987fc00,
-0x2eb85fff,
 0xffffffff,
-0x6866cfff,
 0xffffffff,
+0x9793ffff,
 0xffffffff,
+0x6151fc17,
 0xffffffff,
-0x19abffff,
 0xffffffff,
 0xffffffff,
-0x06445c17,
 0xffffffff,
 0xffffffff,
-0x5d47fc1d,
 0xffffffff,
-0x076e5c17,
 0xffffffff,
+0x6c66cfff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x1fc18c0e,
+0x938bffff,
 0xffffffff,
+0x6149fc17,
 0xffffffff,
+0x3f56bc2f,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x7411ffff,
+0x4bb4aa76,
 0xffffffff,
-0x02647017,
-0x858a6000,
 0xffffffff,
-0x5855fc2a,
 0xffffffff,
-0x545a5fff,
-0x050c701c,
+0x4ab5feb3,
 0xffffffff,
-0x27b475d6,
-0x43b56a76,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x615077ff,
+0x415dfc1c,
 0xffffffff,
 0xffffffff,
-0x6a50a017,
-0x8477ffff,
 0xffffffff,
+0x8f89fc01,
 0xffffffff,
-0x31105c17,
-0x69468fff,
-0x98a1ffff,
-0x326ad401,
 0xffffffff,
+0x7509ffff,
+0x1aab5056,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x644e77ff,
 0xffffffff,
 0xffffffff,
+0x3a55fc1c,
+0x8275441c,
 0xffffffff,
 0xffffffff,
+0x51545fff,
 0xffffffff,
+0x33125c17,
+0x7501ffff,
 0xffffffff,
-0x8c8bfc0f,
-0x5157fc17,
-0x6756ac1d,
+0x0f58741d,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x6b66cc17,
 0xffffffff,
+0x8073ffff,
 0xffffffff,
-0x41b56a6e,
 0xffffffff,
-0x7c7a63ff,
-0x61505fff,
-0x0502701c,
 0xffffffff,
+0x140bfc1d,
+0x4bb4a676,
+0x644c5fff,
 0xffffffff,
+0x0c0a5c17,
 0xffffffff,
+0x8e894c10,
 0xffffffff,
+0x2ab47695,
 0xffffffff,
-0x7443ffff,
 0xffffffff,
-0x62508417,
 0xffffffff,
-0x0056701c,
-0x25b45eb3,
-0x716dffff,
 0xffffffff,
-0x0a065c17,
+0x736bffff,
 0xffffffff,
-0x9597ffff,
 0xffffffff,
-0x110c741d,
 0xffffffff,
-0x92af4400,
-0x98c1ffff,
-0x2053fc18,
 0xffffffff,
-0x065a5c17,
-0x848bfc07,
-0x92af4000,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x0c025c17,
+0x8789fc07,
 0xffffffff,
-0x5e4dfc17,
-0x0e507417,
 0xffffffff,
 0xffffffff,
+0x26b45e6f,
 0xffffffff,
-0x3652bfff,
-0x76113818,
+0x8f89fc10,
 0xffffffff,
 0xffffffff,
-0x66468c17,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x730fffff,
 0xffffffff,
 0xffffffff,
-0x43b56a95,
 0xffffffff,
+0x6e489017,
 0xffffffff,
 0xffffffff,
-0x898a6010,
 0xffffffff,
+0x6952a417,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x096c5c17,
 0xffffffff,
-0x31126fff,
+0x2fb873ff,
+0x6251fc21,
+0x6f66cc17,
+0x9ba3fc00,
 0xffffffff,
-0x908dffff,
 0xffffffff,
-0x1102741d,
+0x33126018,
 0xffffffff,
+0x1fc18c0f,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x4db4aa6e,
+0x89893800,
+0x6842881d,
+0x08645c17,
+0x45b56aae,
+0x7353ffff,
+0x6249fc21,
 0xffffffff,
-0x06505c17,
 0xffffffff,
+0x3e58bc1c,
 0xffffffff,
-0x4f53fc1d,
-0x0c56741d,
-0x4ab6a81c,
 0xffffffff,
-0x5b43fc17,
+0x9bc5ffff,
 0xffffffff,
-0x3c58bc1c,
 0xffffffff,
-0x4ab6a41c,
-0x4b6dfc17,
 0xffffffff,
+0x0710701c,
 0xffffffff,
 0xffffffff,
+0x373e7c00,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x48b4ae96,
-0x7305ffff,
-0x2cb472ce,
-0x2053fc19,
 0xffffffff,
 0xffffffff,
-0x48b4aa96,
 0xffffffff,
-0x5f49fc21,
-0x6e15fc29,
 0xffffffff,
-0x6868d3ff,
-0x48b4a696,
-0x7a89fc00,
 0xffffffff,
 0xffffffff,
+0x104e7417,
 0xffffffff,
-0x6c68cfff,
-0x3f5c73ff,
 0xffffffff,
+0x0708701c,
+0x5355fc1d,
 0xffffffff,
-0x1aadffff,
 0xffffffff,
+0x08545c17,
+0x7643ffff,
 0xffffffff,
-0x06465c17,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x07705c17,
 0xffffffff,
+0x4db4a66e,
+0x4cb5ffff,
+0x6a42841d,
+0x3c55fc2f,
 0xffffffff,
-0x898a6011,
+0x0700701c,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x084c5c17,
+0x6a56ac1d,
 0xffffffff,
 0xffffffff,
+0x8e894c11,
+0x7a83fc00,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x1cadffff,
 0xffffffff,
-0x6542881d,
+0x4e6bfc17,
 0xffffffff,
+0x5f45fc1d,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x08445c17,
+0x5a54abff,
+0x8789fc08,
 0xffffffff,
-0x6742841d,
-0x050e701c,
+0x375ebfff,
+0x015e7044,
 0xffffffff,
+0x26b45e70,
 0xffffffff,
+0x8f89fc11,
+0x9ba5ffff,
 0xffffffff,
-0x6652a417,
+0x3310741d,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x962bffff,
+0xffffffff,
+0xffffffff,
 0x0062701c,
-0x9879ffff,
 0xffffffff,
 0xffffffff,
-0x31125c17,
 0xffffffff,
+0x65508417,
 0xffffffff,
 0xffffffff,
+0x565bfc17,
+0x1308741d,
 0xffffffff,
-0x24b45e6f,
-0x4ab4aaae,
-0x21b6701c,
 0xffffffff,
-0x0c42741d,
-0x06665c17,
 0xffffffff,
-0x4ab4a6ae,
 0xffffffff,
 0xffffffff,
+0x3211101b,
 0xffffffff,
 0xffffffff,
-0x6b68d017,
-0x23b45dd4,
+0x113e7400,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x355ebfff,
+0x65488417,
+0x9795ffff,
 0xffffffff,
-0x045c7017,
+0x4e53fc17,
+0x5954a7ff,
+0x1300741d,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x7c7c63ff,
 0xffffffff,
-0x0504701c,
 0xffffffff,
-0x47b5fed3,
-0x3855fc1c,
 0xffffffff,
 0xffffffff,
-0x7445ffff,
-0x604877ff,
+0x0052701c,
 0xffffffff,
 0xffffffff,
-0x0058701c,
-0x556fffff,
-0x18ab5056,
 0xffffffff,
-0x0a085c17,
-0x5955fc29,
-0x9699ffff,
-0x120bfc1d,
-0x110e741d,
-0x26b475d5,
-0x43b56a75,
-0x98c3ffff,
+0xffffffff,
+0x918dffff,
+0xffffffff,
+0x614bfc17,
+0xffffffff,
+0x3f58bc2f,
+0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
+0x7413ffff,
+0x85894408,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
 0xffffffff,
-0x5e4ffc17,
 0xffffffff,
 0xffffffff,
-0x6a489017,
-0x2ab4728e,
-0x16813bff,
-0x76133818,
+0x5e43fc17,
 0xffffffff,
 0xffffffff,
+0x177e6017,
 0xffffffff,
+0x27b45ed3,
 0xffffffff,
+0x750bffff,
+0x036873ff,
 0xffffffff,
-0x60485fff,
 0xffffffff,
-0x7211ffff,
+0x4db4aaae,
 0xffffffff,
-0x8c8bfc0e,
 0xffffffff,
-0x17bd8c00,
-0x1f526817,
+0x645077ff,
 0xffffffff,
-0x62488417,
 0xffffffff,
+0x3d57fc1c,
 0xffffffff,
 0xffffffff,
-0x1f526417,
 0xffffffff,
 0xffffffff,
-0x48b4ae76,
-0x8e8fffff,
-0x2bb472ae,
-0x1104741d,
-0x1e526017,
 0xffffffff,
-0x48b4aa76,
-0x5754abff,
+0x0c145c17,
+0x7503ffff,
 0xffffffff,
-0x06525c17,
-0x7e7743ff,
-0x8b8b4c0f,
-0x5055fc1d,
-0x48b4a676
+0xffffffff
 };
 
-#define fold_hashkey(k)	(lj_rol(lj_rol((k),30)-(k),25)%949)
+#define fold_hashkey(k)	(lj_rol(lj_rol((k),21)-(k),1)%1001)
 
diff --git a/core/src/luajit/autogen/msys/jit/x86_64/lj_libdef.h b/core/src/luajit/autogen/msys/jit/x86_64/lj_libdef.h
index 2c9ec0605..6282c3a19 100644
--- a/core/src/luajit/autogen/msys/jit/x86_64/lj_libdef.h
+++ b/core/src/luajit/autogen/msys/jit/x86_64/lj_libdef.h
@@ -145,23 +145,24 @@ static const lua_CFunction lj_lib_cf_table[] = {
   lj_cf_table_sort
 };
 static const uint8_t lj_lib_init_table[] = {
-90,57,9,249,8,102,111,114,101,97,99,104,105,0,2,9,0,0,0,15,16,0,12,0,16,1,9,
-0,41,2,1,0,21,3,0,0,41,4,1,0,77,2,8,128,18,6,1,0,18,7,5,0,59,8,5,0,66,6,3,2,
-10,6,0,0,88,7,1,128,76,6,2,0,79,2,248,127,75,0,1,0,249,7,102,111,114,101,97,
-99,104,0,2,10,0,0,0,16,16,0,12,0,16,1,9,0,43,2,0,0,18,3,0,0,41,4,0,0,88,5,7,
-128,18,7,1,0,18,8,5,0,18,9,6,0,66,7,3,2,10,7,0,0,88,8,1,128,76,7,2,0,70,5,3,
-3,82,5,247,127,75,0,1,0,249,4,103,101,116,110,0,1,2,0,0,0,3,16,0,12,0,21,1,
-0,0,76,1,2,0,4,109,97,120,110,6,105,110,115,101,114,116,249,6,114,101,109,111,
-118,101,0,2,10,0,0,2,30,16,0,12,0,21,2,0,0,11,1,0,0,88,3,7,128,8,2,0,0,88,3,
-23,128,59,3,2,0,43,4,0,0,64,4,2,0,76,3,2,0,88,3,18,128,17,1,15,0,41,3,1,0,3,
-3,1,0,88,3,14,128,3,1,2,0,88,3,12,128,59,3,1,0,22,4,1,1,18,5,2,0,41,6,1,0,77,
-4,4,128,23,8,1,7,59,9,7,0,64,9,8,0,79,4,252,127,43,4,0,0,64,4,2,0,76,3,2,0,
-75,0,1,0,0,2,249,4,109,111,118,101,0,5,12,0,0,0,35,16,0,12,0,17,1,15,0,17,2,
-15,0,17,3,15,0,11,4,0,0,88,5,1,128,18,4,0,0,16,4,12,0,3,1,2,0,88,5,24,128,33,
-5,1,3,0,2,3,0,88,6,4,128,2,3,1,0,88,6,2,128,4,4,0,0,88,6,9,128,18,6,1,0,18,
-7,2,0,41,8,1,0,77,6,4,128,32,10,5,9,59,11,9,0,64,11,10,4,79,6,252,127,88,6,
-8,128,18,6,2,0,18,7,1,0,41,8,255,255,77,6,4,128,32,10,5,9,59,11,9,0,64,11,10,
-4,79,6,252,127,76,4,2,0,6,99,111,110,99,97,116,4,115,111,114,116,254,254,255
+90,57,9,249,8,102,111,114,101,97,99,104,105,0,2,10,0,0,0,15,16,0,12,0,16,1,
+9,0,41,2,1,0,21,3,0,0,41,4,1,0,77,2,8,128,18,6,1,0,18,8,5,0,59,9,5,0,66,6,3,
+2,10,6,0,0,88,7,1,128,76,6,2,0,79,2,248,127,75,0,1,0,249,7,102,111,114,101,
+97,99,104,0,2,11,0,0,0,16,16,0,12,0,16,1,9,0,43,2,0,0,18,3,0,0,41,4,0,0,88,
+5,7,128,18,7,1,0,18,9,5,0,18,10,6,0,66,7,3,2,10,7,0,0,88,8,1,128,76,7,2,0,70,
+5,3,3,82,5,247,127,75,0,1,0,249,4,103,101,116,110,0,1,2,0,0,0,3,16,0,12,0,21,
+1,0,0,76,1,2,0,4,109,97,120,110,6,105,110,115,101,114,116,249,6,114,101,109,
+111,118,101,0,2,10,0,0,2,30,16,0,12,0,21,2,0,0,11,1,0,0,88,3,7,128,8,2,0,0,
+88,3,23,128,59,3,2,0,43,4,0,0,64,4,2,0,76,3,2,0,88,3,18,128,17,1,15,0,41,3,
+1,0,3,3,1,0,88,3,14,128,3,1,2,0,88,3,12,128,59,3,1,0,22,4,1,1,18,5,2,0,41,6,
+1,0,77,4,4,128,23,8,1,7,59,9,7,0,64,9,8,0,79,4,252,127,43,4,0,0,64,4,2,0,76,
+3,2,0,75,0,1,0,0,2,249,4,109,111,118,101,0,5,12,0,0,0,35,16,0,12,0,17,1,15,
+0,17,2,15,0,17,3,15,0,11,4,0,0,88,5,1,128,18,4,0,0,16,4,12,0,3,1,2,0,88,5,24,
+128,33,5,1,3,0,2,3,0,88,6,4,128,2,3,1,0,88,6,2,128,4,4,0,0,88,6,9,128,18,6,
+1,0,18,7,2,0,41,8,1,0,77,6,4,128,32,10,5,9,59,11,9,0,64,11,10,4,79,6,252,127,
+88,6,8,128,18,6,2,0,18,7,1,0,41,8,255,255,77,6,4,128,32,10,5,9,59,11,9,0,64,
+11,10,4,79,6,252,127,76,4,2,0,6,99,111,110,99,97,116,4,115,111,114,116,254,
+254,255
 };
 #endif
 
@@ -271,13 +272,14 @@ static const lua_CFunction lj_lib_cf_jit[] = {
   lj_cf_jit_off,
   lj_cf_jit_flush,
   lj_cf_jit_status,
+  lj_cf_jit_security,
   lj_cf_jit_attach
 };
 static const uint8_t lj_lib_init_jit[] = {
-143,57,9,2,111,110,3,111,102,102,5,102,108,117,115,104,6,115,116,97,116,117,
-115,6,97,116,116,97,99,104,252,5,194,111,115,250,252,4,196,97,114,99,104,250,
-252,3,203,118,101,114,115,105,111,110,95,110,117,109,250,252,2,199,118,101,
-114,115,105,111,110,250,255
+143,57,10,2,111,110,3,111,102,102,5,102,108,117,115,104,6,115,116,97,116,117,
+115,8,115,101,99,117,114,105,116,121,6,97,116,116,97,99,104,252,5,194,111,115,
+250,252,4,196,97,114,99,104,250,252,3,203,118,101,114,115,105,111,110,95,110,
+117,109,250,252,2,199,118,101,114,115,105,111,110,250,255
 };
 #endif
 
@@ -297,7 +299,7 @@ static const lua_CFunction lj_lib_cf_jit_util[] = {
   lj_cf_jit_util_ircalladdr
 };
 static const uint8_t lj_lib_init_jit_util[] = {
-148,57,11,8,102,117,110,99,105,110,102,111,6,102,117,110,99,98,99,5,102,117,
+149,57,11,8,102,117,110,99,105,110,102,111,6,102,117,110,99,98,99,5,102,117,
 110,99,107,10,102,117,110,99,117,118,110,97,109,101,9,116,114,97,99,101,105,
 110,102,111,7,116,114,97,99,101,105,114,6,116,114,97,99,101,107,9,116,114,97,
 99,101,115,110,97,112,7,116,114,97,99,101,109,99,13,116,114,97,99,101,101,120,
@@ -311,7 +313,7 @@ static const lua_CFunction lj_lib_cf_jit_opt[] = {
   lj_cf_jit_opt_start
 };
 static const uint8_t lj_lib_init_jit_opt[] = {
-159,57,1,5,115,116,97,114,116,255
+160,57,1,5,115,116,97,114,116,255
 };
 #endif
 
@@ -323,7 +325,7 @@ static const lua_CFunction lj_lib_cf_jit_profile[] = {
   lj_cf_jit_profile_dumpstack
 };
 static const uint8_t lj_lib_init_jit_profile[] = {
-160,57,3,5,115,116,97,114,116,4,115,116,111,112,9,100,117,109,112,115,116,97,
+161,57,3,5,115,116,97,114,116,4,115,116,111,112,9,100,117,109,112,115,116,97,
 99,107,255
 };
 #endif
@@ -351,7 +353,7 @@ static const lua_CFunction lj_lib_cf_ffi_meta[] = {
   lj_cf_ffi_meta___ipairs
 };
 static const uint8_t lj_lib_init_ffi_meta[] = {
-163,57,19,7,95,95,105,110,100,101,120,10,95,95,110,101,119,105,110,100,101,
+164,57,19,7,95,95,105,110,100,101,120,10,95,95,110,101,119,105,110,100,101,
 120,4,95,95,101,113,5,95,95,108,101,110,4,95,95,108,116,4,95,95,108,101,8,95,
 95,99,111,110,99,97,116,6,95,95,99,97,108,108,5,95,95,97,100,100,5,95,95,115,
 117,98,5,95,95,109,117,108,5,95,95,100,105,118,5,95,95,109,111,100,5,95,95,
@@ -369,7 +371,7 @@ static const lua_CFunction lj_lib_cf_ffi_clib[] = {
   lj_cf_ffi_clib___gc
 };
 static const uint8_t lj_lib_init_ffi_clib[] = {
-181,57,3,7,95,95,105,110,100,101,120,10,95,95,110,101,119,105,110,100,101,120,
+182,57,3,7,95,95,105,110,100,101,120,10,95,95,110,101,119,105,110,100,101,120,
 4,95,95,103,99,255
 };
 #endif
@@ -381,7 +383,7 @@ static const lua_CFunction lj_lib_cf_ffi_callback[] = {
   lj_cf_ffi_callback_set
 };
 static const uint8_t lj_lib_init_ffi_callback[] = {
-184,57,3,4,102,114,101,101,3,115,101,116,252,1,199,95,95,105,110,100,101,120,
+185,57,3,4,102,114,101,101,3,115,101,116,252,1,199,95,95,105,110,100,101,120,
 250,255
 };
 #endif
@@ -408,7 +410,7 @@ static const lua_CFunction lj_lib_cf_ffi[] = {
   lj_cf_ffi_load
 };
 static const uint8_t lj_lib_init_ffi[] = {
-186,57,23,4,99,100,101,102,3,110,101,119,4,99,97,115,116,6,116,121,112,101,
+187,57,23,4,99,100,101,102,3,110,101,119,4,99,97,115,116,6,116,121,112,101,
 111,102,8,116,121,112,101,105,110,102,111,6,105,115,116,121,112,101,6,115,105,
 122,101,111,102,7,97,108,105,103,110,111,102,8,111,102,102,115,101,116,111,
 102,5,101,114,114,110,111,6,115,116,114,105,110,103,4,99,111,112,121,4,102,
diff --git a/core/src/luajit/autogen/msys/jit/x86_64/lj_recdef.h b/core/src/luajit/autogen/msys/jit/x86_64/lj_recdef.h
index 8c76176bb..9e4eb1422 100644
--- a/core/src/luajit/autogen/msys/jit/x86_64/lj_recdef.h
+++ b/core/src/luajit/autogen/msys/jit/x86_64/lj_recdef.h
@@ -43,64 +43,65 @@ static const uint16_t recff_idmap[] = {
 0x1200+(IRFPM_FLOOR),
 0x1200+(IRFPM_CEIL),
 0x1300+(IRFPM_SQRT),
-0x1300+(IRFPM_LOG10),
-0x1300+(IRFPM_EXP),
-0x1300+(IRFPM_SIN),
-0x1300+(IRFPM_COS),
-0x1300+(IRFPM_TAN),
-0x1400+(FF_math_asin),
-0x1400+(FF_math_acos),
-0x1400+(FF_math_atan),
-0x1500+(IRCALL_sinh),
-0x1500+(IRCALL_cosh),
-0x1500+(IRCALL_tanh),
-0,
+0x1400+(IRCALL_log10),
+0x1400+(IRCALL_exp),
+0x1400+(IRCALL_sin),
+0x1400+(IRCALL_cos),
+0x1400+(IRCALL_tan),
+0x1400+(IRCALL_asin),
+0x1400+(IRCALL_acos),
+0x1400+(IRCALL_atan),
+0x1400+(IRCALL_sinh),
+0x1400+(IRCALL_cosh),
+0x1400+(IRCALL_tanh),
+0,
+0,
+0x1500,
 0x1600,
 0x1700,
-0x1800,
-0x1900,
 0,
+0x1800,
+0x1900+(IR_MIN),
+0x1900+(IR_MAX),
 0x1a00,
-0x1b00+(IR_MIN),
-0x1b00+(IR_MAX),
-0x1c00,
-0,
-0x1d00,
-0x1e00+(IR_BNOT),
-0x1e00+(IR_BSWAP),
-0x1f00+(IR_BSHL),
-0x1f00+(IR_BSHR),
-0x1f00+(IR_BSAR),
-0x1f00+(IR_BROL),
-0x1f00+(IR_BROR),
-0x2000+(IR_BAND),
-0x2000+(IR_BOR),
-0x2000+(IR_BXOR),
+0,
+0x1b00,
+0x1c00+(IR_BNOT),
+0x1c00+(IR_BSWAP),
+0x1d00+(IR_BSHL),
+0x1d00+(IR_BSHR),
+0x1d00+(IR_BSAR),
+0x1d00+(IR_BROL),
+0x1d00+(IR_BROR),
+0x1e00+(IR_BAND),
+0x1e00+(IR_BOR),
+0x1e00+(IR_BXOR),
+0x1f00,
+0x2000+(0),
 0x2100,
-0x2200+(0),
-0x2300,
-0x2200+(1),
+0x2000+(1),
+0x2200,
+0x2300+(IRCALL_lj_buf_putstr_reverse),
+0x2300+(IRCALL_lj_buf_putstr_lower),
+0x2300+(IRCALL_lj_buf_putstr_upper),
+0,
 0x2400,
-0x2500+(IRCALL_lj_buf_putstr_reverse),
-0x2500+(IRCALL_lj_buf_putstr_lower),
-0x2500+(IRCALL_lj_buf_putstr_upper),
 0,
-0x2600,
 0,
 0,
 0,
+0x2500,
 0,
+0x2600,
 0x2700,
 0,
 0x2800,
 0x2900,
 0,
-0x2a00,
-0x2b00,
 0,
+0x2a00+(0),
+0x2b00+(0),
 0,
-0x2c00+(0),
-0x2d00+(0),
 0,
 0,
 0,
@@ -110,9 +111,9 @@ static const uint16_t recff_idmap[] = {
 0,
 0,
 0,
+0x2a00+(GCROOT_IO_OUTPUT),
+0x2b00+(GCROOT_IO_OUTPUT),
 0,
-0x2c00+(GCROOT_IO_OUTPUT),
-0x2d00+(GCROOT_IO_OUTPUT),
 0,
 0,
 0,
@@ -128,8 +129,8 @@ static const uint16_t recff_idmap[] = {
 0,
 0,
 0,
+0x2c00,
 0,
-0x2e00,
 0,
 0,
 0,
@@ -164,45 +165,45 @@ static const uint16_t recff_idmap[] = {
 0,
 0,
 0,
-0x2f00+(0),
-0x2f00+(1),
-0x3000+(MM_eq),
-0x3000+(MM_len),
-0x3000+(MM_lt),
-0x3000+(MM_le),
-0x3000+(MM_concat),
-0x3100,
-0x3000+(MM_add),
-0x3000+(MM_sub),
-0x3000+(MM_mul),
-0x3000+(MM_div),
-0x3000+(MM_mod),
-0x3000+(MM_pow),
-0x3000+(MM_unm),
+0x2d00+(0),
+0x2d00+(1),
+0x2e00+(MM_eq),
+0x2e00+(MM_len),
+0x2e00+(MM_lt),
+0x2e00+(MM_le),
+0x2e00+(MM_concat),
+0x2f00,
+0x2e00+(MM_add),
+0x2e00+(MM_sub),
+0x2e00+(MM_mul),
+0x2e00+(MM_div),
+0x2e00+(MM_mod),
+0x2e00+(MM_pow),
+0x2e00+(MM_unm),
 0,
 0,
 0,
-0x3200+(1),
-0x3200+(0),
+0x3000+(1),
+0x3000+(0),
 0,
 0,
 0,
 0,
-0x3300,
-0x3300,
-0x3400,
+0x3100,
+0x3100,
+0x3200,
 0,
+0x3300,
+0x3400+(FF_ffi_sizeof),
+0x3400+(FF_ffi_alignof),
+0x3400+(FF_ffi_offsetof),
 0x3500,
-0x3600+(FF_ffi_sizeof),
-0x3600+(FF_ffi_alignof),
-0x3600+(FF_ffi_offsetof),
+0x3600,
 0x3700,
 0x3800,
 0x3900,
-0x3a00,
-0x3b00,
 0,
-0x3c00
+0x3a00
 };
 
 static const RecordFunc recff_func[] = {
@@ -226,9 +227,7 @@ recff_xpcall,
 recff_math_abs,
 recff_math_round,
 recff_math_unary,
-recff_math_atrig,
-recff_math_htrig,
-recff_math_modf,
+recff_math_call,
 recff_math_log,
 recff_math_atan2,
 recff_math_pow,
diff --git a/core/src/luajit/autogen/msys/jit/x86_64/lj_vm.o b/core/src/luajit/autogen/msys/jit/x86_64/lj_vm.o
index 8d085a783..fa27a1bcb 100644
Binary files a/core/src/luajit/autogen/msys/jit/x86_64/lj_vm.o and b/core/src/luajit/autogen/msys/jit/x86_64/lj_vm.o differ
-- 
cgit v1.3.1