Skip to content

Commit c6c7c13

Browse files
Merge pull request #248 from ricardoquesada/luajit_2.1-beta2
feat: upgrades to luajit 2.1-beta2
2 parents 7512c55 + 6aa7b0f commit c6c7c13

File tree

12 files changed

+125
-19
lines changed

12 files changed

+125
-19
lines changed

lua/luajit/include/lua.h

+1
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ LUA_API int (lua_status) (lua_State *L);
226226
#define LUA_GCSTEP 5
227227
#define LUA_GCSETPAUSE 6
228228
#define LUA_GCSETSTEPMUL 7
229+
#define LUA_GCISRUNNING 9
229230

230231
LUA_API int (lua_gc) (lua_State *L, int what, int data);
231232

lua/luajit/include/lua.hpp

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// C++ wrapper for LuaJIT header files.
2+
3+
extern "C" {
4+
#include "lua.h"
5+
#include "lauxlib.h"
6+
#include "lualib.h"
7+
#include "luajit.h"
8+
}
9+

lua/luajit/include/luaconf.h

+34-17
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
/*
22
** Configuration header.
3-
** Copyright (C) 2005-2013 Mike Pall. See Copyright Notice in luajit.h
3+
** Copyright (C) 2005-2016 Mike Pall. See Copyright Notice in luajit.h
44
*/
55

66
#ifndef luaconf_h
77
#define luaconf_h
88

9+
#ifndef WINVER
10+
#define WINVER 0x0501
11+
#endif
912
#include <limits.h>
1013
#include <stddef.h>
1114

@@ -23,26 +26,40 @@
2326
".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
2427
#else
2528
/*
26-
** Note to distribution maintainers: do NOT patch the following line!
29+
** Note to distribution maintainers: do NOT patch the following lines!
2730
** Please read ../doc/install.html#distro and pass PREFIX=/usr instead.
2831
*/
29-
#define LUA_ROOT "/usr/local/"
30-
#define LUA_LDIR LUA_ROOT "share/lua/5.1/"
31-
#define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
32-
#ifdef LUA_XROOT
33-
#define LUA_JDIR LUA_XROOT "share/luajit-2.0.1/"
34-
#define LUA_XPATH \
35-
";" LUA_XROOT "share/lua/5.1/?.lua;" LUA_XROOT "share/lua/5.1/?/init.lua"
36-
#define LUA_XCPATH LUA_XROOT "lib/lua/5.1/?.so;"
32+
#ifndef LUA_MULTILIB
33+
#define LUA_MULTILIB "lib"
34+
#endif
35+
#ifndef LUA_LMULTILIB
36+
#define LUA_LMULTILIB "lib"
37+
#endif
38+
#define LUA_LROOT "/usr/local"
39+
#define LUA_LUADIR "/lua/5.1/"
40+
#define LUA_LJDIR "/luajit-2.1.0-beta2/"
41+
42+
#ifdef LUA_ROOT
43+
#define LUA_JROOT LUA_ROOT
44+
#define LUA_RLDIR LUA_ROOT "/share" LUA_LUADIR
45+
#define LUA_RCDIR LUA_ROOT "/" LUA_MULTILIB LUA_LUADIR
46+
#define LUA_RLPATH ";" LUA_RLDIR "?.lua;" LUA_RLDIR "?/init.lua"
47+
#define LUA_RCPATH ";" LUA_RCDIR "?.so"
3748
#else
38-
#define LUA_JDIR LUA_ROOT "share/luajit-2.0.1/"
39-
#define LUA_XPATH
40-
#define LUA_XCPATH
49+
#define LUA_JROOT LUA_LROOT
50+
#define LUA_RLPATH
51+
#define LUA_RCPATH
4152
#endif
42-
#define LUA_PATH_DEFAULT \
43-
"./?.lua;" LUA_JDIR"?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua" LUA_XPATH
44-
#define LUA_CPATH_DEFAULT \
45-
"./?.so;" LUA_CDIR"?.so;" LUA_XCPATH LUA_CDIR"loadall.so"
53+
54+
#define LUA_JPATH ";" LUA_JROOT "/share" LUA_LJDIR "?.lua"
55+
#define LUA_LLDIR LUA_LROOT "/share" LUA_LUADIR
56+
#define LUA_LCDIR LUA_LROOT "/" LUA_LMULTILIB LUA_LUADIR
57+
#define LUA_LLPATH ";" LUA_LLDIR "?.lua;" LUA_LLDIR "?/init.lua"
58+
#define LUA_LCPATH1 ";" LUA_LCDIR "?.so"
59+
#define LUA_LCPATH2 ";" LUA_LCDIR "loadall.so"
60+
61+
#define LUA_PATH_DEFAULT "./?.lua" LUA_JPATH LUA_LLPATH LUA_RLPATH
62+
#define LUA_CPATH_DEFAULT "./?.so" LUA_LCPATH1 LUA_RCPATH LUA_LCPATH2
4663
#endif
4764

4865
/* Environment variable names for path overrides and initialization code. */

lua/luajit/include/luajit.h

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
/*
2+
** LuaJIT -- a Just-In-Time Compiler for Lua. http://luajit.org/
3+
**
4+
** Copyright (C) 2005-2016 Mike Pall. All rights reserved.
5+
**
6+
** Permission is hereby granted, free of charge, to any person obtaining
7+
** a copy of this software and associated documentation files (the
8+
** "Software"), to deal in the Software without restriction, including
9+
** without limitation the rights to use, copy, modify, merge, publish,
10+
** distribute, sublicense, and/or sell copies of the Software, and to
11+
** permit persons to whom the Software is furnished to do so, subject to
12+
** the following conditions:
13+
**
14+
** The above copyright notice and this permission notice shall be
15+
** included in all copies or substantial portions of the Software.
16+
**
17+
** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
18+
** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
19+
** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
20+
** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
21+
** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
22+
** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
23+
** SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
24+
**
25+
** [ MIT license: http://www.opensource.org/licenses/mit-license.php ]
26+
*/
27+
28+
#ifndef _LUAJIT_H
29+
#define _LUAJIT_H
30+
31+
#include "lua.h"
32+
33+
#define LUAJIT_VERSION "LuaJIT 2.1.0-beta2"
34+
#define LUAJIT_VERSION_NUM 20100 /* Version 2.1.0 = 02.01.00. */
35+
#define LUAJIT_VERSION_SYM luaJIT_version_2_1_0_beta2
36+
#define LUAJIT_COPYRIGHT "Copyright (C) 2005-2016 Mike Pall"
37+
#define LUAJIT_URL "http://luajit.org/"
38+
39+
/* Modes for luaJIT_setmode. */
40+
#define LUAJIT_MODE_MASK 0x00ff
41+
42+
enum {
43+
LUAJIT_MODE_ENGINE, /* Set mode for whole JIT engine. */
44+
LUAJIT_MODE_DEBUG, /* Set debug mode (idx = level). */
45+
46+
LUAJIT_MODE_FUNC, /* Change mode for a function. */
47+
LUAJIT_MODE_ALLFUNC, /* Recurse into subroutine protos. */
48+
LUAJIT_MODE_ALLSUBFUNC, /* Change only the subroutines. */
49+
50+
LUAJIT_MODE_TRACE, /* Flush a compiled trace. */
51+
52+
LUAJIT_MODE_WRAPCFUNC = 0x10, /* Set wrapper mode for C function calls. */
53+
54+
LUAJIT_MODE_MAX
55+
};
56+
57+
/* Flags or'ed in to the mode. */
58+
#define LUAJIT_MODE_OFF 0x0000 /* Turn feature off. */
59+
#define LUAJIT_MODE_ON 0x0100 /* Turn feature on. */
60+
#define LUAJIT_MODE_FLUSH 0x0200 /* Flush JIT-compiled code. */
61+
62+
/* LuaJIT public C API. */
63+
64+
/* Control the JIT engine. */
65+
LUA_API int luaJIT_setmode(lua_State *L, int idx, int mode);
66+
67+
/* Low-overhead profiling API. */
68+
typedef void (*luaJIT_profile_callback)(void *data, lua_State *L,
69+
int samples, int vmstate);
70+
LUA_API void luaJIT_profile_start(lua_State *L, const char *mode,
71+
luaJIT_profile_callback cb, void *data);
72+
LUA_API void luaJIT_profile_stop(lua_State *L);
73+
LUA_API const char *luaJIT_profile_dumpstack(lua_State *L, const char *fmt,
74+
int depth, size_t *len);
75+
76+
/* Enforce (dynamic) linker error for version mismatches. Call from main. */
77+
LUA_API void LUAJIT_VERSION_SYM(void);
78+
79+
#endif

lua/luajit/include/lualib.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
** Standard library header.
3-
** Copyright (C) 2005-2013 Mike Pall. See Copyright Notice in luajit.h
3+
** Copyright (C) 2005-2016 Mike Pall. See Copyright Notice in luajit.h
44
*/
55

66
#ifndef _LUALIB_H
Binary file not shown.
Binary file not shown.
Binary file not shown.
369 KB
Binary file not shown.

lua/luajit/prebuilt/ios/libluajit.a

-219 KB
Binary file not shown.

lua/luajit/prebuilt/mac/libluajit.a

-1.58 MB
Binary file not shown.

version.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"prebuilt_libs_version":"v3-deps-109",
2+
"prebuilt_libs_version":"v3-deps-110",
33
"freetype":"2.5.5",
44
"curl":"7.50.0",
55
"jpeg":"9.0",

0 commit comments

Comments
 (0)