diff --git a/love/src/jni/LuaJIT-2.1/.gitignore b/love/src/jni/LuaJIT-2.1/.gitignore new file mode 100644 index 00000000..1a07bf75 --- /dev/null +++ b/love/src/jni/LuaJIT-2.1/.gitignore @@ -0,0 +1,11 @@ +*.[oa] +*.so +*.obj +*.lib +*.exp +*.dll +*.exe +*.manifest +*.dmp +*.swp +.tags diff --git a/love/src/jni/LuaJIT-2.1/COPYRIGHT b/love/src/jni/LuaJIT-2.1/COPYRIGHT index 1ef7df62..6ed40025 100644 --- a/love/src/jni/LuaJIT-2.1/COPYRIGHT +++ b/love/src/jni/LuaJIT-2.1/COPYRIGHT @@ -1,7 +1,7 @@ =============================================================================== LuaJIT -- a Just-In-Time Compiler for Lua. http://luajit.org/ -Copyright (C) 2005-2015 Mike Pall. All rights reserved. +Copyright (C) 2005-2017 Mike Pall. All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/love/src/jni/LuaJIT-2.1/Makefile b/love/src/jni/LuaJIT-2.1/Makefile index 8ce773e3..0f933089 100644 --- a/love/src/jni/LuaJIT-2.1/Makefile +++ b/love/src/jni/LuaJIT-2.1/Makefile @@ -10,13 +10,13 @@ # 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-2015 Mike Pall. See Copyright Notice in luajit.h +# Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h ############################################################################## MAJVER= 2 MINVER= 1 RELVER= 0 -PREREL= -beta1 +PREREL= -beta3 VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL) ABIVER= 5.1 @@ -47,17 +47,18 @@ INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig INSTALL_TNAME= luajit-$(VERSION) INSTALL_TSYMNAME= luajit INSTALL_ANAME= libluajit-$(ABIVER).a -INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER) -INSTALL_SOSHORT= libluajit-$(ABIVER).so -INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib +INSTALL_SOSHORT1= libluajit-$(ABIVER).so +INSTALL_SOSHORT2= libluajit-$(ABIVER).so.$(MAJVER) +INSTALL_SONAME= $(INSTALL_SOSHORT2).$(MINVER).$(RELVER) INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib +INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib INSTALL_PCNAME= luajit.pc INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME) INSTALL_DYN= $(INSTALL_LIB)/$(INSTALL_SONAME) -INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT) -INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT) +INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT1) +INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT2) INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME) INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME) INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) @@ -85,16 +86,22 @@ FILE_MAN= luajit.1 FILE_PC= luajit.pc FILES_INC= lua.h lualib.h lauxlib.h luaconf.h lua.hpp luajit.h FILES_JITLIB= bc.lua bcsave.lua dump.lua p.lua v.lua zone.lua \ - dis_x86.lua dis_x64.lua dis_arm.lua dis_ppc.lua \ - dis_mips.lua dis_mipsel.lua vmdef.lua + dis_x86.lua dis_x64.lua dis_arm.lua dis_arm64.lua \ + dis_arm64be.lua dis_ppc.lua dis_mips.lua dis_mipsel.lua \ + dis_mips64.lua dis_mips64el.lua vmdef.lua ifeq (,$(findstring Windows,$(OS))) - ifeq (Darwin,$(shell uname -s)) - INSTALL_SONAME= $(INSTALL_DYLIBNAME) - INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_DYLIBSHORT1) - INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_DYLIBSHORT2) - LDCONFIG= : - endif + HOST_SYS:= $(shell uname -s) +else + HOST_SYS= Windows +endif +TARGET_SYS?= $(HOST_SYS) + +ifeq (Darwin,$(TARGET_SYS)) + INSTALL_SONAME= $(INSTALL_DYLIBNAME) + INSTALL_SOSHORT1= $(INSTALL_DYLIBSHORT1) + INSTALL_SOSHORT2= $(INSTALL_DYLIBSHORT2) + LDCONFIG= : endif ############################################################################## diff --git a/love/src/jni/LuaJIT-2.1/README b/love/src/jni/LuaJIT-2.1/README index ca70dd8e..2b9ae9d2 100644 --- a/love/src/jni/LuaJIT-2.1/README +++ b/love/src/jni/LuaJIT-2.1/README @@ -1,11 +1,11 @@ -README for LuaJIT 2.1.0-beta1 +README for LuaJIT 2.1.0-beta3 ----------------------------- LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language. Project Homepage: http://luajit.org/ -LuaJIT is Copyright (C) 2005-2015 Mike Pall. +LuaJIT is Copyright (C) 2005-2017 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/love/src/jni/LuaJIT-2.1/android/arm64-v8a/libluajit.a b/love/src/jni/LuaJIT-2.1/android/arm64-v8a/libluajit.a index 67213a92..ecec3ebb 100644 Binary files a/love/src/jni/LuaJIT-2.1/android/arm64-v8a/libluajit.a and b/love/src/jni/LuaJIT-2.1/android/arm64-v8a/libluajit.a differ diff --git a/love/src/jni/LuaJIT-2.1/android/armeabi-v7a/libluajit.a b/love/src/jni/LuaJIT-2.1/android/armeabi-v7a/libluajit.a index f6381c06..7cedf990 100644 Binary files a/love/src/jni/LuaJIT-2.1/android/armeabi-v7a/libluajit.a and b/love/src/jni/LuaJIT-2.1/android/armeabi-v7a/libluajit.a differ diff --git a/love/src/jni/LuaJIT-2.1/android/armeabi/libluajit.a b/love/src/jni/LuaJIT-2.1/android/armeabi/libluajit.a deleted file mode 100644 index f171b4de..00000000 Binary files a/love/src/jni/LuaJIT-2.1/android/armeabi/libluajit.a and /dev/null differ diff --git a/love/src/jni/LuaJIT-2.1/android/x86/libluajit.a b/love/src/jni/LuaJIT-2.1/android/x86/libluajit.a index c686ef3e..8c8411d8 100644 Binary files a/love/src/jni/LuaJIT-2.1/android/x86/libluajit.a and b/love/src/jni/LuaJIT-2.1/android/x86/libluajit.a differ diff --git a/love/src/jni/LuaJIT-2.1/build_instructions.bat b/love/src/jni/LuaJIT-2.1/build_instructions.bat new file mode 100644 index 00000000..d97eee92 --- /dev/null +++ b/love/src/jni/LuaJIT-2.1/build_instructions.bat @@ -0,0 +1,47 @@ +rem Build instruction assume using WSL + Clang for Windows (with MSVC x86+x64 toolset for -m32 switch) +rem This assume NDK r19 or later. See https://github.com/LuaJIT/LuaJIT/issues/477 for more information. +rem Make sure the prebuilt is already in your PATH environment variable. + +mkdir android\arm64-v8a +mkdir android\armeabi-v7a +mkdir android\x86 + +rem Reset error level +ver > nul + +rem ARMv8 +if not exist android\arm64-v8a\libluajit.a ( + wsl make clean + if "%ERRORLEVEL%" == "1" goto :error + wsl make HOST_LUA=luajit HOST_CC=clang.exe CC=clang CROSS=aarch64-linux-android- STATIC_CC=aarch64-linux-android21-clang "DYNAMIC_CC=aarch64-linux-android21-clang -fPIC" "TARGET_AR=aarch64-linux-android-ar.exe rcus" TARGET_LD=aarch64-linux-android21-clang TARGET_STRIP=aarch64-linux-android-strip.exe amalg + if "%ERRORLEVEL%" == "1" goto :error + copy src\libluajit.a android\arm64-v8a\libluajit.a + if "%ERRORLEVEL%" == "1" goto :error +) + +rem ARMv7 +if not exist android\armeabi-v7a\libluajit.a ( + wsl make clean + if "%ERRORLEVEL%" == "1" goto :error + wsl make HOST_LUA=luajit "HOST_CC=clang.exe -m32" CC=clang CROSS=arm-linux-android- STATIC_CC=armv7a-linux-androideabi16-clang "DYNAMIC_CC=armv7a-linux-androideabi16-clang -fPIC" "TARGET_AR=arm-linux-androideabi-ar.exe rcus" TARGET_LD=armv7a-linux-androideabi16-clang TARGET_STRIP=arm-linux-androideabi-strip.exe amalg + if "%ERRORLEVEL%" == "1" goto :error + copy src\libluajit.a android\armeabi-v7a\libluajit.a + if "%ERRORLEVEL%" == "1" goto :error +) + +rem x86 +if not exist android\x86\libluajit.a ( + wsl make clean + if "%ERRORLEVEL%" == "1" goto :error + wsl make HOST_LUA=luajit "HOST_CC=clang.exe -m32" CC=clang CROSS=i686-linux-android- STATIC_CC=i686-linux-android16-clang "DYNAMIC_CC=i686-linux-android16-clang -fPIC" "TARGET_AR=i686-linux-android-ar.exe rcus" TARGET_LD=i686-linux-android16-clang TARGET_STRIP=i686-linux-android-strip.exe amalg + if "%ERRORLEVEL%" == "1" goto :error + copy src\libluajit.a android\x86\libluajit.a + if "%ERRORLEVEL%" == "1" goto :error +) + +goto :done + +:error +exit /b 1 + +:done diff --git a/love/src/jni/LuaJIT-2.1/doc/bluequad-print.css b/love/src/jni/LuaJIT-2.1/doc/bluequad-print.css index 07f5c84a..d5a3ea3a 100644 --- a/love/src/jni/LuaJIT-2.1/doc/bluequad-print.css +++ b/love/src/jni/LuaJIT-2.1/doc/bluequad-print.css @@ -1,4 +1,4 @@ -/* Copyright (C) 2004-2015 Mike Pall. +/* Copyright (C) 2004-2018 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/love/src/jni/LuaJIT-2.1/doc/bluequad.css b/love/src/jni/LuaJIT-2.1/doc/bluequad.css index ae531430..cfc889af 100644 --- a/love/src/jni/LuaJIT-2.1/doc/bluequad.css +++ b/love/src/jni/LuaJIT-2.1/doc/bluequad.css @@ -1,4 +1,4 @@ -/* Copyright (C) 2004-2015 Mike Pall. +/* Copyright (C) 2004-2018 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/love/src/jni/LuaJIT-2.1/doc/changes.html b/love/src/jni/LuaJIT-2.1/doc/changes.html index 826cd243..1208ac83 100644 --- a/love/src/jni/LuaJIT-2.1/doc/changes.html +++ b/love/src/jni/LuaJIT-2.1/doc/changes.html @@ -3,8 +3,7 @@ LuaJIT Change History - - + @@ -65,7 +64,7 @@ div.major { max-width: 600px; padding: 1em; margin: 1em 0 1em 0; }

This is a list of changes between the released versions of LuaJIT.
-The current stable version is LuaJIT 2.0.4.
+The current stable version is LuaJIT 2.0.5.

Please check the @@ -74,6 +73,43 @@ to see whether newer versions are available.

+

LuaJIT 2.1.0-beta3 — 2017-05-01

+ + +

LuaJIT 2.1.0-beta2 — 2016-03-03

+ +

LuaJIT 2.1.0-beta1 — 2015-08-25

This is a brief summary of the major changes in LuaJIT 2.1 compared to 2.0. @@ -86,12 +122,11 @@ Please take a look at the commit history for more details.

  • Add LJ_GC64 mode: 64 bit GC object references (really: 47 bit). Interpreter-only for now.
  • Add LJ_FR2 mode: Two-slot frame info. Required by LJ_GC64 mode.
  • Add table.new() and table.clear().
    • -
  • Parse Unicode escape '\u{XX...}' in string literals.
  • Parse binary number literals (0bxxx).
  • Improvements to the JIT compiler:
      -
    • Add trace stitching.
      • +
    • Add trace stitching (disabled for now).
    • Compile various builtins: string.char(), string.reverse(), string.lower(), string.upper(), string.rep(), string.format(), table.concat(), bit.tohex(), getfenv(0), debug.getmetatable().
    • Compile string.find() for fixed string searches (no patterns).
    • Compile BC_TSETM, e.g. {1,2,3,f()}.
      • @@ -113,7 +148,6 @@ Please take a look at the commit history for more details.
    • x64: Add separate port of the interpreter to LJ_GC64 mode.
    • x86/x64: Drop internal x87 math functions. Use libm functions.
    • x86: Remove x87 support from interpreter. SSE2 is mandatory now.
      • -
    • x86/x64: Add support for AES-NI, AVX and AVX2 to DynASM.
    • PPC/e500: Drop support for this architecture.
  • FFI library: @@ -124,12 +158,53 @@ Please take a look at the commit history for more details.
  • FFI: Compile lightuserdata to void * conversion.
  • FFI: Compile ffi.gc(cdata, nil), too.
  • FFI: Add ffi.typeinfo().
    • -
  • FFI: Add ssize_t declaration.
    • +

    LuaJIT 2.0.5 — 2017-05-01

    + +

    LuaJIT 2.0.4 — 2015-05-14

    +If you want to report bugs, propose fixes or suggest enhancements, +please use the +GitHub issue tracker. +

    +

    Please send general questions to the » LuaJIT mailing list. +

    +

    You can also send any questions you have directly to me:

    @@ -86,7 +92,7 @@ xD("fyZKB8xv\"FJytmz8.KAB0u52D")

    Copyright

    All documentation is -Copyright © 2005-2015 Mike Pall. +Copyright © 2005-2018 Mike Pall.

    @@ -94,7 +100,7 @@ Copyright © 2005-2015 Mike Pall.